diff --git a/profiles/latest/apimanagement/mgmt/apimanagement/models.go b/profiles/latest/apimanagement/mgmt/apimanagement/models.go index 748c6bc04530..7b772d32fb4f 100644 --- a/profiles/latest/apimanagement/mgmt/apimanagement/models.go +++ b/profiles/latest/apimanagement/mgmt/apimanagement/models.go @@ -223,10 +223,8 @@ const ( type PolicyExportFormat = original.PolicyExportFormat const ( - PolicyExportFormatRawxml PolicyExportFormat = original.PolicyExportFormatRawxml - PolicyExportFormatRawxmlLink PolicyExportFormat = original.PolicyExportFormatRawxmlLink - PolicyExportFormatXML PolicyExportFormat = original.PolicyExportFormatXML - PolicyExportFormatXMLLink PolicyExportFormat = original.PolicyExportFormatXMLLink + PolicyExportFormatRawxml PolicyExportFormat = original.PolicyExportFormatRawxml + PolicyExportFormatXML PolicyExportFormat = original.PolicyExportFormatXML ) type PolicyScopeContract = original.PolicyScopeContract diff --git a/profiles/preview/apimanagement/mgmt/apimanagement/models.go b/profiles/preview/apimanagement/mgmt/apimanagement/models.go index 64ca4ec41b80..406a9ca75889 100644 --- a/profiles/preview/apimanagement/mgmt/apimanagement/models.go +++ b/profiles/preview/apimanagement/mgmt/apimanagement/models.go @@ -223,10 +223,8 @@ const ( type PolicyExportFormat = original.PolicyExportFormat const ( - PolicyExportFormatRawxml PolicyExportFormat = original.PolicyExportFormatRawxml - PolicyExportFormatRawxmlLink PolicyExportFormat = original.PolicyExportFormatRawxmlLink - PolicyExportFormatXML PolicyExportFormat = original.PolicyExportFormatXML - PolicyExportFormatXMLLink PolicyExportFormat = original.PolicyExportFormatXMLLink + PolicyExportFormatRawxml PolicyExportFormat = original.PolicyExportFormatRawxml + PolicyExportFormatXML PolicyExportFormat = original.PolicyExportFormatXML ) type PolicyScopeContract = original.PolicyScopeContract diff --git a/services/apimanagement/mgmt/2019-01-01/apimanagement/apimanagementapi/interfaces.go b/services/apimanagement/mgmt/2019-01-01/apimanagement/apimanagementapi/interfaces.go index 97b3a1c04bc1..0a0d51b15f16 100644 --- a/services/apimanagement/mgmt/2019-01-01/apimanagement/apimanagementapi/interfaces.go +++ b/services/apimanagement/mgmt/2019-01-01/apimanagement/apimanagementapi/interfaces.go @@ -71,8 +71,8 @@ var _ APIOperationClientAPI = (*apimanagement.APIOperationClient)(nil) type APIOperationPolicyClientAPI interface { CreateOrUpdate(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, parameters apimanagement.PolicyContract, ifMatch string) (result apimanagement.PolicyContract, err error) Delete(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, ifMatch string) (result autorest.Response, err error) - Get(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (result apimanagement.PolicyContract, err error) - GetEntityTag(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, formatParameter apimanagement.PolicyExportFormat) (result autorest.Response, err error) + Get(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, formatParameter apimanagement.PolicyExportFormat) (result apimanagement.PolicyContract, err error) + GetEntityTag(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (result autorest.Response, err error) ListByOperation(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (result apimanagement.PolicyCollection, err error) } diff --git a/services/apimanagement/mgmt/2019-01-01/apimanagement/apioperationpolicy.go b/services/apimanagement/mgmt/2019-01-01/apimanagement/apioperationpolicy.go index 95c6ae72448d..f2f000c71bb0 100644 --- a/services/apimanagement/mgmt/2019-01-01/apimanagement/apioperationpolicy.go +++ b/services/apimanagement/mgmt/2019-01-01/apimanagement/apioperationpolicy.go @@ -262,7 +262,8 @@ func (client APIOperationPolicyClient) DeleteResponder(resp *http.Response) (res // revision has ;rev=n as a suffix where n is the revision number. // operationID - operation identifier within an API. Must be unique in the current API Management service // instance. -func (client APIOperationPolicyClient) Get(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (result PolicyContract, err error) { +// formatParameter - policy Export Format. +func (client APIOperationPolicyClient) Get(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, formatParameter PolicyExportFormat) (result PolicyContract, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/APIOperationPolicyClient.Get") defer func() { @@ -289,7 +290,7 @@ func (client APIOperationPolicyClient) Get(ctx context.Context, resourceGroupNam return result, validation.NewError("apimanagement.APIOperationPolicyClient", "Get", err.Error()) } - req, err := client.GetPreparer(ctx, resourceGroupName, serviceName, apiid, operationID) + req, err := client.GetPreparer(ctx, resourceGroupName, serviceName, apiid, operationID, formatParameter) if err != nil { err = autorest.NewErrorWithError(err, "apimanagement.APIOperationPolicyClient", "Get", nil, "Failure preparing request") return @@ -311,7 +312,7 @@ func (client APIOperationPolicyClient) Get(ctx context.Context, resourceGroupNam } // GetPreparer prepares the Get request. -func (client APIOperationPolicyClient) GetPreparer(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (*http.Request, error) { +func (client APIOperationPolicyClient) GetPreparer(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, formatParameter PolicyExportFormat) (*http.Request, error) { pathParameters := map[string]interface{}{ "apiId": autorest.Encode("path", apiid), "operationId": autorest.Encode("path", operationID), @@ -325,6 +326,11 @@ func (client APIOperationPolicyClient) GetPreparer(ctx context.Context, resource queryParameters := map[string]interface{}{ "api-version": APIVersion, } + if len(string(formatParameter)) > 0 { + queryParameters["format"] = autorest.Encode("query", formatParameter) + } else { + queryParameters["format"] = autorest.Encode("query", "xml") + } preparer := autorest.CreatePreparer( autorest.AsGet(), @@ -362,8 +368,7 @@ func (client APIOperationPolicyClient) GetResponder(resp *http.Response) (result // revision has ;rev=n as a suffix where n is the revision number. // operationID - operation identifier within an API. Must be unique in the current API Management service // instance. -// formatParameter - policy Export Format. -func (client APIOperationPolicyClient) GetEntityTag(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, formatParameter PolicyExportFormat) (result autorest.Response, err error) { +func (client APIOperationPolicyClient) GetEntityTag(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (result autorest.Response, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/APIOperationPolicyClient.GetEntityTag") defer func() { @@ -390,7 +395,7 @@ func (client APIOperationPolicyClient) GetEntityTag(ctx context.Context, resourc return result, validation.NewError("apimanagement.APIOperationPolicyClient", "GetEntityTag", err.Error()) } - req, err := client.GetEntityTagPreparer(ctx, resourceGroupName, serviceName, apiid, operationID, formatParameter) + req, err := client.GetEntityTagPreparer(ctx, resourceGroupName, serviceName, apiid, operationID) if err != nil { err = autorest.NewErrorWithError(err, "apimanagement.APIOperationPolicyClient", "GetEntityTag", nil, "Failure preparing request") return @@ -412,7 +417,7 @@ func (client APIOperationPolicyClient) GetEntityTag(ctx context.Context, resourc } // GetEntityTagPreparer prepares the GetEntityTag request. -func (client APIOperationPolicyClient) GetEntityTagPreparer(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string, formatParameter PolicyExportFormat) (*http.Request, error) { +func (client APIOperationPolicyClient) GetEntityTagPreparer(ctx context.Context, resourceGroupName string, serviceName string, apiid string, operationID string) (*http.Request, error) { pathParameters := map[string]interface{}{ "apiId": autorest.Encode("path", apiid), "operationId": autorest.Encode("path", operationID), @@ -426,11 +431,6 @@ func (client APIOperationPolicyClient) GetEntityTagPreparer(ctx context.Context, queryParameters := map[string]interface{}{ "api-version": APIVersion, } - if len(string(formatParameter)) > 0 { - queryParameters["format"] = autorest.Encode("query", formatParameter) - } else { - queryParameters["format"] = autorest.Encode("query", "xml") - } preparer := autorest.CreatePreparer( autorest.AsHead(), diff --git a/services/apimanagement/mgmt/2019-01-01/apimanagement/models.go b/services/apimanagement/mgmt/2019-01-01/apimanagement/models.go index d718d9cb0f37..0f7ca8e875b1 100644 --- a/services/apimanagement/mgmt/2019-01-01/apimanagement/models.go +++ b/services/apimanagement/mgmt/2019-01-01/apimanagement/models.go @@ -456,19 +456,13 @@ type PolicyExportFormat string const ( // PolicyExportFormatRawxml The contents are inline and Content type is a non XML encoded policy document. PolicyExportFormatRawxml PolicyExportFormat = "rawxml" - // PolicyExportFormatRawxmlLink The policy document is not XML encoded is exported to a storage blob with - // SAS Key valid for 5 minutes. - PolicyExportFormatRawxmlLink PolicyExportFormat = "rawxml-link" // PolicyExportFormatXML The contents are inline and Content type is an XML document. PolicyExportFormatXML PolicyExportFormat = "xml" - // PolicyExportFormatXMLLink The policy XML document is exported to a storage blob with SAS key valid for 5 - // minutes. - PolicyExportFormatXMLLink PolicyExportFormat = "xml-link" ) // PossiblePolicyExportFormatValues returns an array of possible values for the PolicyExportFormat const type. func PossiblePolicyExportFormatValues() []PolicyExportFormat { - return []PolicyExportFormat{PolicyExportFormatRawxml, PolicyExportFormatRawxmlLink, PolicyExportFormatXML, PolicyExportFormatXMLLink} + return []PolicyExportFormat{PolicyExportFormatRawxml, PolicyExportFormatXML} } // PolicyScopeContract enumerates the values for policy scope contract.