From 5d83e1e0b623e34816cf1001657ba517db59508b Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Wed, 25 Sep 2019 19:19:44 +0000 Subject: [PATCH 1/2] Generated from 01c1ffb5298f4f92e0d5a0e14116adcce413b950 udpated swagger to create DiskEncryptionSet as new property to initiate --- .../2019-03-01/compute/computeapi/interfaces.go | 2 +- .../mgmt/2019-03-01/compute/resourceskus.go | 15 +++++---------- .../2019-07-01/compute/computeapi/interfaces.go | 2 +- .../mgmt/2019-07-01/compute/resourceskus.go | 15 +++++---------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go b/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go index 260b56f5cbef..b9cb016a868d 100644 --- a/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go +++ b/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go @@ -246,7 +246,7 @@ var _ VirtualMachineRunCommandsClientAPI = (*compute.VirtualMachineRunCommandsCl // ResourceSkusClientAPI contains the set of methods on the ResourceSkusClient type. type ResourceSkusClientAPI interface { - List(ctx context.Context, filter string) (result compute.ResourceSkusResultPage, err error) + List(ctx context.Context) (result compute.ResourceSkusResultPage, err error) } var _ ResourceSkusClientAPI = (*compute.ResourceSkusClient)(nil) diff --git a/services/compute/mgmt/2019-03-01/compute/resourceskus.go b/services/compute/mgmt/2019-03-01/compute/resourceskus.go index adb402788c87..dade057a45fe 100644 --- a/services/compute/mgmt/2019-03-01/compute/resourceskus.go +++ b/services/compute/mgmt/2019-03-01/compute/resourceskus.go @@ -41,9 +41,7 @@ func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) Res } // List gets the list of Microsoft.Compute SKUs available for your Subscription. -// Parameters: -// filter - the filter to apply on the operation. -func (client ResourceSkusClient) List(ctx context.Context, filter string) (result ResourceSkusResultPage, err error) { +func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusResultPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -55,7 +53,7 @@ func (client ResourceSkusClient) List(ctx context.Context, filter string) (resul }() } result.fn = client.listNextResults - req, err := client.ListPreparer(ctx, filter) + req, err := client.ListPreparer(ctx) if err != nil { err = autorest.NewErrorWithError(err, "compute.ResourceSkusClient", "List", nil, "Failure preparing request") return @@ -77,7 +75,7 @@ func (client ResourceSkusClient) List(ctx context.Context, filter string) (resul } // ListPreparer prepares the List request. -func (client ResourceSkusClient) ListPreparer(ctx context.Context, filter string) (*http.Request, error) { +func (client ResourceSkusClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } @@ -86,9 +84,6 @@ func (client ResourceSkusClient) ListPreparer(ctx context.Context, filter string queryParameters := map[string]interface{}{ "api-version": APIVersion, } - if len(filter) > 0 { - queryParameters["$filter"] = autorest.Encode("query", filter) - } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -140,7 +135,7 @@ func (client ResourceSkusClient) listNextResults(ctx context.Context, lastResult } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client ResourceSkusClient) ListComplete(ctx context.Context, filter string) (result ResourceSkusResultIterator, err error) { +func (client ResourceSkusClient) ListComplete(ctx context.Context) (result ResourceSkusResultIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -151,6 +146,6 @@ func (client ResourceSkusClient) ListComplete(ctx context.Context, filter string tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.List(ctx, filter) + result.page, err = client.List(ctx) return } diff --git a/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go b/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go index 67bfee5070f6..1a3fc7f1d25a 100644 --- a/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go +++ b/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go @@ -246,7 +246,7 @@ var _ VirtualMachineRunCommandsClientAPI = (*compute.VirtualMachineRunCommandsCl // ResourceSkusClientAPI contains the set of methods on the ResourceSkusClient type. type ResourceSkusClientAPI interface { - List(ctx context.Context, filter string) (result compute.ResourceSkusResultPage, err error) + List(ctx context.Context) (result compute.ResourceSkusResultPage, err error) } var _ ResourceSkusClientAPI = (*compute.ResourceSkusClient)(nil) diff --git a/services/compute/mgmt/2019-07-01/compute/resourceskus.go b/services/compute/mgmt/2019-07-01/compute/resourceskus.go index adb402788c87..dade057a45fe 100644 --- a/services/compute/mgmt/2019-07-01/compute/resourceskus.go +++ b/services/compute/mgmt/2019-07-01/compute/resourceskus.go @@ -41,9 +41,7 @@ func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) Res } // List gets the list of Microsoft.Compute SKUs available for your Subscription. -// Parameters: -// filter - the filter to apply on the operation. -func (client ResourceSkusClient) List(ctx context.Context, filter string) (result ResourceSkusResultPage, err error) { +func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusResultPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -55,7 +53,7 @@ func (client ResourceSkusClient) List(ctx context.Context, filter string) (resul }() } result.fn = client.listNextResults - req, err := client.ListPreparer(ctx, filter) + req, err := client.ListPreparer(ctx) if err != nil { err = autorest.NewErrorWithError(err, "compute.ResourceSkusClient", "List", nil, "Failure preparing request") return @@ -77,7 +75,7 @@ func (client ResourceSkusClient) List(ctx context.Context, filter string) (resul } // ListPreparer prepares the List request. -func (client ResourceSkusClient) ListPreparer(ctx context.Context, filter string) (*http.Request, error) { +func (client ResourceSkusClient) ListPreparer(ctx context.Context) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } @@ -86,9 +84,6 @@ func (client ResourceSkusClient) ListPreparer(ctx context.Context, filter string queryParameters := map[string]interface{}{ "api-version": APIVersion, } - if len(filter) > 0 { - queryParameters["$filter"] = autorest.Encode("query", filter) - } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -140,7 +135,7 @@ func (client ResourceSkusClient) listNextResults(ctx context.Context, lastResult } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client ResourceSkusClient) ListComplete(ctx context.Context, filter string) (result ResourceSkusResultIterator, err error) { +func (client ResourceSkusClient) ListComplete(ctx context.Context) (result ResourceSkusResultIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -151,6 +146,6 @@ func (client ResourceSkusClient) ListComplete(ctx context.Context, filter string tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.List(ctx, filter) + result.page, err = client.List(ctx) return } From 3a6dae30c5aeeb34d51cfba38e83b3998359e7a4 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Thu, 26 Sep 2019 02:43:05 +0000 Subject: [PATCH 2/2] Generated from 7fe7fd77dbfdbf2aa869ca3efdd96af68826aee2 Merge branch 'compute-2019-07' into compute-2019-07 --- .../2019-03-01/compute/computeapi/interfaces.go | 2 +- .../mgmt/2019-03-01/compute/resourceskus.go | 15 ++++++++++----- .../2019-07-01/compute/computeapi/interfaces.go | 2 +- .../mgmt/2019-07-01/compute/resourceskus.go | 15 ++++++++++----- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go b/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go index b9cb016a868d..260b56f5cbef 100644 --- a/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go +++ b/services/compute/mgmt/2019-03-01/compute/computeapi/interfaces.go @@ -246,7 +246,7 @@ var _ VirtualMachineRunCommandsClientAPI = (*compute.VirtualMachineRunCommandsCl // ResourceSkusClientAPI contains the set of methods on the ResourceSkusClient type. type ResourceSkusClientAPI interface { - List(ctx context.Context) (result compute.ResourceSkusResultPage, err error) + List(ctx context.Context, filter string) (result compute.ResourceSkusResultPage, err error) } var _ ResourceSkusClientAPI = (*compute.ResourceSkusClient)(nil) diff --git a/services/compute/mgmt/2019-03-01/compute/resourceskus.go b/services/compute/mgmt/2019-03-01/compute/resourceskus.go index dade057a45fe..adb402788c87 100644 --- a/services/compute/mgmt/2019-03-01/compute/resourceskus.go +++ b/services/compute/mgmt/2019-03-01/compute/resourceskus.go @@ -41,7 +41,9 @@ func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) Res } // List gets the list of Microsoft.Compute SKUs available for your Subscription. -func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusResultPage, err error) { +// Parameters: +// filter - the filter to apply on the operation. +func (client ResourceSkusClient) List(ctx context.Context, filter string) (result ResourceSkusResultPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -53,7 +55,7 @@ func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusR }() } result.fn = client.listNextResults - req, err := client.ListPreparer(ctx) + req, err := client.ListPreparer(ctx, filter) if err != nil { err = autorest.NewErrorWithError(err, "compute.ResourceSkusClient", "List", nil, "Failure preparing request") return @@ -75,7 +77,7 @@ func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusR } // ListPreparer prepares the List request. -func (client ResourceSkusClient) ListPreparer(ctx context.Context) (*http.Request, error) { +func (client ResourceSkusClient) ListPreparer(ctx context.Context, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } @@ -84,6 +86,9 @@ func (client ResourceSkusClient) ListPreparer(ctx context.Context) (*http.Reques queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -135,7 +140,7 @@ func (client ResourceSkusClient) listNextResults(ctx context.Context, lastResult } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client ResourceSkusClient) ListComplete(ctx context.Context) (result ResourceSkusResultIterator, err error) { +func (client ResourceSkusClient) ListComplete(ctx context.Context, filter string) (result ResourceSkusResultIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -146,6 +151,6 @@ func (client ResourceSkusClient) ListComplete(ctx context.Context) (result Resou tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.List(ctx) + result.page, err = client.List(ctx, filter) return } diff --git a/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go b/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go index 1a3fc7f1d25a..67bfee5070f6 100644 --- a/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go +++ b/services/compute/mgmt/2019-07-01/compute/computeapi/interfaces.go @@ -246,7 +246,7 @@ var _ VirtualMachineRunCommandsClientAPI = (*compute.VirtualMachineRunCommandsCl // ResourceSkusClientAPI contains the set of methods on the ResourceSkusClient type. type ResourceSkusClientAPI interface { - List(ctx context.Context) (result compute.ResourceSkusResultPage, err error) + List(ctx context.Context, filter string) (result compute.ResourceSkusResultPage, err error) } var _ ResourceSkusClientAPI = (*compute.ResourceSkusClient)(nil) diff --git a/services/compute/mgmt/2019-07-01/compute/resourceskus.go b/services/compute/mgmt/2019-07-01/compute/resourceskus.go index dade057a45fe..adb402788c87 100644 --- a/services/compute/mgmt/2019-07-01/compute/resourceskus.go +++ b/services/compute/mgmt/2019-07-01/compute/resourceskus.go @@ -41,7 +41,9 @@ func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) Res } // List gets the list of Microsoft.Compute SKUs available for your Subscription. -func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusResultPage, err error) { +// Parameters: +// filter - the filter to apply on the operation. +func (client ResourceSkusClient) List(ctx context.Context, filter string) (result ResourceSkusResultPage, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -53,7 +55,7 @@ func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusR }() } result.fn = client.listNextResults - req, err := client.ListPreparer(ctx) + req, err := client.ListPreparer(ctx, filter) if err != nil { err = autorest.NewErrorWithError(err, "compute.ResourceSkusClient", "List", nil, "Failure preparing request") return @@ -75,7 +77,7 @@ func (client ResourceSkusClient) List(ctx context.Context) (result ResourceSkusR } // ListPreparer prepares the List request. -func (client ResourceSkusClient) ListPreparer(ctx context.Context) (*http.Request, error) { +func (client ResourceSkusClient) ListPreparer(ctx context.Context, filter string) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", client.SubscriptionID), } @@ -84,6 +86,9 @@ func (client ResourceSkusClient) ListPreparer(ctx context.Context) (*http.Reques queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -135,7 +140,7 @@ func (client ResourceSkusClient) listNextResults(ctx context.Context, lastResult } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client ResourceSkusClient) ListComplete(ctx context.Context) (result ResourceSkusResultIterator, err error) { +func (client ResourceSkusClient) ListComplete(ctx context.Context, filter string) (result ResourceSkusResultIterator, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/ResourceSkusClient.List") defer func() { @@ -146,6 +151,6 @@ func (client ResourceSkusClient) ListComplete(ctx context.Context) (result Resou tracing.EndSpan(ctx, sc, err) }() } - result.page, err = client.List(ctx) + result.page, err = client.List(ctx, filter) return }