Skip to content

Commit dba1cba

Browse files
authored
chore: move base pubsub types/configs to duty (#19)
* chore: move base pubsub types/configs to duty * chore: bump duty * chore: fix lint errors * chore: fix failing test
1 parent f5ddb7d commit dba1cba

9 files changed

Lines changed: 281 additions & 611 deletions

File tree

config/crd/bases/batch.flanksource.com_batchtriggers.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.2
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: batchtriggers.batch.flanksource.com
88
spec:
99
group: batch.flanksource.com
@@ -909,7 +909,6 @@ spec:
909909
retries
910910
type: integer
911911
required:
912-
- attempts
913912
- delay
914913
type: object
915914
script:
@@ -9608,25 +9607,14 @@ spec:
96089607
type: object
96099608
nats:
96109609
properties:
9611-
host:
9612-
type: string
9613-
password:
9614-
type: string
9615-
port:
9616-
type: integer
96179610
queue:
96189611
type: string
96199612
subject:
96209613
type: string
9621-
username:
9614+
url:
96229615
type: string
96239616
required:
9624-
- host
9625-
- password
9626-
- port
9627-
- queue
96289617
- subject
9629-
- username
96309618
type: object
96319619
pod:
96329620
description: |-

go.mod

Lines changed: 81 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
module github.com/flanksource/batch-runner
22

3-
go 1.23.0
3+
go 1.24
44

5-
toolchain go1.23.4
5+
toolchain go1.24.3
66

77
require (
8-
github.com/aws/aws-sdk-go-v2 v1.32.5
9-
github.com/aws/aws-sdk-go-v2/config v1.27.36
10-
github.com/aws/aws-sdk-go-v2/credentials v1.17.34
11-
github.com/aws/aws-sdk-go-v2/service/sns v1.31.3
12-
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.3
8+
github.com/aws/aws-sdk-go-v2 v1.36.3
9+
github.com/aws/aws-sdk-go-v2/config v1.29.12
10+
github.com/aws/aws-sdk-go-v2/credentials v1.17.65
11+
github.com/aws/aws-sdk-go-v2/service/sns v1.34.2
12+
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.3
1313
github.com/eko/gocache/lib/v4 v4.1.6
1414
github.com/flanksource/commons v1.37.0
15-
github.com/flanksource/duty v1.0.920
15+
github.com/flanksource/duty v1.0.935
1616
github.com/flanksource/gomplate/v3 v3.24.56
17-
github.com/nats-io/nats.go v1.37.0
1817
github.com/onsi/gomega v1.36.2
1918
github.com/samber/lo v1.49.1
2019
github.com/samber/oops v1.17.0
2120
github.com/spf13/cobra v1.8.1
22-
gocloud.dev v0.40.0
23-
gocloud.dev/pubsub/kafkapubsub v0.40.0
24-
gocloud.dev/pubsub/natspubsub v0.40.0
21+
gocloud.dev v0.41.0
22+
gocloud.dev/pubsub/kafkapubsub v0.41.0
23+
gocloud.dev/pubsub/natspubsub v0.41.0
2524
gocloud.dev/pubsub/rabbitpubsub v0.40.0
2625
k8s.io/api v0.31.1
2726
k8s.io/apimachinery v0.31.1
@@ -32,29 +31,33 @@ require (
3231

3332
require (
3433
ariga.io/atlas v0.15.0 // indirect
35-
cel.dev/expr v0.18.0 // indirect
36-
cloud.google.com/go v0.115.1 // indirect
37-
cloud.google.com/go/auth v0.9.4 // indirect
38-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
34+
cel.dev/expr v0.22.1 // indirect
35+
cloud.google.com/go v0.120.0 // indirect
36+
cloud.google.com/go/auth v0.15.0 // indirect
37+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3938
cloud.google.com/go/cloudsqlconn v1.5.1 // indirect
40-
cloud.google.com/go/compute/metadata v0.5.1 // indirect
41-
cloud.google.com/go/iam v1.2.0 // indirect
42-
cloud.google.com/go/kms v1.19.0 // indirect
43-
cloud.google.com/go/longrunning v0.6.0 // indirect
44-
cloud.google.com/go/pubsub v1.42.0 // indirect
45-
cloud.google.com/go/storage v1.43.0 // indirect
39+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
40+
cloud.google.com/go/iam v1.4.2 // indirect
41+
cloud.google.com/go/kms v1.21.1 // indirect
42+
cloud.google.com/go/longrunning v0.6.6 // indirect
43+
cloud.google.com/go/monitoring v1.24.1 // indirect
44+
cloud.google.com/go/pubsub v1.48.0 // indirect
45+
cloud.google.com/go/storage v1.51.0 // indirect
4646
dario.cat/mergo v1.0.0 // indirect
4747
filippo.io/edwards25519 v1.1.0 // indirect
4848
github.com/Azure/azure-amqp-common-go/v3 v3.2.3 // indirect
49-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
50-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
49+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.1 // indirect
50+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
5151
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
5252
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
5353
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
54-
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.7.1 // indirect
55-
github.com/Azure/go-amqp v1.0.5 // indirect
56-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
57-
github.com/IBM/sarama v1.43.3 // indirect
54+
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0 // indirect
55+
github.com/Azure/go-amqp v1.4.0 // indirect
56+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
57+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
58+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
59+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
60+
github.com/IBM/sarama v1.45.1 // indirect
5861
github.com/Masterminds/goutils v1.1.1 // indirect
5962
github.com/Masterminds/semver/v3 v3.3.1 // indirect
6063
github.com/Microsoft/go-winio v0.6.1 // indirect
@@ -66,24 +69,24 @@ require (
6669
github.com/agext/levenshtein v1.2.3 // indirect
6770
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6871
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
69-
github.com/aws/aws-sdk-go v1.55.5 // indirect
70-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
71-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
72-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
73-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
74-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
75-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
72+
github.com/aws/aws-sdk-go v1.55.6 // indirect
73+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
74+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
75+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
76+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
77+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
78+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
7679
github.com/aws/aws-sdk-go-v2/service/eks v1.52.1 // indirect
77-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
78-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
79-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
80-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
81-
github.com/aws/aws-sdk-go-v2/service/kms v1.35.3 // indirect
82-
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 // indirect
83-
github.com/aws/aws-sdk-go-v2/service/sso v1.23.0 // indirect
84-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.0 // indirect
85-
github.com/aws/aws-sdk-go-v2/service/sts v1.31.0 // indirect
86-
github.com/aws/smithy-go v1.22.1 // indirect
80+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
81+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
82+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
83+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
84+
github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 // indirect
85+
github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 // indirect
86+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 // indirect
87+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.0 // indirect
88+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
89+
github.com/aws/smithy-go v1.22.3 // indirect
8790
github.com/beorn7/perks v1.0.1 // indirect
8891
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
8992
github.com/casbin/casbin/v2 v2.103.0 // indirect
@@ -93,6 +96,7 @@ require (
9396
github.com/cert-manager/cert-manager v1.16.1 // indirect
9497
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9598
github.com/cloudflare/circl v1.3.7 // indirect
99+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
96100
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
97101
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
98102
github.com/distribution/reference v0.5.0 // indirect
@@ -104,6 +108,8 @@ require (
104108
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
105109
github.com/emirpasic/gods v1.18.1 // indirect
106110
github.com/emirpasic/gods/v2 v2.0.0-alpha // indirect
111+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
112+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
107113
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
108114
github.com/exaring/otelpgx v0.6.2 // indirect
109115
github.com/fatih/color v1.17.0 // indirect
@@ -129,28 +135,28 @@ require (
129135
github.com/go-openapi/jsonpointer v0.21.0 // indirect
130136
github.com/go-openapi/jsonreference v0.21.0 // indirect
131137
github.com/go-openapi/swag v0.23.0 // indirect
132-
github.com/go-sql-driver/mysql v1.8.1 // indirect
138+
github.com/go-sql-driver/mysql v1.9.1 // indirect
133139
github.com/gobwas/glob v0.2.3 // indirect
134140
github.com/goccy/go-yaml v1.16.0 // indirect
135141
github.com/gogo/protobuf v1.3.2 // indirect
136-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
142+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
137143
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
138144
github.com/golang-sql/sqlexp v0.1.0 // indirect
139-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
145+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
140146
github.com/golang/mock v1.6.0 // indirect
141147
github.com/golang/protobuf v1.5.4 // indirect
142-
github.com/golang/snappy v0.0.4 // indirect
148+
github.com/golang/snappy v1.0.0 // indirect
143149
github.com/google/btree v1.1.2 // indirect
144150
github.com/google/cel-go v0.22.1 // indirect
145151
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
146152
github.com/google/go-cmp v0.7.0 // indirect
147153
github.com/google/gofuzz v1.2.0 // indirect
148154
github.com/google/gops v0.3.28 // indirect
149-
github.com/google/s2a-go v0.1.8 // indirect
155+
github.com/google/s2a-go v0.1.9 // indirect
150156
github.com/google/uuid v1.6.0 // indirect
151157
github.com/google/wire v0.6.0 // indirect
152-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
153-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
158+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
159+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
154160
github.com/gorilla/websocket v1.5.1 // indirect
155161
github.com/gosimple/slug v1.13.1 // indirect
156162
github.com/gosimple/unidecode v1.0.1 // indirect
@@ -193,7 +199,7 @@ require (
193199
github.com/josharian/intern v1.0.0 // indirect
194200
github.com/json-iterator/go v1.1.12 // indirect
195201
github.com/kevinburke/ssh_config v1.2.0 // indirect
196-
github.com/klauspost/compress v1.17.9 // indirect
202+
github.com/klauspost/compress v1.18.0 // indirect
197203
github.com/kr/fs v0.1.0 // indirect
198204
github.com/kr/pretty v0.3.1 // indirect
199205
github.com/kr/text v0.2.0 // indirect
@@ -216,19 +222,21 @@ require (
216222
github.com/modern-go/reflect2 v1.0.2 // indirect
217223
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
218224
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
219-
github.com/nats-io/nkeys v0.4.7 // indirect
225+
github.com/nats-io/nats.go v1.42.0 // indirect
226+
github.com/nats-io/nkeys v0.4.11 // indirect
220227
github.com/nats-io/nuid v1.0.1 // indirect
221228
github.com/ohler55/ojg v1.25.0 // indirect
222229
github.com/oklog/ulid/v2 v2.1.0 // indirect
223230
github.com/opencontainers/go-digest v1.0.0 // indirect
224231
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
225232
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
226233
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
227-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
234+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
228235
github.com/pjbgf/sha1cd v0.3.0 // indirect
229236
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
230237
github.com/pkg/errors v0.9.1 // indirect
231238
github.com/pkg/sftp v1.13.6 // indirect
239+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
232240
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
233241
github.com/prometheus/client_golang v1.20.5 // indirect
234242
github.com/prometheus/client_model v0.6.1 // indirect
@@ -269,35 +277,37 @@ require (
269277
github.com/zclconf/go-cty v1.15.0 // indirect
270278
go.opencensus.io v0.24.0 // indirect
271279
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
272-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
273-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
280+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
281+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
282+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
274283
go.opentelemetry.io/otel v1.35.0 // indirect
275284
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
276285
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
277286
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
278287
go.opentelemetry.io/otel/metric v1.35.0 // indirect
279288
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
289+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
280290
go.opentelemetry.io/otel/trace v1.35.0 // indirect
281291
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
282-
golang.org/x/crypto v0.36.0 // indirect
292+
golang.org/x/crypto v0.37.0 // indirect
283293
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
284294
golang.org/x/mod v0.22.0 // indirect
285-
golang.org/x/net v0.33.0 // indirect
295+
golang.org/x/net v0.38.0 // indirect
286296
golang.org/x/oauth2 v0.28.0 // indirect
287-
golang.org/x/sync v0.12.0 // indirect
288-
golang.org/x/sys v0.31.0 // indirect
289-
golang.org/x/term v0.30.0 // indirect
290-
golang.org/x/text v0.23.0 // indirect
291-
golang.org/x/time v0.6.0 // indirect
297+
golang.org/x/sync v0.13.0 // indirect
298+
golang.org/x/sys v0.32.0 // indirect
299+
golang.org/x/term v0.31.0 // indirect
300+
golang.org/x/text v0.24.0 // indirect
301+
golang.org/x/time v0.11.0 // indirect
292302
golang.org/x/tools v0.28.0 // indirect
293-
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
303+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
294304
gonum.org/v1/gonum v0.15.1 // indirect
295-
google.golang.org/api v0.198.0 // indirect
296-
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
297-
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
298-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
299-
google.golang.org/grpc v1.66.2 // indirect
300-
google.golang.org/protobuf v1.36.1 // indirect
305+
google.golang.org/api v0.228.0 // indirect
306+
google.golang.org/genproto v0.0.0-20250324211829-b45e905df463 // indirect
307+
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
308+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
309+
google.golang.org/grpc v1.71.0 // indirect
310+
google.golang.org/protobuf v1.36.6 // indirect
301311
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
302312
gopkg.in/inf.v0 v0.9.1 // indirect
303313
gopkg.in/sourcemap.v1 v1.0.5 // indirect

0 commit comments

Comments
 (0)