Skip to content

Commit 742ea5d

Browse files
lanycrostlanycrost
authored
feat: emit typed transport config and update dependencies (#99)
1 parent 2f2dc02 commit 742ea5d

15 files changed

Lines changed: 367 additions & 169 deletions

File tree

‎.github/workflows/docker.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
tags: ${{ env.IMAGE_NAME }}:scan
7272

7373
- name: Run Trivy vulnerability scanner
74-
uses: aquasecurity/trivy-action@0.35.0
74+
uses: aquasecurity/trivy-action@v0.36.0
7575
with:
7676
image-ref: ${{ env.IMAGE_NAME }}:scan
77-
format: 'sarif'
78-
output: 'trivy-results.sarif'
79-
severity: 'CRITICAL,HIGH'
77+
format: "sarif"
78+
output: "trivy-results.sarif"
79+
severity: "CRITICAL,HIGH"
8080

8181
- name: Upload Trivy results
8282
uses: github/codeql-action/upload-sarif@v4
8383
if: always()
8484
with:
85-
sarif_file: 'trivy-results.sarif'
85+
sarif_file: "trivy-results.sarif"

‎.github/workflows/release-please.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- name: Release Please
2828
id: release
29-
uses: googleapis/release-please-action@v4
29+
uses: googleapis/release-please-action@v5
3030
with:
3131
token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
3232
config-file: .github/release-please-config.json

‎Makefile‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -229,28 +229,17 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
229229
HELMIFY ?= $(LOCALBIN)/helmify
230230
HELM_SCHEMA ?= $(LOCALBIN)/helm-values-schema-json
231231

232-
## Tool Versions
233232
## Tool Versions
234233
KUSTOMIZE_VERSION ?= v5.8.1
235234
CONTROLLER_TOOLS_VERSION ?= v0.20.1
236-
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
237-
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
235+
# ENVTEST_VERSION is the setup-envtest module version to install.
236+
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime)
238237
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
239238
ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
240239
GOLANGCI_LINT_VERSION ?= v2.11.4
241240
HELMIFY_VERSION ?= v0.4.19
242241
HELM_SCHEMA_VERSION ?= v2.3.1
243242

244-
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
245-
ENVTEST_VERSION ?= $(shell v='$(call gomodver,sigs.k8s.io/controller-runtime)'; \
246-
[ -n "$$v" ] || { echo "Set ENVTEST_VERSION manually (controller-runtime replace has no tag)" >&2; exit 1; }; \
247-
printf '%s\n' "$$v" | sed -E 's/^v?([0-9]+)\.([0-9]+).*/release-\1.\2/')
248-
249-
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
250-
ENVTEST_K8S_VERSION ?= $(shell v='$(call gomodver,k8s.io/api)'; \
251-
[ -n "$$v" ] || { echo "Set ENVTEST_K8S_VERSION manually (k8s.io/api replace has no tag)" >&2; exit 1; }; \
252-
printf '%s\n' "$$v" | sed -E 's/^v?[0-9]+\.([0-9]+).*/1.\1/')
253-
254243
.PHONY: kustomize
255244
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
256245
$(KUSTOMIZE): $(LOCALBIN)

