From bc3de128d4096c87d8a23eb0aa33c6e8732af7b1 Mon Sep 17 00:00:00 2001 From: Christian Schaible Date: Tue, 19 Nov 2024 08:05:07 +0000 Subject: [PATCH] Merged PR 681139: chore: Lower minimum go version to 1.22.7 and update protobuf to v1.35.2 Related work items: #698243 --- .azuredevops/build-pipeline.yml | 6 +++--- README.md | 15 ++++++++++++--- gen/go/audit/v1/audit_event.pb.go | 2 +- gen/go/audit/v1/routable_event.pb.go | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.azuredevops/build-pipeline.yml b/.azuredevops/build-pipeline.yml index 08b8ef4..3649b91 100644 --- a/.azuredevops/build-pipeline.yml +++ b/.azuredevops/build-pipeline.yml @@ -3,15 +3,15 @@ pool: variables: - name: bufVersion - value: v1.46.0 + value: v1.47.2 - name: golangCiLintVersion value: v1.62.0 - name: goVersion - value: 1.23.3 + value: 1.22.7 - name: protobufValidateVersion value: v1.1.0 - name: protobufVersion - value: v1.35.1 + value: v1.35.2 - name: GOPATH value: '$(system.defaultWorkingDirectory)/gopath' diff --git a/README.md b/README.md index 7467a01..98c9218 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,22 @@ The code can be found in the [api_routable.go](./api_routable.go) and ### Development +#### Go +The current minimum toolchain version is **go1.22**. +The toolchain version can be set as environment variable (either manually in the terminal +or in the ~/.basrc or ~/.zshrc): + +```shell +export GOTOOLCHAIN=go1.22.7 +``` + #### Linter The linter *golangci-lint* can either be installed via package manager (e.g. brew) or by running the following command in the terminal: ```shell -curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0 +curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.62.0 ``` #### Schema Generation @@ -52,8 +61,8 @@ Buf and the required plugins can either be installed via package manager (e.g. b or manually by running: ```shell -go install github.com/bufbuild/buf/cmd/buf@v1.45.0 #Pipeline: bufVersion -go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.35.1 #Pipeline: protobufVersion, go.mod: buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go +go install github.com/bufbuild/buf/cmd/buf@v1.47.2 #Pipeline: bufVersion +go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.35.2 #Pipeline: protobufVersion, go.mod: buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go go install github.com/envoyproxy/protoc-gen-validate@v1.1.0 #Pipeline: protobufValidateVersion, go.mod: google.golang.org/protobuf ``` diff --git a/gen/go/audit/v1/audit_event.pb.go b/gen/go/audit/v1/audit_event.pb.go index 4a4e484..4f7a696 100644 --- a/gen/go/audit/v1/audit_event.pb.go +++ b/gen/go/audit/v1/audit_event.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc (unknown) // source: audit/v1/audit_event.proto diff --git a/gen/go/audit/v1/routable_event.pb.go b/gen/go/audit/v1/routable_event.pb.go index dd4d7dc..12d66df 100644 --- a/gen/go/audit/v1/routable_event.pb.go +++ b/gen/go/audit/v1/routable_event.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc (unknown) // source: audit/v1/routable_event.proto diff --git a/go.mod b/go.mod index 725675d..ab6ec3b 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module dev.azure.com/schwarzit/schwarzit.stackit-public/audit-go.git -go 1.23.3 +go 1.22.7 require ( - buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-20240920164238-5a7b106cbb87.1 + buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1 github.com/Azure/go-amqp v1.2.0 github.com/bufbuild/protovalidate-go v0.7.2 github.com/google/uuid v1.6.0 @@ -12,7 +12,7 @@ require ( github.com/testcontainers/testcontainers-go v0.34.0 go.opentelemetry.io/otel v1.32.0 go.opentelemetry.io/otel/trace v1.32.0 - google.golang.org/protobuf v1.35.1 + google.golang.org/protobuf v1.35.2 ) require ( diff --git a/go.sum b/go.sum index 54e9e44..995e2e8 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-20240920164238-5a7b106cbb87.1 h1:9wP6ZZYWnF2Z0TxmII7m3XNykxnP4/w8oXeth6ekcRI= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-20240920164238-5a7b106cbb87.1/go.mod h1:Duw/9JoXkXIydyASnLYIiufkzySThoqavOsF+IihqvM= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1 h1:7QIeAuTdLp173vC/9JojRMDFcpmqtoYrxPmvdHAOynw= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1/go.mod h1:mnHCFccv4HwuIAOHNGdiIc5ZYbBCvbTWZcodLN5wITI= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= @@ -211,8 +211,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=