Skip to content

Commit

Permalink
feat: adding dotnet support (#160)
Browse files Browse the repository at this point in the history
* adding dotnet support

* updating go version

---------

Co-authored-by: Varkeychan Jacob <[email protected]>
  • Loading branch information
varkey98 and Varkeychan Jacob authored Jan 8, 2024
1 parent 800c263 commit f05da39
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 68 deletions.
3 changes: 1 addition & 2 deletions gen/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ go 1.19

require (
github.com/ghodss/yaml v1.0.0
github.com/golang/protobuf v1.5.3
github.com/stretchr/testify v1.8.4
google.golang.org/protobuf v1.31.0
google.golang.org/protobuf v1.32.0
)

require (
Expand Down
11 changes: 2 additions & 9 deletions gen/go/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
Expand Down
102 changes: 52 additions & 50 deletions gen/go/v1/config.pb.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/hypertrace/agent-config

go 1.19
go 1.21
1 change: 1 addition & 0 deletions proto/hypertrace/agent/config/v1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import "google/protobuf/wrappers.proto";

option go_package = "github.com/hypertrace/agent-config/gen/go/v1";
option java_package = "org.hypertrace.agent.config.v1";
option csharp_namespace = "Hypertrace.Agent.Config.V1";

// AgentConfig covers the config for agents.
// The config uses wrappers for primitive types to allow nullable values.
Expand Down
5 changes: 3 additions & 2 deletions tools/env-vars-generator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15-alpine
FROM golang:alpine

RUN apk add --update git

Expand All @@ -10,6 +10,7 @@ WORKDIR $WORKDIR

COPY . $WORKDIR/tools/env-vars-generator

RUN go get ./...
# Need the go modules in the WORKDIR
COPY go.* .

ENTRYPOINT ["/usr/local/go/bin/go", "run", "tools/env-vars-generator/main.go"]
2 changes: 1 addition & 1 deletion tools/env-vars-generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hypertrace/agent-config/tools/env-vars-generator

go 1.19
go 1.21

require (
github.com/iancoleman/strcase v0.2.0
Expand Down
2 changes: 1 addition & 1 deletion tools/env-vars-generator/protobuf
Submodule protobuf updated 495 files
2 changes: 1 addition & 1 deletion tools/go-generator/cmd/generator/_protobuf
Submodule _protobuf updated 495 files
2 changes: 1 addition & 1 deletion tools/go-generator/cmd/generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hypertrace/agent-config/tools/go-generator

go 1.19
go 1.21

require (
github.com/iancoleman/strcase v0.2.0
Expand Down

0 comments on commit f05da39

Please sign in to comment.