diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningcompute.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningcompute.go index 87efca9a54b8..bb59bd9af36a 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningcompute.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningcompute.go @@ -117,7 +117,6 @@ func (client MachineLearningComputeClient) CreateOrUpdateSender(req *http.Reques func (client MachineLearningComputeClient) CreateOrUpdateResponder(resp *http.Response) (result ComputeResource, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -198,7 +197,6 @@ func (client MachineLearningComputeClient) DeleteSender(req *http.Request) (futu func (client MachineLearningComputeClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted), autorest.ByClosing()) result.Response = resp @@ -276,7 +274,6 @@ func (client MachineLearningComputeClient) GetSender(req *http.Request) (*http.R func (client MachineLearningComputeClient) GetResponder(resp *http.Response) (result ComputeResource, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -357,7 +354,6 @@ func (client MachineLearningComputeClient) ListByWorkspaceSender(req *http.Reque func (client MachineLearningComputeClient) ListByWorkspaceResponder(resp *http.Response) (result PaginatedComputeResourcesList, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -472,7 +468,6 @@ func (client MachineLearningComputeClient) ListKeysSender(req *http.Request) (*h func (client MachineLearningComputeClient) ListKeysResponder(resp *http.Response) (result ComputeSecretsModel, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -551,7 +546,6 @@ func (client MachineLearningComputeClient) ListNodesSender(req *http.Request) (* func (client MachineLearningComputeClient) ListNodesResponder(resp *http.Response) (result AmlComputeNodesInformation, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -670,7 +664,6 @@ func (client MachineLearningComputeClient) UpdateSender(req *http.Request) (futu func (client MachineLearningComputeClient) UpdateResponder(resp *http.Response) (result ComputeResource, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningservicesapi/interfaces.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningservicesapi/interfaces.go index ee3685590b22..e8e7b81fc907 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningservicesapi/interfaces.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/machinelearningservicesapi/interfaces.go @@ -33,7 +33,7 @@ var _ OperationsClientAPI = (*machinelearningservices.OperationsClient)(nil) // WorkspacesClientAPI contains the set of methods on the WorkspacesClient type. type WorkspacesClientAPI interface { CreateOrUpdate(ctx context.Context, resourceGroupName string, workspaceName string, parameters machinelearningservices.Workspace) (result machinelearningservices.WorkspacesCreateOrUpdateFuture, err error) - Delete(ctx context.Context, resourceGroupName string, workspaceName string) (result autorest.Response, err error) + Delete(ctx context.Context, resourceGroupName string, workspaceName string) (result machinelearningservices.WorkspacesDeleteFuture, err error) Get(ctx context.Context, resourceGroupName string, workspaceName string) (result machinelearningservices.Workspace, err error) ListByResourceGroup(ctx context.Context, resourceGroupName string, skiptoken string) (result machinelearningservices.WorkspaceListResultPage, err error) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string, skiptoken string) (result machinelearningservices.WorkspaceListResultIterator, err error) diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/models.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/models.go index 600166b72801..37bd166fe354 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/models.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/models.go @@ -996,7 +996,7 @@ type ComputeResource struct { ID *string `json:"id,omitempty"` // Name - READ-ONLY; Specifies the name of the resource. Name *string `json:"name,omitempty"` - // Identity - READ-ONLY; The identity of the resource. + // Identity - The identity of the resource. Identity *Identity `json:"identity,omitempty"` // Location - Specifies the location of the resource. Location *string `json:"location,omitempty"` @@ -1010,6 +1010,9 @@ type ComputeResource struct { func (cr ComputeResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) objectMap["properties"] = cr.Properties + if cr.Identity != nil { + objectMap["identity"] = cr.Identity + } if cr.Location != nil { objectMap["location"] = cr.Location } @@ -2119,7 +2122,7 @@ type Resource struct { ID *string `json:"id,omitempty"` // Name - READ-ONLY; Specifies the name of the resource. Name *string `json:"name,omitempty"` - // Identity - READ-ONLY; The identity of the resource. + // Identity - The identity of the resource. Identity *Identity `json:"identity,omitempty"` // Location - Specifies the location of the resource. Location *string `json:"location,omitempty"` @@ -2132,6 +2135,9 @@ type Resource struct { // MarshalJSON is the custom marshaler for Resource. func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) + if r.Identity != nil { + objectMap["identity"] = r.Identity + } if r.Location != nil { objectMap["location"] = r.Location } @@ -2413,7 +2419,7 @@ type Workspace struct { ID *string `json:"id,omitempty"` // Name - READ-ONLY; Specifies the name of the resource. Name *string `json:"name,omitempty"` - // Identity - READ-ONLY; The identity of the resource. + // Identity - The identity of the resource. Identity *Identity `json:"identity,omitempty"` // Location - Specifies the location of the resource. Location *string `json:"location,omitempty"` @@ -2429,6 +2435,9 @@ func (w Workspace) MarshalJSON() ([]byte, error) { if w.WorkspaceProperties != nil { objectMap["properties"] = w.WorkspaceProperties } + if w.Identity != nil { + objectMap["identity"] = w.Identity + } if w.Location != nil { objectMap["location"] = w.Location } @@ -2724,6 +2733,29 @@ func (future *WorkspacesCreateOrUpdateFuture) Result(client WorkspacesClient) (w return } +// WorkspacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running +// operation. +type WorkspacesDeleteFuture struct { + azure.Future +} + +// Result returns the result of the asynchronous operation. +// If the operation has not completed it will return an error. +func (future *WorkspacesDeleteFuture) Result(client WorkspacesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "machinelearningservices.WorkspacesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("machinelearningservices.WorkspacesDeleteFuture") + return + } + ar.Response = future.Response() + return +} + // WorkspaceUpdateParameters the parameters for updating a machine learning workspace. type WorkspaceUpdateParameters struct { // Tags - The resource tags for the machine learning workspace. diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/operations.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/operations.go index 55d91e799262..8d647a6e5813 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/operations.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/operations.go @@ -100,7 +100,6 @@ func (client OperationsClient) ListSender(req *http.Request) (*http.Response, er func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/usages.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/usages.go index 138e42842d3a..d196548eafba 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/usages.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/usages.go @@ -115,7 +115,6 @@ func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) func (client UsagesClient) ListResponder(resp *http.Response) (result ListUsagesResult, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/version.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/version.go index 396c38e43d11..a6b219d61a38 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/version.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/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 + " machinelearningservices/2018-11-19" + return "Azure-SDK-For-Go/" + Version() + " machinelearningservices/2018-11-19" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/virtualmachinesizes.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/virtualmachinesizes.go index 1505e76b6e44..9a7fbffb2187 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/virtualmachinesizes.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/virtualmachinesizes.go @@ -116,7 +116,6 @@ func (client VirtualMachineSizesClient) ListSender(req *http.Request) (*http.Res func (client VirtualMachineSizesClient) ListResponder(resp *http.Response) (result VirtualMachineSizeListResult, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) diff --git a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/workspaces.go b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/workspaces.go index ad473e530b6c..1756ab2ab598 100644 --- a/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/workspaces.go +++ b/services/machinelearningservices/mgmt/2018-11-19/machinelearningservices/workspaces.go @@ -112,7 +112,6 @@ func (client WorkspacesClient) CreateOrUpdateSender(req *http.Request) (future W func (client WorkspacesClient) CreateOrUpdateResponder(resp *http.Response) (result Workspace, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated, http.StatusAccepted), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -124,13 +123,13 @@ func (client WorkspacesClient) CreateOrUpdateResponder(resp *http.Response) (res // Parameters: // resourceGroupName - name of the resource group in which workspace is located. // workspaceName - name of Azure Machine Learning workspace. -func (client WorkspacesClient) Delete(ctx context.Context, resourceGroupName string, workspaceName string) (result autorest.Response, err error) { +func (client WorkspacesClient) Delete(ctx context.Context, resourceGroupName string, workspaceName string) (result WorkspacesDeleteFuture, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/WorkspacesClient.Delete") defer func() { sc := -1 - if result.Response != nil { - sc = result.Response.StatusCode + if result.Response() != nil { + sc = result.Response().StatusCode } tracing.EndSpan(ctx, sc, err) }() @@ -141,18 +140,12 @@ func (client WorkspacesClient) Delete(ctx context.Context, resourceGroupName str return } - resp, err := client.DeleteSender(req) + result, err = client.DeleteSender(req) if err != nil { - result.Response = resp - err = autorest.NewErrorWithError(err, "machinelearningservices.WorkspacesClient", "Delete", resp, "Failure sending request") + err = autorest.NewErrorWithError(err, "machinelearningservices.WorkspacesClient", "Delete", result.Response(), "Failure sending request") return } - result, err = client.DeleteResponder(resp) - if err != nil { - err = autorest.NewErrorWithError(err, "machinelearningservices.WorkspacesClient", "Delete", resp, "Failure responding to request") - } - return } @@ -179,8 +172,14 @@ func (client WorkspacesClient) DeletePreparer(ctx context.Context, resourceGroup // DeleteSender sends the Delete request. The method will close the // http.Response Body if it receives an error. -func (client WorkspacesClient) DeleteSender(req *http.Request) (*http.Response, error) { - return client.Send(req, azure.DoRetryWithRegistration(client.Client)) +func (client WorkspacesClient) DeleteSender(req *http.Request) (future WorkspacesDeleteFuture, err error) { + var resp *http.Response + resp, err = client.Send(req, azure.DoRetryWithRegistration(client.Client)) + if err != nil { + return + } + future.Future, err = azure.NewFutureFromResponse(resp) + return } // DeleteResponder handles the response to the Delete request. The method always @@ -188,8 +187,7 @@ func (client WorkspacesClient) DeleteSender(req *http.Request) (*http.Response, func (client WorkspacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) { err = autorest.Respond( resp, - client.ByInspecting(), - azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent), + azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusAccepted, http.StatusNoContent), autorest.ByClosing()) result.Response = resp return @@ -263,7 +261,6 @@ func (client WorkspacesClient) GetSender(req *http.Request) (*http.Response, err func (client WorkspacesClient) GetResponder(resp *http.Response) (result Workspace, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -342,7 +339,6 @@ func (client WorkspacesClient) ListByResourceGroupSender(req *http.Request) (*ht func (client WorkspacesClient) ListByResourceGroupResponder(resp *http.Response) (result WorkspaceListResult, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -456,7 +452,6 @@ func (client WorkspacesClient) ListBySubscriptionSender(req *http.Request) (*htt func (client WorkspacesClient) ListBySubscriptionResponder(resp *http.Response) (result WorkspaceListResult, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -570,7 +565,6 @@ func (client WorkspacesClient) ListKeysSender(req *http.Request) (*http.Response func (client WorkspacesClient) ListKeysResponder(resp *http.Response) (result ListWorkspaceKeysResult, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) @@ -647,7 +641,6 @@ func (client WorkspacesClient) ResyncKeysSender(req *http.Request) (*http.Respon func (client WorkspacesClient) ResyncKeysResponder(resp *http.Response) (result autorest.Response, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByClosing()) result.Response = resp @@ -725,7 +718,6 @@ func (client WorkspacesClient) UpdateSender(req *http.Request) (*http.Response, func (client WorkspacesClient) UpdateResponder(resp *http.Response) (result Workspace, err error) { err = autorest.Respond( resp, - client.ByInspecting(), azure.WithErrorUnlessStatusCode(http.StatusOK), autorest.ByUnmarshallingJSON(&result), autorest.ByClosing())