‎api/catalog/v1alpha1/groupversion_info.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var (
2929
GroupVersion = schema.GroupVersion{Group: "catalog.bubustack.io", Version: "v1alpha1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
32+
//nolint:staticcheck // Kubebuilder API package registration still uses scheme.Builder.
3233
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
3334

3435
// AddToScheme adds the types in this group-version to the given scheme.

‎api/policy/v1alpha1/groupversion_info.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var (
2929
GroupVersion = schema.GroupVersion{Group: "policy.bubustack.io", Version: "v1alpha1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
32+
//nolint:staticcheck // Kubebuilder API package registration still uses scheme.Builder.
3233
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
3334

3435
// AddToScheme adds the types in this group-version to the given scheme.

‎api/runs/v1alpha1/groupversion_info.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var (
2929
GroupVersion = schema.GroupVersion{Group: "runs.bubustack.io", Version: "v1alpha1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
32+
//nolint:staticcheck // Kubebuilder API package registration still uses scheme.Builder.
3233
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
3334

3435
// AddToScheme adds the types in this group-version to the given scheme.

‎api/transport/v1alpha1/groupversion_info.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var (
2929
GroupVersion = schema.GroupVersion{Group: "transport.bubustack.io", Version: "v1alpha1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
32+
//nolint:staticcheck // Kubebuilder API package registration still uses scheme.Builder.
3233
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
3334

3435
// AddToScheme adds the types in this group-version to the given scheme.

‎api/v1alpha1/groupversion_info.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var (
2929
GroupVersion = schema.GroupVersion{Group: "bubustack.io", Version: "v1alpha1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
32+
//nolint:staticcheck // Kubebuilder API package registration still uses scheme.Builder.
3233
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
3334

3435
// AddToScheme adds the types in this group-version to the given scheme.

‎go.mod‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ module github.com/bubustack/bobrapet
33
go 1.26.2
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.41.6
7-
github.com/aws/aws-sdk-go-v2/config v1.32.16
8-
github.com/aws/aws-sdk-go-v2/credentials v1.19.15
9-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.15
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.99.1
11-
github.com/bubustack/core v0.1.5
12-
github.com/bubustack/tractatus v0.1.4
6+
github.com/aws/aws-sdk-go-v2 v1.41.7
7+
github.com/aws/aws-sdk-go-v2/config v1.32.17
8+
github.com/aws/aws-sdk-go-v2/credentials v1.19.16
9+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.17
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.100.1
11+
github.com/bubustack/core v0.1.6
12+
github.com/bubustack/tractatus v0.2.0
1313
github.com/go-logr/logr v1.4.3
1414
github.com/google/go-cmp v0.7.0
15-
github.com/onsi/ginkgo/v2 v2.28.1
16-
github.com/onsi/gomega v1.39.1
15+
github.com/onsi/ginkgo/v2 v2.28.3
16+
github.com/onsi/gomega v1.40.0
1717
github.com/prometheus/client_golang v1.23.2
1818
github.com/stretchr/testify v1.11.1
1919
github.com/xeipuuv/gojsonschema v1.2.0
@@ -24,44 +24,45 @@ require (
2424
go.opentelemetry.io/otel/trace v1.43.0
2525
go.uber.org/goleak v1.3.0
2626
gopkg.in/yaml.v3 v3.0.1
27-
k8s.io/api v0.35.4
28-
k8s.io/apiextensions-apiserver v0.35.4
29-
k8s.io/apimachinery v0.35.4
30-
k8s.io/client-go v0.35.4
31-
sigs.k8s.io/controller-runtime v0.23.3
27+
k8s.io/api v0.36.0
28+
k8s.io/apiextensions-apiserver v0.36.0
29+
k8s.io/apimachinery v0.36.0
30+
k8s.io/client-go v0.36.0
31+
sigs.k8s.io/controller-runtime v0.24.0
3232
sigs.k8s.io/yaml v1.6.0
3333
)
3434

3535
require (
36+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260415201107-50325440f8f2.1 // indirect
3637
cel.dev/expr v0.25.1 // indirect
3738
dario.cat/mergo v1.0.2 // indirect
3839
github.com/Masterminds/goutils v1.1.1 // indirect
3940
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4041
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4142
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
42-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.9 // indirect
43-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.22 // indirect
44-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.22 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.22 // indirect
46-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.23 // indirect
47-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.8 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.14 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.22 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.22 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.10 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.16 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.20 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/sts v1.42.0 // indirect
55-
github.com/aws/smithy-go v1.25.0 // indirect
43+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.10 // indirect
44+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect
46+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.15 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.23 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 // indirect
56+
github.com/aws/smithy-go v1.25.1 // indirect
5657
github.com/beorn7/perks v1.0.1 // indirect
5758
github.com/blang/semver/v4 v4.0.0 // indirect
5859
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
5960
github.com/cespare/xxhash/v2 v2.3.0 // indirect
60-
github.com/davecgh/go-spew v1.1.1 // indirect
61+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6162
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
6263
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
6364
github.com/felixge/httpsnoop v1.0.4 // indirect
64-
github.com/fsnotify/fsnotify v1.9.0 // indirect
65+
github.com/fsnotify/fsnotify v1.10.0 // indirect
6566
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
6667
github.com/go-logr/stdr v1.2.2 // indirect
6768
github.com/go-logr/zapr v1.3.0 // indirect
@@ -80,7 +81,6 @@ require (
8081
github.com/go-openapi/swag/typeutils v0.26.0 // indirect
8182
github.com/go-openapi/swag/yamlutils v0.26.0 // indirect
8283
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
83-
github.com/google/btree v1.1.3 // indirect
8484
github.com/google/cel-go v0.28.0 // indirect
8585
github.com/google/gnostic-models v0.7.1 // indirect
8686
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
@@ -94,7 +94,7 @@ require (
9494
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9595
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
9696
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
97-
github.com/pmezard/go-difflib v1.0.0 // indirect
97+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9898
github.com/prometheus/client_model v0.6.2 // indirect
9999
github.com/prometheus/common v0.67.5 // indirect
100100
github.com/prometheus/procfs v0.20.1 // indirect
@@ -111,7 +111,7 @@ require (
111111
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
112112
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
113113
go.uber.org/multierr v1.11.0 // indirect
114-
go.uber.org/zap v1.27.1 // indirect
114+
go.uber.org/zap v1.28.0 // indirect
115115
go.yaml.in/yaml/v2 v2.4.4 // indirect
116116
go.yaml.in/yaml/v3 v3.0.4 // indirect
117117
golang.org/x/crypto v0.50.0 // indirect
@@ -126,16 +126,17 @@ require (
126126
golang.org/x/time v0.15.0 // indirect
127127
golang.org/x/tools v0.44.0 // indirect
128128
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
129-
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
129+
google.golang.org/genproto/googleapis/api v0.0.0-20260427160629-7cedc36a6bc4 // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
131131
google.golang.org/grpc v1.80.0 // indirect
132-
google.golang.org/protobuf v1.36.11 // indirect
132+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
133133
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
134134
gopkg.in/inf.v0 v0.9.1 // indirect
135-
k8s.io/apiserver v0.35.4 // indirect
136-
k8s.io/component-base v0.35.4 // indirect
135+
k8s.io/apiserver v0.36.0 // indirect
136+
k8s.io/component-base v0.36.0 // indirect
137137
k8s.io/klog/v2 v2.140.0 // indirect
138-
k8s.io/kube-openapi v0.0.0-20260414162039-ec9c827d403f // indirect
138+
k8s.io/kube-openapi v0.0.0-20260427204847-8949caaa1199 // indirect
139+
k8s.io/streaming v0.36.0 // indirect
139140
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
140141
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
141142
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect

0 commit comments

Comments
 (0)