From 829836de399c01b66ebe0caf122632f16eb7bee9 Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Fri, 29 Apr 2022 11:28:38 +0200 Subject: [PATCH 1/2] Update to compute API 2021-11-01 To allow access to CommunityGalleryImageID field in ImageReference. Refs #2267 Signed-off-by: Mateusz Gozdek --- api/v1beta1/azuremachine_validation.go | 2 +- api/v1beta1/azuremachine_validation_test.go | 2 +- api/v1beta1/azuremachinetemplate_webhook_test.go | 2 +- azure/converters/identity.go | 2 +- azure/converters/identity_test.go | 2 +- azure/converters/image.go | 2 +- azure/converters/image_test.go | 2 +- azure/converters/spotinstances.go | 2 +- azure/converters/vm.go | 2 +- azure/converters/vmss.go | 2 +- azure/converters/vmss_test.go | 2 +- azure/scope/machine.go | 2 +- azure/services/availabilitysets/availabilitysets.go | 2 +- azure/services/availabilitysets/availabilitysets_test.go | 2 +- azure/services/availabilitysets/client.go | 2 +- azure/services/availabilitysets/spec.go | 2 +- azure/services/availabilitysets/spec_test.go | 2 +- azure/services/disks/client.go | 2 +- azure/services/networkinterfaces/spec_test.go | 2 +- azure/services/resourceskus/cache.go | 2 +- azure/services/resourceskus/cache_test.go | 2 +- azure/services/resourceskus/client.go | 4 ++-- .../resourceskus/mock_resourceskus/resourceskus_mock.go | 2 +- azure/services/resourceskus/sku.go | 2 +- azure/services/roleassignments/roleassignments.go | 2 +- azure/services/roleassignments/roleassignments_test.go | 2 +- azure/services/scalesets/client.go | 2 +- azure/services/scalesets/mock_scalesets/client_mock.go | 2 +- azure/services/scalesets/scalesets.go | 2 +- azure/services/scalesets/scalesets_test.go | 2 +- azure/services/scalesets/vmssextension_spec.go | 2 +- azure/services/scalesetvms/client.go | 2 +- azure/services/scalesetvms/mock_scalesetvms/client_mock.go | 2 +- azure/services/scalesetvms/scalesetvms_test.go | 2 +- azure/services/virtualmachines/client.go | 2 +- azure/services/virtualmachines/spec.go | 2 +- azure/services/virtualmachines/spec_test.go | 2 +- azure/services/virtualmachines/virtualmachines.go | 2 +- azure/services/virtualmachines/virtualmachines_test.go | 2 +- azure/services/vmextensions/client.go | 2 +- azure/services/vmextensions/spec.go | 2 +- controllers/azurecluster_reconciler_test.go | 2 +- controllers/azuremachine_reconciler_test.go | 2 +- exp/controllers/azuremachinepool_reconciler_test.go | 2 +- exp/controllers/azuremanagedmachinepool_reconciler.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- test/e2e/azure_logcollector.go | 2 +- test/e2e/azure_privatecluster.go | 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/api/v1beta1/azuremachine_validation.go b/api/v1beta1/azuremachine_validation.go index 1ab9af07d34..7dab64472f6 100644 --- a/api/v1beta1/azuremachine_validation.go +++ b/api/v1beta1/azuremachine_validation.go @@ -20,7 +20,7 @@ import ( "encoding/base64" "fmt" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/google/uuid" "golang.org/x/crypto/ssh" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/api/v1beta1/azuremachine_validation_test.go b/api/v1beta1/azuremachine_validation_test.go index 406edb5a225..70683fddd6f 100644 --- a/api/v1beta1/azuremachine_validation_test.go +++ b/api/v1beta1/azuremachine_validation_test.go @@ -23,7 +23,7 @@ import ( "fmt" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/google/uuid" . "github.com/onsi/gomega" diff --git a/api/v1beta1/azuremachinetemplate_webhook_test.go b/api/v1beta1/azuremachinetemplate_webhook_test.go index 45912e44955..843fbb06aae 100644 --- a/api/v1beta1/azuremachinetemplate_webhook_test.go +++ b/api/v1beta1/azuremachinetemplate_webhook_test.go @@ -19,7 +19,7 @@ package v1beta1 import ( "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/azure/converters/identity.go b/azure/converters/identity.go index 3d2ff6bbb62..6993797aea2 100644 --- a/azure/converters/identity.go +++ b/azure/converters/identity.go @@ -19,7 +19,7 @@ package converters import ( "strings" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure" diff --git a/azure/converters/identity_test.go b/azure/converters/identity_test.go index db01b7478fc..a256392400a 100644 --- a/azure/converters/identity_test.go +++ b/azure/converters/identity_test.go @@ -19,7 +19,7 @@ package converters import ( "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" ) diff --git a/azure/converters/image.go b/azure/converters/image.go index cba2f4924ed..5526d66d4d2 100644 --- a/azure/converters/image.go +++ b/azure/converters/image.go @@ -19,7 +19,7 @@ package converters import ( "fmt" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/converters/image_test.go b/azure/converters/image_test.go index 22ad1143465..b80bbd21173 100644 --- a/azure/converters/image_test.go +++ b/azure/converters/image_test.go @@ -19,7 +19,7 @@ package converters import ( "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/converters/spotinstances.go b/azure/converters/spotinstances.go index 788f437c04a..298d451ac31 100644 --- a/azure/converters/spotinstances.go +++ b/azure/converters/spotinstances.go @@ -19,7 +19,7 @@ package converters import ( "strconv" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" ) diff --git a/azure/converters/vm.go b/azure/converters/vm.go index b54a2408c66..acc8f1f38ee 100644 --- a/azure/converters/vm.go +++ b/azure/converters/vm.go @@ -17,7 +17,7 @@ limitations under the License. package converters import ( - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" corev1 "k8s.io/api/core/v1" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/converters/vmss.go b/azure/converters/vmss.go index b77abbb0d6f..41f16c8db8f 100644 --- a/azure/converters/vmss.go +++ b/azure/converters/vmss.go @@ -17,7 +17,7 @@ limitations under the License. package converters import ( - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure" diff --git a/azure/converters/vmss_test.go b/azure/converters/vmss_test.go index 0e184da81b0..b6b52271b70 100644 --- a/azure/converters/vmss_test.go +++ b/azure/converters/vmss_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/onsi/gomega" "sigs.k8s.io/cluster-api-provider-azure/azure" diff --git a/azure/scope/machine.go b/azure/scope/machine.go index f79cc4c454c..89f4fbaf5f6 100644 --- a/azure/scope/machine.go +++ b/azure/scope/machine.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" diff --git a/azure/services/availabilitysets/availabilitysets.go b/azure/services/availabilitysets/availabilitysets.go index eb42763e3d1..1d8b5009d4e 100644 --- a/azure/services/availabilitysets/availabilitysets.go +++ b/azure/services/availabilitysets/availabilitysets.go @@ -19,7 +19,7 @@ package availabilitysets import ( "context" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure" diff --git a/azure/services/availabilitysets/availabilitysets_test.go b/azure/services/availabilitysets/availabilitysets_test.go index da9d0192aca..52fcb1a79a9 100644 --- a/azure/services/availabilitysets/availabilitysets_test.go +++ b/azure/services/availabilitysets/availabilitysets_test.go @@ -22,7 +22,7 @@ import ( "strconv" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "github.com/golang/mock/gomock" diff --git a/azure/services/availabilitysets/client.go b/azure/services/availabilitysets/client.go index 4085d9364ae..475e9d5323f 100644 --- a/azure/services/availabilitysets/client.go +++ b/azure/services/availabilitysets/client.go @@ -19,7 +19,7 @@ package availabilitysets import ( "context" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" azureautorest "github.com/Azure/go-autorest/autorest/azure" "github.com/pkg/errors" diff --git a/azure/services/availabilitysets/spec.go b/azure/services/availabilitysets/spec.go index a2131991101..1f0122f6351 100644 --- a/azure/services/availabilitysets/spec.go +++ b/azure/services/availabilitysets/spec.go @@ -19,7 +19,7 @@ package availabilitysets import ( "strconv" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/services/availabilitysets/spec_test.go b/azure/services/availabilitysets/spec_test.go index 818ff532987..6fd314e670d 100644 --- a/azure/services/availabilitysets/spec_test.go +++ b/azure/services/availabilitysets/spec_test.go @@ -19,7 +19,7 @@ package availabilitysets import ( "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" . "github.com/onsi/gomega" "sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus" diff --git a/azure/services/disks/client.go b/azure/services/disks/client.go index 93be2479920..b20a0ba4548 100644 --- a/azure/services/disks/client.go +++ b/azure/services/disks/client.go @@ -19,7 +19,7 @@ package disks import ( "context" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" azureautorest "github.com/Azure/go-autorest/autorest/azure" "github.com/pkg/errors" diff --git a/azure/services/networkinterfaces/spec_test.go b/azure/services/networkinterfaces/spec_test.go index c39b45fd219..5051d099175 100644 --- a/azure/services/networkinterfaces/spec_test.go +++ b/azure/services/networkinterfaces/spec_test.go @@ -19,7 +19,7 @@ package networkinterfaces import ( "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" "github.com/Azure/go-autorest/autorest/to" . "github.com/onsi/gomega" diff --git a/azure/services/resourceskus/cache.go b/azure/services/resourceskus/cache.go index 9808d220144..5642c519982 100644 --- a/azure/services/resourceskus/cache.go +++ b/azure/services/resourceskus/cache.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/util/cache/ttllru" diff --git a/azure/services/resourceskus/cache_test.go b/azure/services/resourceskus/cache_test.go index 4efbe58b53e..a224891fae9 100644 --- a/azure/services/resourceskus/cache_test.go +++ b/azure/services/resourceskus/cache_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" diff --git a/azure/services/resourceskus/client.go b/azure/services/resourceskus/client.go index 790afe9c63b..5baf02bc123 100644 --- a/azure/services/resourceskus/client.go +++ b/azure/services/resourceskus/client.go @@ -19,7 +19,7 @@ package resourceskus import ( "context" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-azure/azure" @@ -57,7 +57,7 @@ func (ac *AzureClient) List(ctx context.Context, filter string) ([]compute.Resou ctx, _, done := tele.StartSpanWithLogger(ctx, "resourceskus.AzureClient.List") defer done() - iter, err := ac.skus.ListComplete(ctx, filter) + iter, err := ac.skus.ListComplete(ctx, filter, "true") if err != nil { return nil, errors.Wrap(err, "could not list resource skus") } diff --git a/azure/services/resourceskus/mock_resourceskus/resourceskus_mock.go b/azure/services/resourceskus/mock_resourceskus/resourceskus_mock.go index ca027e5e491..15b79751991 100644 --- a/azure/services/resourceskus/mock_resourceskus/resourceskus_mock.go +++ b/azure/services/resourceskus/mock_resourceskus/resourceskus_mock.go @@ -24,7 +24,7 @@ import ( context "context" reflect "reflect" - compute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + compute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" gomock "github.com/golang/mock/gomock" ) diff --git a/azure/services/resourceskus/sku.go b/azure/services/resourceskus/sku.go index 5a525e67f6c..cd12217a201 100644 --- a/azure/services/resourceskus/sku.go +++ b/azure/services/resourceskus/sku.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/pkg/errors" ) diff --git a/azure/services/roleassignments/roleassignments.go b/azure/services/roleassignments/roleassignments.go index d4773a8cffa..00d43773fd3 100644 --- a/azure/services/roleassignments/roleassignments.go +++ b/azure/services/roleassignments/roleassignments.go @@ -19,7 +19,7 @@ package roleassignments import ( "context" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/azure/services/async" diff --git a/azure/services/roleassignments/roleassignments_test.go b/azure/services/roleassignments/roleassignments_test.go index 8f6468d5b9f..f44bdeb5058 100644 --- a/azure/services/roleassignments/roleassignments_test.go +++ b/azure/services/roleassignments/roleassignments_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "github.com/golang/mock/gomock" diff --git a/azure/services/scalesets/client.go b/azure/services/scalesets/client.go index 352ac897fe2..42bd1056901 100644 --- a/azure/services/scalesets/client.go +++ b/azure/services/scalesets/client.go @@ -23,7 +23,7 @@ import ( "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" azureautorest "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" diff --git a/azure/services/scalesets/mock_scalesets/client_mock.go b/azure/services/scalesets/mock_scalesets/client_mock.go index cc77b2c71cf..7d7539ceb19 100644 --- a/azure/services/scalesets/mock_scalesets/client_mock.go +++ b/azure/services/scalesets/mock_scalesets/client_mock.go @@ -24,7 +24,7 @@ import ( context "context" reflect "reflect" - compute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + compute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" autorest "github.com/Azure/go-autorest/autorest" gomock "github.com/golang/mock/gomock" v1beta1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/services/scalesets/scalesets.go b/azure/services/scalesets/scalesets.go index b930ed9240d..dafd7706897 100644 --- a/azure/services/scalesets/scalesets.go +++ b/azure/services/scalesets/scalesets.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/services/scalesets/scalesets_test.go b/azure/services/scalesets/scalesets_test.go index 16dadc451b9..283dc81bc8f 100644 --- a/azure/services/scalesets/scalesets_test.go +++ b/azure/services/scalesets/scalesets_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "github.com/golang/mock/gomock" diff --git a/azure/services/scalesets/vmssextension_spec.go b/azure/services/scalesets/vmssextension_spec.go index c9518e169ce..27f663c8153 100644 --- a/azure/services/scalesets/vmssextension_spec.go +++ b/azure/services/scalesets/vmssextension_spec.go @@ -17,7 +17,7 @@ limitations under the License. package scalesets import ( - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-azure/azure" diff --git a/azure/services/scalesetvms/client.go b/azure/services/scalesetvms/client.go index 8a62a824870..2ed02111fb4 100644 --- a/azure/services/scalesetvms/client.go +++ b/azure/services/scalesetvms/client.go @@ -22,7 +22,7 @@ import ( "encoding/json" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" diff --git a/azure/services/scalesetvms/mock_scalesetvms/client_mock.go b/azure/services/scalesetvms/mock_scalesetvms/client_mock.go index e7d353afc84..a8596e77d08 100644 --- a/azure/services/scalesetvms/mock_scalesetvms/client_mock.go +++ b/azure/services/scalesetvms/mock_scalesetvms/client_mock.go @@ -24,7 +24,7 @@ import ( context "context" reflect "reflect" - compute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + compute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" autorest "github.com/Azure/go-autorest/autorest" gomock "github.com/golang/mock/gomock" v1beta1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/services/scalesetvms/scalesetvms_test.go b/azure/services/scalesetvms/scalesetvms_test.go index 318b16a08e1..687ff1d0269 100644 --- a/azure/services/scalesetvms/scalesetvms_test.go +++ b/azure/services/scalesetvms/scalesetvms_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "github.com/golang/mock/gomock" diff --git a/azure/services/virtualmachines/client.go b/azure/services/virtualmachines/client.go index 344894e46df..f32fb5ff4f6 100644 --- a/azure/services/virtualmachines/client.go +++ b/azure/services/virtualmachines/client.go @@ -20,7 +20,7 @@ import ( "context" "encoding/json" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" azureautorest "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" diff --git a/azure/services/virtualmachines/spec.go b/azure/services/virtualmachines/spec.go index 5cf4caca8f9..c245519094b 100644 --- a/azure/services/virtualmachines/spec.go +++ b/azure/services/virtualmachines/spec.go @@ -20,7 +20,7 @@ import ( "encoding/base64" "fmt" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/azure/services/virtualmachines/spec_test.go b/azure/services/virtualmachines/spec_test.go index 8a47a7a4e80..d7f0fa5900d 100644 --- a/azure/services/virtualmachines/spec_test.go +++ b/azure/services/virtualmachines/spec_test.go @@ -19,7 +19,7 @@ package virtualmachines import ( "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" "github.com/Azure/go-autorest/autorest/to" "github.com/google/go-cmp/cmp" diff --git a/azure/services/virtualmachines/virtualmachines.go b/azure/services/virtualmachines/virtualmachines.go index ce05f3c0d90..79b0ba5d5d8 100644 --- a/azure/services/virtualmachines/virtualmachines.go +++ b/azure/services/virtualmachines/virtualmachines.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" diff --git a/azure/services/virtualmachines/virtualmachines_test.go b/azure/services/virtualmachines/virtualmachines_test.go index aeeff3e5c61..d3bb10a9d74 100644 --- a/azure/services/virtualmachines/virtualmachines_test.go +++ b/azure/services/virtualmachines/virtualmachines_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" diff --git a/azure/services/vmextensions/client.go b/azure/services/vmextensions/client.go index 2fbe26fe589..faa287786d6 100644 --- a/azure/services/vmextensions/client.go +++ b/azure/services/vmextensions/client.go @@ -20,7 +20,7 @@ import ( "context" "encoding/json" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest" azureautorest "github.com/Azure/go-autorest/autorest/azure" "github.com/pkg/errors" diff --git a/azure/services/vmextensions/spec.go b/azure/services/vmextensions/spec.go index 9396aa1b696..89d491b37cd 100644 --- a/azure/services/vmextensions/spec.go +++ b/azure/services/vmextensions/spec.go @@ -17,7 +17,7 @@ limitations under the License. package vmextensions import ( - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-azure/azure" diff --git a/controllers/azurecluster_reconciler_test.go b/controllers/azurecluster_reconciler_test.go index cb3d8054ed7..3028c7211ee 100644 --- a/controllers/azurecluster_reconciler_test.go +++ b/controllers/azurecluster_reconciler_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/golang/mock/gomock" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/controllers/azuremachine_reconciler_test.go b/controllers/azuremachine_reconciler_test.go index 54371bee889..fab0d76e5be 100644 --- a/controllers/azuremachine_reconciler_test.go +++ b/controllers/azuremachine_reconciler_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/golang/mock/gomock" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/exp/controllers/azuremachinepool_reconciler_test.go b/exp/controllers/azuremachinepool_reconciler_test.go index cba52e79fd2..6392d694322 100644 --- a/exp/controllers/azuremachinepool_reconciler_test.go +++ b/exp/controllers/azuremachinepool_reconciler_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/golang/mock/gomock" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" diff --git a/exp/controllers/azuremanagedmachinepool_reconciler.go b/exp/controllers/azuremanagedmachinepool_reconciler.go index 4d533a3c498..8e13e85fd66 100644 --- a/exp/controllers/azuremanagedmachinepool_reconciler.go +++ b/exp/controllers/azuremanagedmachinepool_reconciler.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-azure/azure" "sigs.k8s.io/cluster-api-provider-azure/azure/scope" diff --git a/go.mod b/go.mod index 24ab1d23121..4fc66f38ac7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/Azure/aad-pod-identity v1.8.6 - github.com/Azure/azure-sdk-for-go v58.1.0+incompatible + github.com/Azure/azure-sdk-for-go v63.4.0+incompatible github.com/Azure/go-autorest/autorest v0.11.23 github.com/Azure/go-autorest/autorest/adal v0.9.18 github.com/Azure/go-autorest/autorest/azure/auth v0.5.10 diff --git a/go.sum b/go.sum index 9c2e0ea9452..52aea88ca8b 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ github.com/Azure/aad-pod-identity v1.8.6/go.mod h1:A+7rb0WOEhBmVaFSl/MtdVCiugoTi github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v56.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v57.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v58.1.0+incompatible h1:WFsr3Efy7uweykOAEfOHO3ACtuwIv+rrFmSn9K48VnA= -github.com/Azure/azure-sdk-for-go v58.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v63.4.0+incompatible h1:fle3M5Q7vr8auaiPffKyUQmLbvYeqpw30bKU6PrWJFo= +github.com/Azure/azure-sdk-for-go v63.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= diff --git a/test/e2e/azure_logcollector.go b/test/e2e/azure_logcollector.go index 80ebe7e6fd6..ee18cbc3074 100644 --- a/test/e2e/azure_logcollector.go +++ b/test/e2e/azure_logcollector.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" autorest "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/pkg/errors" diff --git a/test/e2e/azure_privatecluster.go b/test/e2e/azure_privatecluster.go index 3d7ed037c05..859dca55bf7 100644 --- a/test/e2e/azure_privatecluster.go +++ b/test/e2e/azure_privatecluster.go @@ -26,7 +26,7 @@ import ( "path/filepath" "strings" - "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute" + "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-11-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources" From 50afd16beebc416b46bae6068f1beb73d18aa3ea Mon Sep 17 00:00:00 2001 From: Mateusz Gozdek Date: Mon, 9 May 2022 10:12:36 +0200 Subject: [PATCH 2/2] api/v1beta1/azureimage_validation.go: fix typo in function name Signed-off-by: Mateusz Gozdek --- api/v1beta1/azureimage_validation.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1beta1/azureimage_validation.go b/api/v1beta1/azureimage_validation.go index 1b0b106852f..ac6d14dcb94 100644 --- a/api/v1beta1/azureimage_validation.go +++ b/api/v1beta1/azureimage_validation.go @@ -38,7 +38,7 @@ func ValidateImage(image *Image, fldPath *field.Path) field.ErrorList { allErrs = append(allErrs, validateSharedGalleryImage(image, fldPath)...) } if image.ID != nil { - allErrs = append(allErrs, validateSpecifcImage(image, fldPath)...) + allErrs = append(allErrs, validateSpecificImage(image, fldPath)...) } return allErrs @@ -115,7 +115,7 @@ func validateMarketplaceImage(image *Image, fldPath *field.Path) field.ErrorList return allErrs } -func validateSpecifcImage(image *Image, fldPath *field.Path) field.ErrorList { +func validateSpecificImage(image *Image, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} if *image.ID == "" {