diff --git a/go.mod b/go.mod index 2b63395cb..054e7f899 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ replace ( replace github.com/google/go-tpm-tools => github.com/daniel-weisse/go-tpm-tools v0.0.0-20221111090237-e51fbcb20b1f require ( - cloud.google.com/go/compute v1.13.0 + cloud.google.com/go/compute v1.14.0 cloud.google.com/go/compute/metadata v0.2.1 cloud.google.com/go/kms v1.6.0 cloud.google.com/go/logging v1.6.1 @@ -91,7 +91,6 @@ require ( golang.org/x/mod v0.7.0 golang.org/x/sys v0.3.0 google.golang.org/api v0.103.0 - google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v3 v3.0.1 @@ -288,6 +287,7 @@ require ( golang.org/x/tools v0.4.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 5c114e339..fd59fb24f 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.13.0 h1:AYrLkB8NPdDRslNp4Jxmzrhdr03fUAIDbiGFjLWowoU= -cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= +cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0= +cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= diff --git a/hack/build-manifest/gcp/client.go b/hack/build-manifest/gcp/client.go index c568f3e36..ec9176028 100644 --- a/hack/build-manifest/gcp/client.go +++ b/hack/build-manifest/gcp/client.go @@ -11,9 +11,9 @@ import ( "strings" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/edgelesssys/constellation/v2/internal/logger" "google.golang.org/api/iterator" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) // Client for GCP Image API. diff --git a/hack/go.mod b/hack/go.mod index 680a7bb87..8ed912911 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -33,7 +33,7 @@ replace ( replace github.com/edgelesssys/constellation/v2 => ./.. require ( - cloud.google.com/go/compute v1.13.0 + cloud.google.com/go/compute v1.14.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2 v2.0.0 @@ -49,7 +49,6 @@ require ( go.uber.org/zap v1.24.0 golang.org/x/mod v0.7.0 google.golang.org/api v0.103.0 - google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 google.golang.org/grpc v1.51.0 gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/yaml.v3 v3.0.1 @@ -57,6 +56,8 @@ require ( libvirt.org/go/libvirtxml v1.8009.0 ) +require google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect + require ( cloud.google.com/go v0.105.0 // indirect cloud.google.com/go/compute/metadata v0.2.1 // indirect diff --git a/hack/go.sum b/hack/go.sum index 5bb178bfd..29877af3b 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -39,8 +39,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.13.0 h1:AYrLkB8NPdDRslNp4Jxmzrhdr03fUAIDbiGFjLWowoU= -cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= +cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0= +cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= diff --git a/internal/attestation/gcp/validator.go b/internal/attestation/gcp/validator.go index 85b4c5c38..3223dcee1 100644 --- a/internal/attestation/gcp/validator.go +++ b/internal/attestation/gcp/validator.go @@ -18,6 +18,7 @@ import ( "time" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/edgelesssys/constellation/v2/internal/attestation/measurements" "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/edgelesssys/constellation/v2/internal/oid" @@ -25,7 +26,6 @@ import ( "github.com/google/go-tpm-tools/server" "github.com/googleapis/gax-go/v2" "google.golang.org/api/option" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) // Validator for GCP confidential VM attestation. diff --git a/internal/attestation/gcp/validator_test.go b/internal/attestation/gcp/validator_test.go index 70119bcc6..05eb843e0 100644 --- a/internal/attestation/gcp/validator_test.go +++ b/internal/attestation/gcp/validator_test.go @@ -13,13 +13,13 @@ import ( "errors" "testing" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/edgelesssys/constellation/v2/internal/attestation/vtpm" "github.com/google/go-tpm-tools/proto/attest" "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/api/option" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/internal/cloud/gcp/cloud.go b/internal/cloud/gcp/cloud.go index 98f66d84e..fd77cf9b5 100644 --- a/internal/cloud/gcp/cloud.go +++ b/internal/cloud/gcp/cloud.go @@ -16,13 +16,13 @@ import ( "strings" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" imds "cloud.google.com/go/compute/metadata" "github.com/edgelesssys/constellation/v2/internal/cloud" "github.com/edgelesssys/constellation/v2/internal/cloud/gcpshared" "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" "github.com/edgelesssys/constellation/v2/internal/role" "google.golang.org/api/iterator" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/internal/cloud/gcp/cloud_test.go b/internal/cloud/gcp/cloud_test.go index bab5dc686..aa47232dd 100644 --- a/internal/cloud/gcp/cloud_test.go +++ b/internal/cloud/gcp/cloud_test.go @@ -11,6 +11,7 @@ import ( "errors" "testing" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/edgelesssys/constellation/v2/internal/cloud" "github.com/edgelesssys/constellation/v2/internal/cloud/metadata" "github.com/edgelesssys/constellation/v2/internal/role" @@ -19,7 +20,6 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" "google.golang.org/api/iterator" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/internal/cloud/gcp/interface.go b/internal/cloud/gcp/interface.go index d9cfe8adb..e8d6b0874 100644 --- a/internal/cloud/gcp/interface.go +++ b/internal/cloud/gcp/interface.go @@ -9,8 +9,8 @@ package gcp import ( "context" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/googleapis/gax-go/v2" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) type forwardingRulesAPI interface { diff --git a/internal/cloud/gcp/wrappers.go b/internal/cloud/gcp/wrappers.go index 384849f65..0ccc05d19 100644 --- a/internal/cloud/gcp/wrappers.go +++ b/internal/cloud/gcp/wrappers.go @@ -10,8 +10,8 @@ import ( "context" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/googleapis/gax-go/v2" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) type forwardingRuleIterator interface { diff --git a/operators/constellation-node-operator/go.mod b/operators/constellation-node-operator/go.mod index 594289db2..a3cb9fd24 100644 --- a/operators/constellation-node-operator/go.mod +++ b/operators/constellation-node-operator/go.mod @@ -3,7 +3,7 @@ module github.com/edgelesssys/constellation/operators/constellation-node-operato go 1.19 require ( - cloud.google.com/go/compute v1.12.1 + cloud.google.com/go/compute v1.14.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v2 v2.0.0 @@ -18,7 +18,6 @@ require ( go.etcd.io/etcd/client/v3 v3.5.6 go.uber.org/multierr v1.8.0 google.golang.org/api v0.103.0 - google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3 google.golang.org/protobuf v1.28.1 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -95,6 +94,7 @@ require ( golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect google.golang.org/grpc v1.50.1 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/operators/constellation-node-operator/go.sum b/operators/constellation-node-operator/go.sum index ce1449836..681eef854 100644 --- a/operators/constellation-node-operator/go.sum +++ b/operators/constellation-node-operator/go.sum @@ -24,8 +24,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= -cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= +cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0= +cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= @@ -721,8 +721,8 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3 h1:BCcW+lhENGqZ2R2MsM9oty220E8vY9E4QC1Tq05hN1E= -google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd h1:OjndDrsik+Gt+e6fs45z9AxiewiKyLKYpA45W5Kpkks= +google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/operators/constellation-node-operator/internal/gcp/client/api.go b/operators/constellation-node-operator/internal/gcp/client/api.go index 40c12a368..12966da9e 100644 --- a/operators/constellation-node-operator/internal/gcp/client/api.go +++ b/operators/constellation-node-operator/internal/gcp/client/api.go @@ -10,8 +10,8 @@ import ( "context" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/googleapis/gax-go/v2" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) type projectAPI interface { diff --git a/operators/constellation-node-operator/internal/gcp/client/client_test.go b/operators/constellation-node-operator/internal/gcp/client/client_test.go index 4b78253a8..fc5b16ad0 100644 --- a/operators/constellation-node-operator/internal/gcp/client/client_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/client_test.go @@ -10,9 +10,9 @@ import ( "context" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/googleapis/gax-go/v2" "google.golang.org/api/iterator" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/operators/constellation-node-operator/internal/gcp/client/disks.go b/operators/constellation-node-operator/internal/gcp/client/disks.go index 14ab90e7f..a8d244c20 100644 --- a/operators/constellation-node-operator/internal/gcp/client/disks.go +++ b/operators/constellation-node-operator/internal/gcp/client/disks.go @@ -10,7 +10,7 @@ import ( "fmt" "regexp" - "google.golang.org/genproto/googleapis/cloud/compute/v1" + "cloud.google.com/go/compute/apiv1/computepb" ) var ( @@ -19,12 +19,12 @@ var ( ) // diskSourceToDiskReq converts a disk source URI to a disk request. -func diskSourceToDiskReq(diskSource string) (*compute.GetDiskRequest, error) { +func diskSourceToDiskReq(diskSource string) (*computepb.GetDiskRequest, error) { matches := diskSourceRegex.FindStringSubmatch(diskSource) if len(matches) != 4 { return nil, fmt.Errorf("error splitting diskSource: %v", diskSource) } - return &compute.GetDiskRequest{ + return &computepb.GetDiskRequest{ Disk: matches[3], Project: matches[1], Zone: matches[2], diff --git a/operators/constellation-node-operator/internal/gcp/client/disks_test.go b/operators/constellation-node-operator/internal/gcp/client/disks_test.go index 6018141ab..f92ea8f63 100644 --- a/operators/constellation-node-operator/internal/gcp/client/disks_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/disks_test.go @@ -9,20 +9,20 @@ package client import ( "testing" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "google.golang.org/genproto/googleapis/cloud/compute/v1" ) func TestDiskSourceToDiskReq(t *testing.T) { testCases := map[string]struct { diskSource string - wantRequest *compute.GetDiskRequest + wantRequest *computepb.GetDiskRequest wantErr bool }{ "valid request": { diskSource: "https://www.googleapis.com/compute/v1/projects/project/zones/zone/disks/disk", - wantRequest: &compute.GetDiskRequest{ + wantRequest: &computepb.GetDiskRequest{ Disk: "disk", Project: "project", Zone: "zone", diff --git a/operators/constellation-node-operator/internal/gcp/client/gcpwrappers.go b/operators/constellation-node-operator/internal/gcp/client/gcpwrappers.go index b00eaf2a4..3d34efba7 100644 --- a/operators/constellation-node-operator/internal/gcp/client/gcpwrappers.go +++ b/operators/constellation-node-operator/internal/gcp/client/gcpwrappers.go @@ -10,8 +10,8 @@ import ( "context" compute "cloud.google.com/go/compute/apiv1" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/googleapis/gax-go/v2" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) type instanceTemplateClient struct { diff --git a/operators/constellation-node-operator/internal/gcp/client/metadata.go b/operators/constellation-node-operator/internal/gcp/client/metadata.go index cbb37defc..a8a89345a 100644 --- a/operators/constellation-node-operator/internal/gcp/client/metadata.go +++ b/operators/constellation-node-operator/internal/gcp/client/metadata.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only package client import ( - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" + "cloud.google.com/go/compute/apiv1/computepb" ) // getMetadataByKey returns the value of the metadata key in the given metadata. diff --git a/operators/constellation-node-operator/internal/gcp/client/metadata_test.go b/operators/constellation-node-operator/internal/gcp/client/metadata_test.go index 748826e75..c4dff26bc 100644 --- a/operators/constellation-node-operator/internal/gcp/client/metadata_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/metadata_test.go @@ -9,20 +9,20 @@ package client import ( "testing" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/stretchr/testify/assert" - "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) func TestGetMetadataByKey(t *testing.T) { testCases := map[string]struct { - metadata *compute.Metadata + metadata *computepb.Metadata key string wantValue string }{ "metadata has key": { - metadata: &compute.Metadata{ - Items: []*compute.Items{ + metadata: &computepb.Metadata{ + Items: []*computepb.Items{ {Key: proto.String("key"), Value: proto.String("value")}, }, }, @@ -30,8 +30,8 @@ func TestGetMetadataByKey(t *testing.T) { wantValue: "value", }, "metadata does not have key": { - metadata: &compute.Metadata{ - Items: []*compute.Items{ + metadata: &computepb.Metadata{ + Items: []*computepb.Items{ {Key: proto.String("otherkey"), Value: proto.String("value")}, }, }, @@ -39,8 +39,8 @@ func TestGetMetadataByKey(t *testing.T) { wantValue: "", }, "metadata contains invalid item": { - metadata: &compute.Metadata{ - Items: []*compute.Items{ + metadata: &computepb.Metadata{ + Items: []*computepb.Items{ {}, {Key: proto.String("key"), Value: proto.String("value")}, }, diff --git a/operators/constellation-node-operator/internal/gcp/client/nodeimage.go b/operators/constellation-node-operator/internal/gcp/client/nodeimage.go index 3b1d4d9a0..ddd102d39 100644 --- a/operators/constellation-node-operator/internal/gcp/client/nodeimage.go +++ b/operators/constellation-node-operator/internal/gcp/client/nodeimage.go @@ -10,7 +10,7 @@ import ( "context" "fmt" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" + "cloud.google.com/go/compute/apiv1/computepb" "google.golang.org/protobuf/proto" ) diff --git a/operators/constellation-node-operator/internal/gcp/client/nodeimage_test.go b/operators/constellation-node-operator/internal/gcp/client/nodeimage_test.go index a04306704..8ce178dca 100644 --- a/operators/constellation-node-operator/internal/gcp/client/nodeimage_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/nodeimage_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/operators/constellation-node-operator/internal/gcp/client/pendingnode.go b/operators/constellation-node-operator/internal/gcp/client/pendingnode.go index 40a56463e..e37f1e7f1 100644 --- a/operators/constellation-node-operator/internal/gcp/client/pendingnode.go +++ b/operators/constellation-node-operator/internal/gcp/client/pendingnode.go @@ -11,10 +11,10 @@ import ( "errors" "net/http" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" "google.golang.org/api/googleapi" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) // GetNodeState returns the state of the node. diff --git a/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go b/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go index 0372e193a..3cd3b6e80 100644 --- a/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/pendingnode_test.go @@ -12,11 +12,11 @@ import ( "net/http" "testing" + "cloud.google.com/go/compute/apiv1/computepb" updatev1alpha1 "github.com/edgelesssys/constellation/operators/constellation-node-operator/v2/api/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/api/googleapi" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/operators/constellation-node-operator/internal/gcp/client/project.go b/operators/constellation-node-operator/internal/gcp/client/project.go index 52e51a38e..edd131b5d 100644 --- a/operators/constellation-node-operator/internal/gcp/client/project.go +++ b/operators/constellation-node-operator/internal/gcp/client/project.go @@ -11,7 +11,7 @@ import ( "errors" "regexp" - "google.golang.org/genproto/googleapis/cloud/compute/v1" + "cloud.google.com/go/compute/apiv1/computepb" ) var numericProjectIDRegex = regexp.MustCompile(`^\d+$`) @@ -21,7 +21,7 @@ func (c *Client) canonicalProjectID(ctx context.Context, project string) (string if !numericProjectIDRegex.MatchString(project) { return project, nil } - computeProject, err := c.projectAPI.Get(ctx, &compute.GetProjectRequest{Project: project}) + computeProject, err := c.projectAPI.Get(ctx, &computepb.GetProjectRequest{Project: project}) if err != nil { return "", err } diff --git a/operators/constellation-node-operator/internal/gcp/client/project_test.go b/operators/constellation-node-operator/internal/gcp/client/project_test.go index 6e8d9269d..cd0c90326 100644 --- a/operators/constellation-node-operator/internal/gcp/client/project_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/project_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" ) diff --git a/operators/constellation-node-operator/internal/gcp/client/scalinggroup.go b/operators/constellation-node-operator/internal/gcp/client/scalinggroup.go index ff625ed32..44da99ff7 100644 --- a/operators/constellation-node-operator/internal/gcp/client/scalinggroup.go +++ b/operators/constellation-node-operator/internal/gcp/client/scalinggroup.go @@ -12,8 +12,8 @@ import ( "fmt" "strings" + "cloud.google.com/go/compute/apiv1/computepb" "google.golang.org/api/iterator" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" ) // GetScalingGroupImage returns the image URI of the scaling group. diff --git a/operators/constellation-node-operator/internal/gcp/client/scalinggroup_test.go b/operators/constellation-node-operator/internal/gcp/client/scalinggroup_test.go index 09d6f23a0..aafa2ee73 100644 --- a/operators/constellation-node-operator/internal/gcp/client/scalinggroup_test.go +++ b/operators/constellation-node-operator/internal/gcp/client/scalinggroup_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" + "cloud.google.com/go/compute/apiv1/computepb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - computepb "google.golang.org/genproto/googleapis/cloud/compute/v1" "google.golang.org/protobuf/proto" )