Skip to content

Commit 79575b0

Browse files
authored
Merge pull request #15 from xmidt-org/release
fix goreleaser
2 parents 83d54a1 + 72238b1 commit 79575b0

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ go.work
3333

3434
dist/*
3535

36-
cmd/wrp-kafka-splitter/dist/*
36+
cmd/splitter/dist/*
3737
lint.sh

.goreleaser.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2026 Comcast Cable Communications Management, LLC
22
# SPDX-License-Identifier: Apache-2.0
33
---
4-
project_name: wrp-kafka-splitter
4+
project_name: splitter
55

66
version: 2
77

@@ -41,7 +41,7 @@ sboms:
4141

4242
builds:
4343
-
44-
main: './cmd/wrp-kafka-splitter/main.go'
44+
main: './cmd/splitter/main.go'
4545
env:
4646
- CGO_ENABLED=0
4747
- GO111MODULE=on
@@ -83,7 +83,7 @@ nfpms:
8383
id: rdk
8484
file_name_template: '{{ .PackageName }}_{{ .Version }}_rdk_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
8585
vendor: xmidt-org
86-
homepage: https://github.com/xmidt-org/wrp-kafka-splitter
86+
homepage: https://github.com/xmidt-org/splitter
8787
license: Apache-2.0
8888
maintainer: see_maintainers_file@example.com
8989
description: The client agent for the Xmidt service.
@@ -96,26 +96,26 @@ nfpms:
9696

9797
contents:
9898
# systemd service file
99-
- src: .release/ipk/wrp-kafka-splitter.service
100-
dst: /lib/systemd/system/wrp-kafka-splitter.service
99+
- src: .release/ipk/splitter.service
100+
dst: /lib/systemd/system/splitter.service
101101

102102
# base configuration file
103103
- src: .release/ipk/config.yml
104-
dst: /etc/wrp-kafka-splitter/conf.d/01-config.yml
104+
dst: /etc/splitter/conf.d/01-config.yml
105105

106106
scripts:
107107
preinstall: .release/ipk/preinstall.sh
108108
postinstall: .release/ipk/postinstall.sh
109109

110110
ipk:
111111
fields:
112-
Bugs: https://github.com/xmidt-org/wrp-kafka-splitter/issues
112+
Bugs: https://github.com/xmidt-org/splitter/issues
113113

114114
-
115115
id: openwrt
116116
file_name_template: '{{ .PackageName }}_{{ .Version }}_openwrt_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
117117
vendor: xmidt-org
118-
homepage: https://github.com/xmidt-org/wrp-kafka-splitter
118+
homepage: https://github.com/xmidt-org/splitter
119119
license: Apache-2.0
120120
maintainer: see_maintainers_file@example.com
121121
description: The client agent for the Xmidt service.
@@ -126,17 +126,16 @@ nfpms:
126126
contents:
127127
# base configuration file
128128
- src: .release/ipk/config.yml
129-
dst: /etc/wrp-kafka-splitter/conf.d/01-config.yml
129+
dst: /etc/splitter/conf.d/01-config.yml
130130

131131
ipk:
132132
fields:
133-
Bugs: https://github.com/xmidt-org/wrp-kafka-splitter/issues
134-
133+
Bugs: https://github.com/xmidt-org/splitter/issues
135134
-
136135
id: server
137136
file_name_template: '{{ .PackageName }}_{{ .Version }}_debian_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
138137
vendor: xmidt-org
139-
homepage: https://github.com/xmidt-org/wrp-kafka-splitter
138+
homepage: https://github.com/xmidt-org/splitter
140139
license: Apache-2.0
141140
maintainer: see_maintainers_file@example.com
142141
description: The client agent for the Xmidt service.
@@ -148,13 +147,13 @@ nfpms:
148147
contents:
149148
# base configuration file
150149
- src: .release/ipk/config.yml
151-
dst: /etc/wrp-kafka-splitter/conf.d/01-config.yml
150+
dst: /etc/splitter/conf.d/01-config.yml
152151

153152
deb:
154153
signature:
155154
key_file: .secrets/deb_gpg_private_key_file
156155
fields:
157-
Bugs: https://github.com/xmidt-org/wrp-kafka-splitter/issues
156+
Bugs: https://github.com/xmidt-org/splitter/issues
158157
rpm:
159158
group: System Environment/Daemons
160159
signature:
@@ -180,16 +179,16 @@ dockers:
180179
build_flag_templates:
181180
- "--platform=linux/amd64"
182181
- "--label=org.opencontainers.image.created={{.Date}}"
183-
- "--label=org.opencontainers.image.url=https://github.com/xmidt-org/wrp-kafka-splitter"
182+
- "--label=org.opencontainers.image.url=https://github.com/xmidt-org/splitter"
184183
- "--label=org.opencontainers.image.title={{.ProjectName}}"
185184
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
186-
- "--label=org.opencontainers.image.source=https://github.com/xmidt-org/wrp-kafka-splitter"
185+
- "--label=org.opencontainers.image.source=https://github.com/xmidt-org/splitter"
187186
- "--label=org.opencontainers.image.version={{.Version}}"
188187
image_templates:
189-
- ghcr.io/xmidt-org/wrp-kafka-splitter:{{ .Tag }}-amd64
190-
- ghcr.io/xmidt-org/wrp-kafka-splitter:v{{ .Major }}-amd64
191-
- ghcr.io/xmidt-org/wrp-kafka-splitter:v{{ .Major }}.{{ .Minor }}-amd64
192-
- ghcr.io/xmidt-org/wrp-kafka-splitter:latest-amd64
188+
- ghcr.io/xmidt-org/splitter:{{ .Tag }}-amd64
189+
- ghcr.io/xmidt-org/splitter:v{{ .Major }}-amd64
190+
- ghcr.io/xmidt-org/splitter:v{{ .Major }}.{{ .Minor }}-amd64
191+
- ghcr.io/xmidt-org/splitter:latest-amd64
193192
dockerfile: 'Dockerfile'
194193
extra_files:
195194
- .release/docker

.release/docker/entrypoint.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ _want_help() {
1818
}
1919

2020
_main() {
21-
# if command starts with an option, prepend wrp-kafka-splitter
21+
# if command starts with an option, prepend splitter
2222
if [ "${1:0:1}" = '-' ]; then
23-
set -- /wrp-kafka-splitter "$@"
23+
set -- /splitter "$@"
2424
fi
2525

26-
# skip setup if they aren't running /wrp-kafka-splitter or want an option that stops /wrp-kafka-splitter
27-
if [ "$1" = '/wrp-kafka-splitter' ] && ! _want_help "$@"; then
28-
echo "Entrypoint script for wrp-kafka-splitter Client ${VERSION} started."
26+
# skip setup if they aren't running /splitter or want an option that stops /wrp-kafka-splitter
27+
if [ "$1" = '/splitter' ] && ! _want_help "$@"; then
28+
echo "Entrypoint script for splitter Client ${VERSION} started."
2929
fi
3030

3131
exec "$@"

internal/app/app_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ func TestWrpKafkaRouter(t *testing.T) {
8383
panic: true,
8484
}, {
8585
description: "enable debug mode",
86-
args: []string{"-d", "-f", "wrp-kafka-splitter.yaml"},
86+
args: []string{"-d", "-f", "splitter.yaml"},
8787
}, {
8888
description: "output graph",
89-
args: []string{"-g", "graph.dot", "-f", "wrp-kafka-splitter.yaml"},
89+
args: []string{"-g", "graph.dot", "-f", "splitter.yaml"},
9090
}, {
9191
description: "start and stop",
9292
duration: time.Millisecond,
93-
args: []string{"-f", "wrp-kafka-splitter.yaml"},
93+
args: []string{"-f", "splitter.yaml"},
9494
expectedStartErr: consumer.ErrPingingBroker,
9595
},
9696
}

0 commit comments

Comments
 (0)