diff --git a/profiles/2017-03-09/resources/mgmt/subscriptions/models.go b/profiles/2017-03-09/resources/mgmt/subscriptions/models.go index 6cfb4ab39029..cb1aa0b6f920 100644 --- a/profiles/2017-03-09/resources/mgmt/subscriptions/models.go +++ b/profiles/2017-03-09/resources/mgmt/subscriptions/models.go @@ -48,7 +48,7 @@ const ( ) type BaseClient = original.BaseClient -type GroupClient = original.GroupClient +type Client = original.Client type ListResult = original.ListResult type ListResultIterator = original.ListResultIterator type ListResultPage = original.ListResultPage @@ -59,23 +59,23 @@ type OperationDisplay = original.OperationDisplay type OperationListResult = original.OperationListResult type OperationListResultIterator = original.OperationListResultIterator type OperationListResultPage = original.OperationListResultPage -type OperationsGroupClient = original.OperationsGroupClient +type OperationsClient = original.OperationsClient type Policies = original.Policies type Subscription = original.Subscription type TenantIDDescription = original.TenantIDDescription type TenantListResult = original.TenantListResult type TenantListResultIterator = original.TenantListResultIterator type TenantListResultPage = original.TenantListResultPage -type TenantsGroupClient = original.TenantsGroupClient +type TenantsClient = original.TenantsClient func New() BaseClient { return original.New() } -func NewGroupClient() GroupClient { - return original.NewGroupClient() +func NewClient() Client { + return original.NewClient() } -func NewGroupClientWithBaseURI(baseURI string) GroupClient { - return original.NewGroupClientWithBaseURI(baseURI) +func NewClientWithBaseURI(baseURI string) Client { + return original.NewClientWithBaseURI(baseURI) } func NewListResultIterator(page ListResultPage) ListResultIterator { return original.NewListResultIterator(page) @@ -89,11 +89,11 @@ func NewOperationListResultIterator(page OperationListResultPage) OperationListR func NewOperationListResultPage(getNextPage func(context.Context, OperationListResult) (OperationListResult, error)) OperationListResultPage { return original.NewOperationListResultPage(getNextPage) } -func NewOperationsGroupClient() OperationsGroupClient { - return original.NewOperationsGroupClient() +func NewOperationsClient() OperationsClient { + return original.NewOperationsClient() } -func NewOperationsGroupClientWithBaseURI(baseURI string) OperationsGroupClient { - return original.NewOperationsGroupClientWithBaseURI(baseURI) +func NewOperationsClientWithBaseURI(baseURI string) OperationsClient { + return original.NewOperationsClientWithBaseURI(baseURI) } func NewTenantListResultIterator(page TenantListResultPage) TenantListResultIterator { return original.NewTenantListResultIterator(page) @@ -101,11 +101,11 @@ func NewTenantListResultIterator(page TenantListResultPage) TenantListResultIter func NewTenantListResultPage(getNextPage func(context.Context, TenantListResult) (TenantListResult, error)) TenantListResultPage { return original.NewTenantListResultPage(getNextPage) } -func NewTenantsGroupClient() TenantsGroupClient { - return original.NewTenantsGroupClient() +func NewTenantsClient() TenantsClient { + return original.NewTenantsClient() } -func NewTenantsGroupClientWithBaseURI(baseURI string) TenantsGroupClient { - return original.NewTenantsGroupClientWithBaseURI(baseURI) +func NewTenantsClientWithBaseURI(baseURI string) TenantsClient { + return original.NewTenantsClientWithBaseURI(baseURI) } func NewWithBaseURI(baseURI string) BaseClient { return original.NewWithBaseURI(baseURI) diff --git a/profiles/2017-03-09/resources/mgmt/subscriptions/subscriptionsapi/models.go b/profiles/2017-03-09/resources/mgmt/subscriptions/subscriptionsapi/models.go index 9501c53fd15e..5d49a61a940e 100644 --- a/profiles/2017-03-09/resources/mgmt/subscriptions/subscriptionsapi/models.go +++ b/profiles/2017-03-09/resources/mgmt/subscriptions/subscriptionsapi/models.go @@ -21,6 +21,6 @@ package subscriptionsapi import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsapi" -type GroupClientAPI = original.GroupClientAPI -type OperationsGroupClientAPI = original.OperationsGroupClientAPI -type TenantsGroupClientAPI = original.TenantsGroupClientAPI +type ClientAPI = original.ClientAPI +type OperationsClientAPI = original.OperationsClientAPI +type TenantsClientAPI = original.TenantsClientAPI diff --git a/profiles/2018-03-01/resources/mgmt/subscriptions/models.go b/profiles/2018-03-01/resources/mgmt/subscriptions/models.go index 2a1cd9a40f04..3fc0a30b7ef5 100644 --- a/profiles/2018-03-01/resources/mgmt/subscriptions/models.go +++ b/profiles/2018-03-01/resources/mgmt/subscriptions/models.go @@ -48,7 +48,7 @@ const ( ) type BaseClient = original.BaseClient -type GroupClient = original.GroupClient +type Client = original.Client type ListResult = original.ListResult type ListResultIterator = original.ListResultIterator type ListResultPage = original.ListResultPage @@ -59,23 +59,23 @@ type OperationDisplay = original.OperationDisplay type OperationListResult = original.OperationListResult type OperationListResultIterator = original.OperationListResultIterator type OperationListResultPage = original.OperationListResultPage -type OperationsGroupClient = original.OperationsGroupClient +type OperationsClient = original.OperationsClient type Policies = original.Policies type Subscription = original.Subscription type TenantIDDescription = original.TenantIDDescription type TenantListResult = original.TenantListResult type TenantListResultIterator = original.TenantListResultIterator type TenantListResultPage = original.TenantListResultPage -type TenantsGroupClient = original.TenantsGroupClient +type TenantsClient = original.TenantsClient func New() BaseClient { return original.New() } -func NewGroupClient() GroupClient { - return original.NewGroupClient() +func NewClient() Client { + return original.NewClient() } -func NewGroupClientWithBaseURI(baseURI string) GroupClient { - return original.NewGroupClientWithBaseURI(baseURI) +func NewClientWithBaseURI(baseURI string) Client { + return original.NewClientWithBaseURI(baseURI) } func NewListResultIterator(page ListResultPage) ListResultIterator { return original.NewListResultIterator(page) @@ -89,11 +89,11 @@ func NewOperationListResultIterator(page OperationListResultPage) OperationListR func NewOperationListResultPage(getNextPage func(context.Context, OperationListResult) (OperationListResult, error)) OperationListResultPage { return original.NewOperationListResultPage(getNextPage) } -func NewOperationsGroupClient() OperationsGroupClient { - return original.NewOperationsGroupClient() +func NewOperationsClient() OperationsClient { + return original.NewOperationsClient() } -func NewOperationsGroupClientWithBaseURI(baseURI string) OperationsGroupClient { - return original.NewOperationsGroupClientWithBaseURI(baseURI) +func NewOperationsClientWithBaseURI(baseURI string) OperationsClient { + return original.NewOperationsClientWithBaseURI(baseURI) } func NewTenantListResultIterator(page TenantListResultPage) TenantListResultIterator { return original.NewTenantListResultIterator(page) @@ -101,11 +101,11 @@ func NewTenantListResultIterator(page TenantListResultPage) TenantListResultIter func NewTenantListResultPage(getNextPage func(context.Context, TenantListResult) (TenantListResult, error)) TenantListResultPage { return original.NewTenantListResultPage(getNextPage) } -func NewTenantsGroupClient() TenantsGroupClient { - return original.NewTenantsGroupClient() +func NewTenantsClient() TenantsClient { + return original.NewTenantsClient() } -func NewTenantsGroupClientWithBaseURI(baseURI string) TenantsGroupClient { - return original.NewTenantsGroupClientWithBaseURI(baseURI) +func NewTenantsClientWithBaseURI(baseURI string) TenantsClient { + return original.NewTenantsClientWithBaseURI(baseURI) } func NewWithBaseURI(baseURI string) BaseClient { return original.NewWithBaseURI(baseURI) diff --git a/profiles/2018-03-01/resources/mgmt/subscriptions/subscriptionsapi/models.go b/profiles/2018-03-01/resources/mgmt/subscriptions/subscriptionsapi/models.go index 9501c53fd15e..5d49a61a940e 100644 --- a/profiles/2018-03-01/resources/mgmt/subscriptions/subscriptionsapi/models.go +++ b/profiles/2018-03-01/resources/mgmt/subscriptions/subscriptionsapi/models.go @@ -21,6 +21,6 @@ package subscriptionsapi import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsapi" -type GroupClientAPI = original.GroupClientAPI -type OperationsGroupClientAPI = original.OperationsGroupClientAPI -type TenantsGroupClientAPI = original.TenantsGroupClientAPI +type ClientAPI = original.ClientAPI +type OperationsClientAPI = original.OperationsClientAPI +type TenantsClientAPI = original.TenantsClientAPI diff --git a/services/resources/mgmt/2016-06-01/subscriptions/operationsgroup.go b/services/resources/mgmt/2016-06-01/subscriptions/operations.go similarity index 64% rename from services/resources/mgmt/2016-06-01/subscriptions/operationsgroup.go rename to services/resources/mgmt/2016-06-01/subscriptions/operations.go index 3907ef0aebc6..18079e576437 100644 --- a/services/resources/mgmt/2016-06-01/subscriptions/operationsgroup.go +++ b/services/resources/mgmt/2016-06-01/subscriptions/operations.go @@ -25,27 +25,27 @@ import ( "net/http" ) -// OperationsGroupClient is the all resource groups and resources exist within subscriptions. These operation enable -// you get information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory -// (Azure AD) for your organization. -type OperationsGroupClient struct { +// OperationsClient is the all resource groups and resources exist within subscriptions. These operation enable you get +// information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure +// AD) for your organization. +type OperationsClient struct { BaseClient } -// NewOperationsGroupClient creates an instance of the OperationsGroupClient client. -func NewOperationsGroupClient() OperationsGroupClient { - return NewOperationsGroupClientWithBaseURI(DefaultBaseURI) +// NewOperationsClient creates an instance of the OperationsClient client. +func NewOperationsClient() OperationsClient { + return NewOperationsClientWithBaseURI(DefaultBaseURI) } -// NewOperationsGroupClientWithBaseURI creates an instance of the OperationsGroupClient client. -func NewOperationsGroupClientWithBaseURI(baseURI string) OperationsGroupClient { - return OperationsGroupClient{NewWithBaseURI(baseURI)} +// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client. +func NewOperationsClientWithBaseURI(baseURI string) OperationsClient { + return OperationsClient{NewWithBaseURI(baseURI)} } // List lists all of the available Microsoft.Resources REST API operations. -func (client OperationsGroupClient) List(ctx context.Context) (result OperationListResultPage, err error) { +func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/OperationsGroupClient.List") + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") defer func() { sc := -1 if result.olr.Response.Response != nil { @@ -57,27 +57,27 @@ func (client OperationsGroupClient) List(ctx context.Context) (result OperationL result.fn = client.listNextResults req, err := client.ListPreparer(ctx) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.OperationsGroupClient", "List", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "subscriptions.OperationsClient", "List", nil, "Failure preparing request") return } resp, err := client.ListSender(req) if err != nil { result.olr.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "subscriptions.OperationsGroupClient", "List", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "subscriptions.OperationsClient", "List", resp, "Failure sending request") return } result.olr, err = client.ListResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.OperationsGroupClient", "List", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "subscriptions.OperationsClient", "List", resp, "Failure responding to request") } return } // ListPreparer prepares the List request. -func (client OperationsGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) { +func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2016-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, @@ -93,14 +93,14 @@ func (client OperationsGroupClient) ListPreparer(ctx context.Context) (*http.Req // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. -func (client OperationsGroupClient) ListSender(req *http.Request) (*http.Response, error) { +func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) { return autorest.SendWithSender(client, req, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } // ListResponder handles the response to the List request. The method always // closes the http.Response Body. -func (client OperationsGroupClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { +func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -112,10 +112,10 @@ func (client OperationsGroupClient) ListResponder(resp *http.Response) (result O } // listNextResults retrieves the next set of results, if any. -func (client OperationsGroupClient) listNextResults(ctx context.Context, lastResults OperationListResult) (result OperationListResult, err error) { +func (client OperationsClient) listNextResults(ctx context.Context, lastResults OperationListResult) (result OperationListResult, err error) { req, err := lastResults.operationListResultPreparer(ctx) if err != nil { - return result, autorest.NewErrorWithError(err, "subscriptions.OperationsGroupClient", "listNextResults", nil, "Failure preparing next results request") + return result, autorest.NewErrorWithError(err, "subscriptions.OperationsClient", "listNextResults", nil, "Failure preparing next results request") } if req == nil { return @@ -123,19 +123,19 @@ func (client OperationsGroupClient) listNextResults(ctx context.Context, lastRes resp, err := client.ListSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "subscriptions.OperationsGroupClient", "listNextResults", resp, "Failure sending next results request") + return result, autorest.NewErrorWithError(err, "subscriptions.OperationsClient", "listNextResults", resp, "Failure sending next results request") } result, err = client.ListResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.OperationsGroupClient", "listNextResults", resp, "Failure responding to next results request") + err = autorest.NewErrorWithError(err, "subscriptions.OperationsClient", "listNextResults", resp, "Failure responding to next results request") } return } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client OperationsGroupClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { +func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/OperationsGroupClient.List") + ctx = tracing.StartSpan(ctx, fqdn+"/OperationsClient.List") defer func() { sc := -1 if result.Response().Response.Response != nil { diff --git a/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsgroup.go b/services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go similarity index 67% rename from services/resources/mgmt/2016-06-01/subscriptions/subscriptionsgroup.go rename to services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go index ea8cb77152ba..df7ce71c824f 100644 --- a/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsgroup.go +++ b/services/resources/mgmt/2016-06-01/subscriptions/subscriptions.go @@ -25,29 +25,29 @@ import ( "net/http" ) -// GroupClient is the all resource groups and resources exist within subscriptions. These operation enable you get +// Client is the all resource groups and resources exist within subscriptions. These operation enable you get // information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure // AD) for your organization. -type GroupClient struct { +type Client struct { BaseClient } -// NewGroupClient creates an instance of the GroupClient client. -func NewGroupClient() GroupClient { - return NewGroupClientWithBaseURI(DefaultBaseURI) +// NewClient creates an instance of the Client client. +func NewClient() Client { + return NewClientWithBaseURI(DefaultBaseURI) } -// NewGroupClientWithBaseURI creates an instance of the GroupClient client. -func NewGroupClientWithBaseURI(baseURI string) GroupClient { - return GroupClient{NewWithBaseURI(baseURI)} +// NewClientWithBaseURI creates an instance of the Client client. +func NewClientWithBaseURI(baseURI string) Client { + return Client{NewWithBaseURI(baseURI)} } // Get gets details about a specified subscription. // Parameters: // subscriptionID - the ID of the target subscription. -func (client GroupClient) Get(ctx context.Context, subscriptionID string) (result Subscription, err error) { +func (client Client) Get(ctx context.Context, subscriptionID string) (result Subscription, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/GroupClient.Get") + ctx = tracing.StartSpan(ctx, fqdn+"/Client.Get") defer func() { sc := -1 if result.Response.Response != nil { @@ -58,27 +58,27 @@ func (client GroupClient) Get(ctx context.Context, subscriptionID string) (resul } req, err := client.GetPreparer(ctx, subscriptionID) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "Get", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "Get", nil, "Failure preparing request") return } resp, err := client.GetSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "Get", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "Get", resp, "Failure sending request") return } result, err = client.GetResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "Get", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "Get", resp, "Failure responding to request") } return } // GetPreparer prepares the Get request. -func (client GroupClient) GetPreparer(ctx context.Context, subscriptionID string) (*http.Request, error) { +func (client Client) GetPreparer(ctx context.Context, subscriptionID string) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", subscriptionID), } @@ -98,14 +98,14 @@ func (client GroupClient) GetPreparer(ctx context.Context, subscriptionID string // GetSender sends the Get request. The method will close the // http.Response Body if it receives an error. -func (client GroupClient) GetSender(req *http.Request) (*http.Response, error) { +func (client Client) GetSender(req *http.Request) (*http.Response, error) { return autorest.SendWithSender(client, req, azure.DoRetryWithRegistration(client.Client)) } // GetResponder handles the response to the Get request. The method always // closes the http.Response Body. -func (client GroupClient) GetResponder(resp *http.Response) (result Subscription, err error) { +func (client Client) GetResponder(resp *http.Response) (result Subscription, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -117,9 +117,9 @@ func (client GroupClient) GetResponder(resp *http.Response) (result Subscription } // List gets all subscriptions for a tenant. -func (client GroupClient) List(ctx context.Context) (result ListResultPage, err error) { +func (client Client) List(ctx context.Context) (result ListResultPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/GroupClient.List") + ctx = tracing.StartSpan(ctx, fqdn+"/Client.List") defer func() { sc := -1 if result.lr.Response.Response != nil { @@ -131,27 +131,27 @@ func (client GroupClient) List(ctx context.Context) (result ListResultPage, err result.fn = client.listNextResults req, err := client.ListPreparer(ctx) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "List", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "List", nil, "Failure preparing request") return } resp, err := client.ListSender(req) if err != nil { result.lr.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "List", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "List", resp, "Failure sending request") return } result.lr, err = client.ListResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "List", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "List", resp, "Failure responding to request") } return } // ListPreparer prepares the List request. -func (client GroupClient) ListPreparer(ctx context.Context) (*http.Request, error) { +func (client Client) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2016-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, @@ -167,14 +167,14 @@ func (client GroupClient) ListPreparer(ctx context.Context) (*http.Request, erro // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. -func (client GroupClient) ListSender(req *http.Request) (*http.Response, error) { +func (client Client) ListSender(req *http.Request) (*http.Response, error) { return autorest.SendWithSender(client, req, azure.DoRetryWithRegistration(client.Client)) } // ListResponder handles the response to the List request. The method always // closes the http.Response Body. -func (client GroupClient) ListResponder(resp *http.Response) (result ListResult, err error) { +func (client Client) ListResponder(resp *http.Response) (result ListResult, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -186,10 +186,10 @@ func (client GroupClient) ListResponder(resp *http.Response) (result ListResult, } // listNextResults retrieves the next set of results, if any. -func (client GroupClient) listNextResults(ctx context.Context, lastResults ListResult) (result ListResult, err error) { +func (client Client) listNextResults(ctx context.Context, lastResults ListResult) (result ListResult, err error) { req, err := lastResults.listResultPreparer(ctx) if err != nil { - return result, autorest.NewErrorWithError(err, "subscriptions.GroupClient", "listNextResults", nil, "Failure preparing next results request") + return result, autorest.NewErrorWithError(err, "subscriptions.Client", "listNextResults", nil, "Failure preparing next results request") } if req == nil { return @@ -197,19 +197,19 @@ func (client GroupClient) listNextResults(ctx context.Context, lastResults ListR resp, err := client.ListSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "subscriptions.GroupClient", "listNextResults", resp, "Failure sending next results request") + return result, autorest.NewErrorWithError(err, "subscriptions.Client", "listNextResults", resp, "Failure sending next results request") } result, err = client.ListResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "listNextResults", resp, "Failure responding to next results request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "listNextResults", resp, "Failure responding to next results request") } return } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client GroupClient) ListComplete(ctx context.Context) (result ListResultIterator, err error) { +func (client Client) ListComplete(ctx context.Context) (result ListResultIterator, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/GroupClient.List") + ctx = tracing.StartSpan(ctx, fqdn+"/Client.List") defer func() { sc := -1 if result.Response().Response.Response != nil { @@ -226,9 +226,9 @@ func (client GroupClient) ListComplete(ctx context.Context) (result ListResultIt // resource provider may support a subset of this list. // Parameters: // subscriptionID - the ID of the target subscription. -func (client GroupClient) ListLocations(ctx context.Context, subscriptionID string) (result LocationListResult, err error) { +func (client Client) ListLocations(ctx context.Context, subscriptionID string) (result LocationListResult, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/GroupClient.ListLocations") + ctx = tracing.StartSpan(ctx, fqdn+"/Client.ListLocations") defer func() { sc := -1 if result.Response.Response != nil { @@ -239,27 +239,27 @@ func (client GroupClient) ListLocations(ctx context.Context, subscriptionID stri } req, err := client.ListLocationsPreparer(ctx, subscriptionID) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "ListLocations", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "ListLocations", nil, "Failure preparing request") return } resp, err := client.ListLocationsSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "ListLocations", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "ListLocations", resp, "Failure sending request") return } result, err = client.ListLocationsResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.GroupClient", "ListLocations", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "subscriptions.Client", "ListLocations", resp, "Failure responding to request") } return } // ListLocationsPreparer prepares the ListLocations request. -func (client GroupClient) ListLocationsPreparer(ctx context.Context, subscriptionID string) (*http.Request, error) { +func (client Client) ListLocationsPreparer(ctx context.Context, subscriptionID string) (*http.Request, error) { pathParameters := map[string]interface{}{ "subscriptionId": autorest.Encode("path", subscriptionID), } @@ -279,14 +279,14 @@ func (client GroupClient) ListLocationsPreparer(ctx context.Context, subscriptio // ListLocationsSender sends the ListLocations request. The method will close the // http.Response Body if it receives an error. -func (client GroupClient) ListLocationsSender(req *http.Request) (*http.Response, error) { +func (client Client) ListLocationsSender(req *http.Request) (*http.Response, error) { return autorest.SendWithSender(client, req, azure.DoRetryWithRegistration(client.Client)) } // ListLocationsResponder handles the response to the ListLocations request. The method always // closes the http.Response Body. -func (client GroupClient) ListLocationsResponder(resp *http.Response) (result LocationListResult, err error) { +func (client Client) ListLocationsResponder(resp *http.Response) (result LocationListResult, err error) { err = autorest.Respond( resp, client.ByInspecting(), diff --git a/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsapi/interfaces.go b/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsapi/interfaces.go index be331b52aaa0..037b74c82fa4 100644 --- a/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsapi/interfaces.go +++ b/services/resources/mgmt/2016-06-01/subscriptions/subscriptionsapi/interfaces.go @@ -22,25 +22,25 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions" ) -// OperationsGroupClientAPI contains the set of methods on the OperationsGroupClient type. -type OperationsGroupClientAPI interface { +// OperationsClientAPI contains the set of methods on the OperationsClient type. +type OperationsClientAPI interface { List(ctx context.Context) (result subscriptions.OperationListResultPage, err error) } -var _ OperationsGroupClientAPI = (*subscriptions.OperationsGroupClient)(nil) +var _ OperationsClientAPI = (*subscriptions.OperationsClient)(nil) -// GroupClientAPI contains the set of methods on the GroupClient type. -type GroupClientAPI interface { +// ClientAPI contains the set of methods on the Client type. +type ClientAPI interface { Get(ctx context.Context, subscriptionID string) (result subscriptions.Subscription, err error) List(ctx context.Context) (result subscriptions.ListResultPage, err error) ListLocations(ctx context.Context, subscriptionID string) (result subscriptions.LocationListResult, err error) } -var _ GroupClientAPI = (*subscriptions.GroupClient)(nil) +var _ ClientAPI = (*subscriptions.Client)(nil) -// TenantsGroupClientAPI contains the set of methods on the TenantsGroupClient type. -type TenantsGroupClientAPI interface { +// TenantsClientAPI contains the set of methods on the TenantsClient type. +type TenantsClientAPI interface { List(ctx context.Context) (result subscriptions.TenantListResultPage, err error) } -var _ TenantsGroupClientAPI = (*subscriptions.TenantsGroupClient)(nil) +var _ TenantsClientAPI = (*subscriptions.TenantsClient)(nil) diff --git a/services/resources/mgmt/2016-06-01/subscriptions/tenantsgroup.go b/services/resources/mgmt/2016-06-01/subscriptions/tenants.go similarity index 60% rename from services/resources/mgmt/2016-06-01/subscriptions/tenantsgroup.go rename to services/resources/mgmt/2016-06-01/subscriptions/tenants.go index eaaf1b1307fb..3fc98f0db1c9 100644 --- a/services/resources/mgmt/2016-06-01/subscriptions/tenantsgroup.go +++ b/services/resources/mgmt/2016-06-01/subscriptions/tenants.go @@ -25,27 +25,27 @@ import ( "net/http" ) -// TenantsGroupClient is the all resource groups and resources exist within subscriptions. These operation enable you -// get information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory -// (Azure AD) for your organization. -type TenantsGroupClient struct { +// TenantsClient is the all resource groups and resources exist within subscriptions. These operation enable you get +// information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure +// AD) for your organization. +type TenantsClient struct { BaseClient } -// NewTenantsGroupClient creates an instance of the TenantsGroupClient client. -func NewTenantsGroupClient() TenantsGroupClient { - return NewTenantsGroupClientWithBaseURI(DefaultBaseURI) +// NewTenantsClient creates an instance of the TenantsClient client. +func NewTenantsClient() TenantsClient { + return NewTenantsClientWithBaseURI(DefaultBaseURI) } -// NewTenantsGroupClientWithBaseURI creates an instance of the TenantsGroupClient client. -func NewTenantsGroupClientWithBaseURI(baseURI string) TenantsGroupClient { - return TenantsGroupClient{NewWithBaseURI(baseURI)} +// NewTenantsClientWithBaseURI creates an instance of the TenantsClient client. +func NewTenantsClientWithBaseURI(baseURI string) TenantsClient { + return TenantsClient{NewWithBaseURI(baseURI)} } // List gets the tenants for your account. -func (client TenantsGroupClient) List(ctx context.Context) (result TenantListResultPage, err error) { +func (client TenantsClient) List(ctx context.Context) (result TenantListResultPage, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/TenantsGroupClient.List") + ctx = tracing.StartSpan(ctx, fqdn+"/TenantsClient.List") defer func() { sc := -1 if result.tlr.Response.Response != nil { @@ -57,27 +57,27 @@ func (client TenantsGroupClient) List(ctx context.Context) (result TenantListRes result.fn = client.listNextResults req, err := client.ListPreparer(ctx) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.TenantsGroupClient", "List", nil, "Failure preparing request") + err = autorest.NewErrorWithError(err, "subscriptions.TenantsClient", "List", nil, "Failure preparing request") return } resp, err := client.ListSender(req) if err != nil { result.tlr.Response = autorest.Response{Response: resp} - err = autorest.NewErrorWithError(err, "subscriptions.TenantsGroupClient", "List", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "subscriptions.TenantsClient", "List", resp, "Failure sending request") return } result.tlr, err = client.ListResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.TenantsGroupClient", "List", resp, "Failure responding to request") + err = autorest.NewErrorWithError(err, "subscriptions.TenantsClient", "List", resp, "Failure responding to request") } return } // ListPreparer prepares the List request. -func (client TenantsGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) { +func (client TenantsClient) ListPreparer(ctx context.Context) (*http.Request, error) { const APIVersion = "2016-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, @@ -93,14 +93,14 @@ func (client TenantsGroupClient) ListPreparer(ctx context.Context) (*http.Reques // ListSender sends the List request. The method will close the // http.Response Body if it receives an error. -func (client TenantsGroupClient) ListSender(req *http.Request) (*http.Response, error) { +func (client TenantsClient) ListSender(req *http.Request) (*http.Response, error) { return autorest.SendWithSender(client, req, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) } // ListResponder handles the response to the List request. The method always // closes the http.Response Body. -func (client TenantsGroupClient) ListResponder(resp *http.Response) (result TenantListResult, err error) { +func (client TenantsClient) ListResponder(resp *http.Response) (result TenantListResult, err error) { err = autorest.Respond( resp, client.ByInspecting(), @@ -112,10 +112,10 @@ func (client TenantsGroupClient) ListResponder(resp *http.Response) (result Tena } // listNextResults retrieves the next set of results, if any. -func (client TenantsGroupClient) listNextResults(ctx context.Context, lastResults TenantListResult) (result TenantListResult, err error) { +func (client TenantsClient) listNextResults(ctx context.Context, lastResults TenantListResult) (result TenantListResult, err error) { req, err := lastResults.tenantListResultPreparer(ctx) if err != nil { - return result, autorest.NewErrorWithError(err, "subscriptions.TenantsGroupClient", "listNextResults", nil, "Failure preparing next results request") + return result, autorest.NewErrorWithError(err, "subscriptions.TenantsClient", "listNextResults", nil, "Failure preparing next results request") } if req == nil { return @@ -123,19 +123,19 @@ func (client TenantsGroupClient) listNextResults(ctx context.Context, lastResult resp, err := client.ListSender(req) if err != nil { result.Response = autorest.Response{Response: resp} - return result, autorest.NewErrorWithError(err, "subscriptions.TenantsGroupClient", "listNextResults", resp, "Failure sending next results request") + return result, autorest.NewErrorWithError(err, "subscriptions.TenantsClient", "listNextResults", resp, "Failure sending next results request") } result, err = client.ListResponder(resp) if err != nil { - err = autorest.NewErrorWithError(err, "subscriptions.TenantsGroupClient", "listNextResults", resp, "Failure responding to next results request") + err = autorest.NewErrorWithError(err, "subscriptions.TenantsClient", "listNextResults", resp, "Failure responding to next results request") } return } // ListComplete enumerates all values, automatically crossing page boundaries as required. -func (client TenantsGroupClient) ListComplete(ctx context.Context) (result TenantListResultIterator, err error) { +func (client TenantsClient) ListComplete(ctx context.Context) (result TenantListResultIterator, err error) { if tracing.IsEnabled() { - ctx = tracing.StartSpan(ctx, fqdn+"/TenantsGroupClient.List") + ctx = tracing.StartSpan(ctx, fqdn+"/TenantsClient.List") defer func() { sc := -1 if result.Response().Response.Response != nil { diff --git a/services/resources/mgmt/2016-09-01/locks/locksapi/interfaces.go b/services/resources/mgmt/2016-09-01/locks/locksapi/interfaces.go index 4da0f4e7e5d4..15d815a1e3c8 100644 --- a/services/resources/mgmt/2016-09-01/locks/locksapi/interfaces.go +++ b/services/resources/mgmt/2016-09-01/locks/locksapi/interfaces.go @@ -47,6 +47,7 @@ type ManagementLocksClientAPI interface { ListAtResourceGroupLevel(ctx context.Context, resourceGroupName string, filter string) (result locks.ManagementLockListResultPage, err error) ListAtResourceLevel(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, filter string) (result locks.ManagementLockListResultPage, err error) ListAtSubscriptionLevel(ctx context.Context, filter string) (result locks.ManagementLockListResultPage, err error) + ListByScope(ctx context.Context, scope string, filter string) (result locks.ManagementLockListResultPage, err error) } var _ ManagementLocksClientAPI = (*locks.ManagementLocksClient)(nil) diff --git a/services/resources/mgmt/2016-09-01/locks/managementlocks.go b/services/resources/mgmt/2016-09-01/locks/managementlocks.go index 644bcfd2eb5d..7bcb6dd85ef7 100644 --- a/services/resources/mgmt/2016-09-01/locks/managementlocks.go +++ b/services/resources/mgmt/2016-09-01/locks/managementlocks.go @@ -1459,3 +1459,123 @@ func (client ManagementLocksClient) ListAtSubscriptionLevelComplete(ctx context. result.page, err = client.ListAtSubscriptionLevel(ctx, filter) return } + +// ListByScope gets all the management locks for a scope. +// Parameters: +// scope - the scope for the lock. When providing a scope for the assignment, use +// '/subscriptions/{subscriptionId}' for subscriptions, +// '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}' for resource groups, and +// '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePathIfPresent}/{resourceType}/{resourceName}' +// for resources. +// filter - the filter to apply on the operation. +func (client ManagementLocksClient) ListByScope(ctx context.Context, scope string, filter string) (result ManagementLockListResultPage, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ManagementLocksClient.ListByScope") + defer func() { + sc := -1 + if result.mllr.Response.Response != nil { + sc = result.mllr.Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.fn = client.listByScopeNextResults + req, err := client.ListByScopePreparer(ctx, scope, filter) + if err != nil { + err = autorest.NewErrorWithError(err, "locks.ManagementLocksClient", "ListByScope", nil, "Failure preparing request") + return + } + + resp, err := client.ListByScopeSender(req) + if err != nil { + result.mllr.Response = autorest.Response{Response: resp} + err = autorest.NewErrorWithError(err, "locks.ManagementLocksClient", "ListByScope", resp, "Failure sending request") + return + } + + result.mllr, err = client.ListByScopeResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "locks.ManagementLocksClient", "ListByScope", resp, "Failure responding to request") + } + + return +} + +// ListByScopePreparer prepares the ListByScope request. +func (client ManagementLocksClient) ListByScopePreparer(ctx context.Context, scope string, filter string) (*http.Request, error) { + pathParameters := map[string]interface{}{ + "scope": autorest.Encode("path", scope), + } + + const APIVersion = "2016-09-01" + queryParameters := map[string]interface{}{ + "api-version": APIVersion, + } + if len(filter) > 0 { + queryParameters["$filter"] = autorest.Encode("query", filter) + } + + preparer := autorest.CreatePreparer( + autorest.AsGet(), + autorest.WithBaseURL(client.BaseURI), + autorest.WithPathParameters("/{scope}/providers/Microsoft.Authorization/locks", pathParameters), + autorest.WithQueryParameters(queryParameters)) + return preparer.Prepare((&http.Request{}).WithContext(ctx)) +} + +// ListByScopeSender sends the ListByScope request. The method will close the +// http.Response Body if it receives an error. +func (client ManagementLocksClient) ListByScopeSender(req *http.Request) (*http.Response, error) { + return autorest.SendWithSender(client, req, + autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) +} + +// ListByScopeResponder handles the response to the ListByScope request. The method always +// closes the http.Response Body. +func (client ManagementLocksClient) ListByScopeResponder(resp *http.Response) (result ManagementLockListResult, err error) { + err = autorest.Respond( + resp, + client.ByInspecting(), + azure.WithErrorUnlessStatusCode(http.StatusOK), + autorest.ByUnmarshallingJSON(&result), + autorest.ByClosing()) + result.Response = autorest.Response{Response: resp} + return +} + +// listByScopeNextResults retrieves the next set of results, if any. +func (client ManagementLocksClient) listByScopeNextResults(ctx context.Context, lastResults ManagementLockListResult) (result ManagementLockListResult, err error) { + req, err := lastResults.managementLockListResultPreparer(ctx) + if err != nil { + return result, autorest.NewErrorWithError(err, "locks.ManagementLocksClient", "listByScopeNextResults", nil, "Failure preparing next results request") + } + if req == nil { + return + } + resp, err := client.ListByScopeSender(req) + if err != nil { + result.Response = autorest.Response{Response: resp} + return result, autorest.NewErrorWithError(err, "locks.ManagementLocksClient", "listByScopeNextResults", resp, "Failure sending next results request") + } + result, err = client.ListByScopeResponder(resp) + if err != nil { + err = autorest.NewErrorWithError(err, "locks.ManagementLocksClient", "listByScopeNextResults", resp, "Failure responding to next results request") + } + return +} + +// ListByScopeComplete enumerates all values, automatically crossing page boundaries as required. +func (client ManagementLocksClient) ListByScopeComplete(ctx context.Context, scope string, filter string) (result ManagementLockListResultIterator, err error) { + if tracing.IsEnabled() { + ctx = tracing.StartSpan(ctx, fqdn+"/ManagementLocksClient.ListByScope") + defer func() { + sc := -1 + if result.Response().Response.Response != nil { + sc = result.page.Response().Response.Response.StatusCode + } + tracing.EndSpan(ctx, sc, err) + }() + } + result.page, err = client.ListByScope(ctx, scope, filter) + return +} diff --git a/services/resources/mgmt/2018-06-01/subscriptions/client.go b/services/resources/mgmt/2018-06-01/subscriptions/client.go index 0195a20b36bf..3bf047ef1284 100644 --- a/services/resources/mgmt/2018-06-01/subscriptions/client.go +++ b/services/resources/mgmt/2018-06-01/subscriptions/client.go @@ -1,4 +1,4 @@ -// Package subscriptions implements the Azure ARM Subscriptions service API version 2016-06-01. +// Package subscriptions implements the Azure ARM Subscriptions service API version 2018-06-01. // // All resource groups and resources exist within subscriptions. These operation enable you get information about your // subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure AD) for your diff --git a/services/resources/mgmt/2018-06-01/subscriptions/operations.go b/services/resources/mgmt/2018-06-01/subscriptions/operations.go index 18079e576437..4065e29f4a40 100644 --- a/services/resources/mgmt/2018-06-01/subscriptions/operations.go +++ b/services/resources/mgmt/2018-06-01/subscriptions/operations.go @@ -78,7 +78,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2016-06-01" + const APIVersion = "2018-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/services/resources/mgmt/2018-06-01/subscriptions/subscriptions.go b/services/resources/mgmt/2018-06-01/subscriptions/subscriptions.go index df7ce71c824f..6ac21264e96d 100644 --- a/services/resources/mgmt/2018-06-01/subscriptions/subscriptions.go +++ b/services/resources/mgmt/2018-06-01/subscriptions/subscriptions.go @@ -83,7 +83,7 @@ func (client Client) GetPreparer(ctx context.Context, subscriptionID string) (*h "subscriptionId": autorest.Encode("path", subscriptionID), } - const APIVersion = "2016-06-01" + const APIVersion = "2018-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -152,7 +152,7 @@ func (client Client) List(ctx context.Context) (result ListResultPage, err error // ListPreparer prepares the List request. func (client Client) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2016-06-01" + const APIVersion = "2018-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -264,7 +264,7 @@ func (client Client) ListLocationsPreparer(ctx context.Context, subscriptionID s "subscriptionId": autorest.Encode("path", subscriptionID), } - const APIVersion = "2016-06-01" + const APIVersion = "2018-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/services/resources/mgmt/2018-06-01/subscriptions/tenants.go b/services/resources/mgmt/2018-06-01/subscriptions/tenants.go index 3fc98f0db1c9..d4ce66997533 100644 --- a/services/resources/mgmt/2018-06-01/subscriptions/tenants.go +++ b/services/resources/mgmt/2018-06-01/subscriptions/tenants.go @@ -78,7 +78,7 @@ func (client TenantsClient) List(ctx context.Context) (result TenantListResultPa // ListPreparer prepares the List request. func (client TenantsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2016-06-01" + const APIVersion = "2018-06-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/services/resources/mgmt/2018-06-01/subscriptions/version.go b/services/resources/mgmt/2018-06-01/subscriptions/version.go index 599c1d099a3e..4309619234b8 100644 --- a/services/resources/mgmt/2018-06-01/subscriptions/version.go +++ b/services/resources/mgmt/2018-06-01/subscriptions/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + version.Number + " subscriptions/2016-06-01" + return "Azure-SDK-For-Go/" + version.Number + " subscriptions/2018-06-01" } // Version returns the semantic version (see http://semver.org) of the client.