Skip to content

Commit 4f7aecc

Browse files
committed
fix: interim commit
shared lib needs more work
1 parent f0582ec commit 4f7aecc

File tree

11 files changed

+588
-117
lines changed

11 files changed

+588
-117
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ dist
1616

1717
# local testers and
1818
local/
19+
.bin

buf.gen.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: v2
2+
# this ensures we can store the .proto and generated files in the same directory
3+
clean: false
4+
plugins:
5+
- remote: buf.build/protocolbuffers/go
6+
out: plugins/proto
7+
opt:
8+
- paths=source_relative
9+
- remote: buf.build/grpc/go:v1.3.0
10+
out: plugins/proto
11+
opt:
12+
- paths=source_relative
13+
- require_unimplemented_servers=false
14+
inputs:
15+
- directory: plugins/proto

buf.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: v2
2+
modules:
3+
- path: ./plugins/proto
4+
lint:
5+
use:
6+
- STANDARD
7+
breaking:
8+
use:
9+
- FILE

eirctl.yaml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,24 @@ contexts:
1010
bash:
1111
container:
1212
name: mirror.gcr.io/bash:5.0.18-alpine3.22
13+
buf:
14+
container:
15+
name: docker.io/bufbuild/buf:1.61
16+
pull_timeout: 0
17+
entrypoint: /usr/bin/env
18+
19+
go1xalpine:
20+
container:
21+
name: mirror.gcr.io/golang:1.25-alpine
22+
envfile:
23+
exclude:
24+
- GO
25+
- CXX
26+
- CGO
1327

1428
pipelines:
1529
unit:test:
16-
- pipeline: test:unit
30+
- pipeline: test:unit
1731
env:
1832
ROOT_PKG_NAME: github.com/DevLabFoundry
1933

@@ -32,6 +46,11 @@ pipelines:
3246
- task: go:build:binary
3347
depends_on: clean
3448

49+
proto:build:
50+
- task: proto:install
51+
- task: proto:generate
52+
depends_on: proto:install
53+
3554
tasks:
3655
show:coverage:
3756
description: Opens the current coverage viewer for the the configmanager utility.
@@ -93,7 +112,7 @@ tasks:
93112
sonar:coverage:prep:
94113
context: bash
95114
command:
96-
- |
115+
- |
97116
sed -i 's|github.com/DevLabFoundry/configmanager/v2/||g' .coverage/out
98117
echo "Coverage file first 20 lines after conversion:"
99118
head -20 .coverage/out
@@ -112,4 +131,15 @@ tasks:
112131
- VERSION
113132
- REVISION
114133

134+
# currently unused
135+
proto:install:
136+
context: go1xalpine
137+
command:
138+
- GOPATH=$PWD/local/go go install google.golang.org/protobuf/cmd/[email protected]
115139

140+
proto:generate:
141+
context: buf
142+
command:
143+
# - PATH=$PATH:$PWD/local/go/bin buf generate
144+
# getting all plugins from the remote registry
145+
- buf generate

go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/DevLabFoundry/configmanager/v3
33
go 1.25.4
44

55
require (
6-
cloud.google.com/go/secretmanager v1.16.0
6+
cloud.google.com/go/secretmanager v1.11.4
77
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0
88
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
99
github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.2.0
@@ -14,7 +14,7 @@ require (
1414
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1
1515
github.com/aws/aws-sdk-go-v2/service/ssm v1.67.3
1616
github.com/go-test/deep v1.1.1
17-
github.com/googleapis/gax-go/v2 v2.15.0
17+
github.com/googleapis/gax-go/v2 v2.12.0
1818
github.com/hashicorp/vault/api v1.22.0
1919
github.com/hashicorp/vault/api/auth/aws v0.11.0
2020
github.com/spf13/cobra v1.10.1
@@ -24,16 +24,16 @@ require (
2424

2525
require (
2626
github.com/aws/aws-sdk-go-v2/service/signin v1.0.1 // indirect
27-
github.com/golang/protobuf v1.5.4 // indirect
27+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
28+
github.com/golang/protobuf v1.5.3 // indirect
2829
github.com/hashicorp/yamux v0.1.2 // indirect
2930
github.com/oklog/run v1.1.0 // indirect
31+
go.opencensus.io v0.24.0 // indirect
3032
)
3133

3234
require (
33-
cloud.google.com/go/auth v0.17.0 // indirect
34-
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3535
cloud.google.com/go/compute/metadata v0.9.0 // indirect
36-
cloud.google.com/go/iam v1.5.3 // indirect
36+
cloud.google.com/go/iam v1.1.5 // indirect
3737
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
3838
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
3939
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
@@ -57,14 +57,14 @@ require (
5757
github.com/go-logr/logr v1.4.3 // indirect
5858
github.com/go-logr/stdr v1.2.2 // indirect
5959
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
60-
github.com/google/s2a-go v0.1.9 // indirect
60+
github.com/google/s2a-go v0.1.7 // indirect
6161
github.com/google/uuid v1.6.0 // indirect
6262
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
6363
github.com/hashicorp/errwrap v1.1.0 // indirect
6464
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
65-
github.com/hashicorp/go-hclog v1.6.3 // indirect
65+
github.com/hashicorp/go-hclog v1.6.3
6666
github.com/hashicorp/go-multierror v1.1.1 // indirect
67-
github.com/hashicorp/go-plugin v1.7.0
67+
github.com/hashicorp/go-plugin v1.6.2
6868
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
6969
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
7070
github.com/hashicorp/go-secure-stdlib/awsutil v0.3.0 // indirect
@@ -86,7 +86,7 @@ require (
8686
github.com/spf13/pflag v1.0.10 // indirect
8787
github.com/tetratelabs/wazero v1.10.1
8888
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
89-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
9090
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
9191
go.opentelemetry.io/otel v1.38.0 // indirect
9292
go.opentelemetry.io/otel/metric v1.38.0 // indirect
@@ -98,10 +98,10 @@ require (
9898
golang.org/x/sys v0.38.0 // indirect
9999
golang.org/x/text v0.31.0 // indirect
100100
golang.org/x/time v0.14.0 // indirect
101-
google.golang.org/api v0.256.0 // indirect
102-
google.golang.org/genproto v0.0.0-20251111163417-95abcf5c77ba // indirect
103-
google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba // indirect
104-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect
105-
google.golang.org/grpc v1.77.0 // indirect
106-
google.golang.org/protobuf v1.36.10 // indirect
101+
google.golang.org/api v0.155.0 // indirect
102+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
103+
google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 // indirect
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
105+
google.golang.org/grpc v1.61.2
106+
google.golang.org/protobuf v1.31.0
107107
)

0 commit comments

Comments
 (0)