Skip to content

Commit

Permalink
Bump google.golang.org/api to newer version to avoid downgrade of dd-…
Browse files Browse the repository at this point in the history
…agent

The dd-agent and google.golang.org/api both rely on google.golang.org/grpc, the old version
of the api package forces a downgrade of the datadog-agent which breaks the build.
ajgajg1134 committed Aug 15, 2024
1 parent c64efa3 commit 0520899
Showing 9 changed files with 73 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unit-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ jobs:
- name: Testing outlier google.golang.org/api
run: |
go get google.golang.org/api@v0.121.0 # version used to generate code
go get google.golang.org/api@v0.192.0 # version used to generate code
go mod tidy # Go1.16 doesn't update the sum file correctly after the go get, this tidy fixes it
go test -v ./contrib/google.golang.org/api/...
2 changes: 1 addition & 1 deletion contrib/google.golang.org/api/gen_endpoints.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions contrib/google.golang.org/api/internal/gen_endpoints/main.go
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ import (
"encoding/json"
"flag"
"fmt"
"github.com/yosida95/uritemplate/v3"
"io"
"log"
"net/http"
@@ -24,11 +23,13 @@ import (
"path/filepath"
"sort"
"strings"

"github.com/yosida95/uritemplate/v3"
)

const (
// The github.com/googleapis/google-api-go-client version to use.
version = "v0.121.0"
version = "v0.192.0"
)

var (
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.5

require (
cloud.google.com/go/pubsub v1.36.1
cloud.google.com/go/pubsub v1.40.0
github.com/99designs/gqlgen v0.17.36
github.com/DataDog/appsec-internal-go v1.7.0
github.com/DataDog/datadog-agent/pkg/obfuscate v0.57.0-rc.1
@@ -102,12 +102,12 @@ require (
go.uber.org/atomic v1.11.0
golang.org/x/mod v0.20.0
golang.org/x/net v0.27.0
golang.org/x/oauth2 v0.18.0
golang.org/x/oauth2 v0.22.0
golang.org/x/sys v0.23.0
golang.org/x/time v0.6.0
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
google.golang.org/api v0.169.0
google.golang.org/grpc v1.64.0
google.golang.org/api v0.192.0
google.golang.org/grpc v1.64.1
google.golang.org/protobuf v1.34.2
gopkg.in/jinzhu/gorm.v1 v1.9.2
gopkg.in/olivere/elastic.v3 v3.0.75
@@ -122,10 +122,11 @@ require (
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.25.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go v0.115.0 // indirect
cloud.google.com/go/auth v0.8.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.12 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.57.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.0-rc.1 // indirect
github.com/DataDog/go-sqllexer v0.0.13 // indirect
@@ -171,7 +172,7 @@ require (
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -191,9 +192,9 @@ require (
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -278,7 +279,7 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.einride.tech/aip v0.66.0 // indirect
go.einride.tech/aip v0.67.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/component v0.104.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
@@ -296,10 +297,9 @@ require (
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Loading

0 comments on commit 0520899

Please sign in to comment.