Skip to content

[PWX-29160] Upgrade azure-sdk-for-go clients api to version '2021-07-01' #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alicelyy merged 5 commits into from
Feb 23, 2023
Merged

[PWX-29160] Upgrade azure-sdk-for-go clients api to version '2021-07-01' #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29c5a26
try newer version of older style
alicelyy Feb 17, 2023
53f3ebc
api fixes
alicelyy Feb 17, 2023
213af2a
add vendor folder
alicelyy Feb 21, 2023
ba33a07
update go version in go.mod
alicelyy Feb 21, 2023
8b8fa30
sync vendor
alicelyy Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions azure/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2019-02-01/containerservice"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2021-07-01/containerservice"
"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/autorest/azure/auth"
Expand Down Expand Up @@ -347,7 +347,7 @@ func (a *azureOps) SetInstanceGroupSize(instanceGroupID string,
instanceGroupSize := int32(count)
agentPoolProperties := containerservice.ManagedClusterAgentPoolProfileProperties{
Count: &instanceGroupSize,
OsType: containerservice.Linux,
OsType: containerservice.OSTypeLinux,
}

agentPool := containerservice.AgentPool{
Expand Down Expand Up @@ -410,7 +410,7 @@ func (a *azureOps) Create(
Sku: d.Sku,
DiskProperties: &compute.DiskProperties{
CreationData: &compute.CreationData{
CreateOption: compute.Empty,
CreateOption: compute.DiskCreateOptionEmpty,
},
DiskSizeGB: d.DiskProperties.DiskSizeGB,
DiskIOPSReadWrite: d.DiskProperties.DiskIOPSReadWrite,
Expand Down Expand Up @@ -850,7 +850,7 @@ func (a *azureOps) Snapshot(diskName string, readonly bool, options map[string]s
Location: disk.Location,
SnapshotProperties: &compute.SnapshotProperties{
CreationData: &compute.CreationData{
CreateOption: compute.Copy,
CreateOption: compute.DiskCreateOptionCopy,
SourceResourceID: disk.ID,
},
},
Expand Down
4 changes: 2 additions & 2 deletions azure/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/Azure/go-autorest/autorest/to"
"github.com/libopenstorage/cloudops"
"github.com/libopenstorage/cloudops/azure"
Expand Down Expand Up @@ -43,7 +43,7 @@ func initAzure(t *testing.T) (cloudops.Ops, map[string]interface{}) {
DiskMBpsReadWrite: to.Int64Ptr(550),
},
Sku: &compute.DiskSku{
Name: compute.PremiumLRS,
Name: compute.DiskStorageAccountTypesPremiumLRS,
},
}

Expand Down
4 changes: 2 additions & 2 deletions azure/base_vmsclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/Azure/go-autorest/autorest"
)

Expand Down Expand Up @@ -90,6 +90,6 @@ func (b *baseVMsClient) describeInstance(
context.Background(),
b.resourceGroupName,
instanceName,
compute.InstanceView,
compute.InstanceViewTypesInstanceView,
)
}
4 changes: 2 additions & 2 deletions azure/scaleset_vmsclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azure
import (
"context"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/Azure/go-autorest/autorest"
)

Expand Down Expand Up @@ -92,7 +92,7 @@ func (s *scaleSetVMsClient) describeInstance(
s.resourceGroupName,
s.scaleSetName,
instanceID,
compute.InstanceView,
compute.InstanceViewTypesInstanceView,
)
}

Expand Down
6 changes: 3 additions & 3 deletions azure/scaleset_vmsclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azure
import (
"testing"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/Azure/go-autorest/autorest/to"
"github.com/stretchr/testify/require"
)
Expand All @@ -25,8 +25,8 @@ func TestRetrieveDataDisks(t *testing.T) {
expectedRes []compute.DataDisk
}{
{
name: "nil vm properties",
input: compute.VirtualMachineScaleSetVM{},
name: "nil vm properties",
input: compute.VirtualMachineScaleSetVM{},
expectedRes: []compute.DataDisk{},
},
{
Expand Down
2 changes: 1 addition & 1 deletion azure/vmsclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package azure

import (
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/Azure/go-autorest/autorest"
)

Expand Down
73 changes: 68 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
module github.com/libopenstorage/cloudops

go 1.13
go 1.17

require (
cloud.google.com/go v0.65.0
github.com/Azure/azure-sdk-for-go v43.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.13
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.28
github.com/Azure/go-autorest/autorest/azure/auth v0.5.5
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20220329045155-d2a8118ac5c7
github.com/aws/aws-sdk-go v1.40.39
github.com/codeskyblue/go-sh v0.0.0-20170112005953-b097669b1569
Expand All @@ -32,8 +31,72 @@ require (
k8s.io/klog v1.0.0
)

require (
Copy link
Copy Markdown
Contributor

@nrevanna nrevanna Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have a single require section and not two.
@dahuang-purestorage ?
Also, do you see any concerns with these many require additions?

Copy link
Copy Markdown
Contributor

@dahuang-purestorage dahuang-purestorage Feb 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is fine. that's a new change in 1.17 where they separate require for direct and indirect dependencies.

github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/dimchansky/utfbom v1.1.0 // indirect
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-logr/logr v0.3.0 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.15.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
github.com/sony/gobreaker v0.5.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.22.4 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e // indirect
google.golang.org/grpc v1.36.0 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
k8s.io/api v0.20.4 // indirect
k8s.io/klog/v2 v2.4.0 // indirect
k8s.io/kube-openapi v0.0.0-20210216185858-15cd8face8d6 // indirect
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v40.2.0+incompatible
github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v5.1.1-0.20190919185747-9394ee8dd536+incompatible
github.com/prometheus/prometheus v2.9.2+incompatible => github.com/prometheus/prometheus v1.8.2-0.20190424153033-d3245f150225
Expand Down
Loading