From 045aa589e9dd76bf0b807699eb89da119aa3faf6 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Thu, 5 May 2022 13:39:47 -0700 Subject: [PATCH 1/2] Unexport some types that aren't supposed to be Cleaned up response envelopes per latest pattern. --- sdk/azcore/arm/runtime/policy_register_rp.go | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sdk/azcore/arm/runtime/policy_register_rp.go b/sdk/azcore/arm/runtime/policy_register_rp.go index 7bbc1836e480..4590d39be9db 100644 --- a/sdk/azcore/arm/runtime/policy_register_rp.go +++ b/sdk/azcore/arm/runtime/policy_register_rp.go @@ -214,18 +214,18 @@ type providersOperations struct { } // Get - Gets the specified resource provider. -func (client *providersOperations) Get(ctx context.Context, resourceProviderNamespace string) (*ProviderResponse, error) { +func (client *providersOperations) Get(ctx context.Context, resourceProviderNamespace string) (providerResponse, error) { req, err := client.getCreateRequest(ctx, resourceProviderNamespace) if err != nil { - return nil, err + return providerResponse{}, err } resp, err := client.p.Do(req) if err != nil { - return nil, err + return providerResponse{}, err } result, err := client.getHandleResponse(resp) if err != nil { - return nil, err + return providerResponse{}, err } return result, nil } @@ -246,31 +246,31 @@ func (client *providersOperations) getCreateRequest(ctx context.Context, resourc } // getHandleResponse handles the Get response. -func (client *providersOperations) getHandleResponse(resp *http.Response) (*ProviderResponse, error) { +func (client *providersOperations) getHandleResponse(resp *http.Response) (providerResponse, error) { if !runtime.HasStatusCode(resp, http.StatusOK) { - return nil, exported.NewResponseError(resp) + return providerResponse{}, exported.NewResponseError(resp) } - result := ProviderResponse{RawResponse: resp} + result := providerResponse{RawResponse: resp} err := runtime.UnmarshalAsJSON(resp, &result.Provider) if err != nil { - return nil, err + return providerResponse{}, err } - return &result, err + return result, err } // Register - Registers a subscription with a resource provider. -func (client *providersOperations) Register(ctx context.Context, resourceProviderNamespace string) (*ProviderResponse, error) { +func (client *providersOperations) Register(ctx context.Context, resourceProviderNamespace string) (providerResponse, error) { req, err := client.registerCreateRequest(ctx, resourceProviderNamespace) if err != nil { - return nil, err + return providerResponse{}, err } resp, err := client.p.Do(req) if err != nil { - return nil, err + return providerResponse{}, err } result, err := client.registerHandleResponse(resp) if err != nil { - return nil, err + return providerResponse{}, err } return result, nil } @@ -291,29 +291,29 @@ func (client *providersOperations) registerCreateRequest(ctx context.Context, re } // registerHandleResponse handles the Register response. -func (client *providersOperations) registerHandleResponse(resp *http.Response) (*ProviderResponse, error) { +func (client *providersOperations) registerHandleResponse(resp *http.Response) (providerResponse, error) { if !runtime.HasStatusCode(resp, http.StatusOK) { - return nil, exported.NewResponseError(resp) + return providerResponse{}, exported.NewResponseError(resp) } - result := ProviderResponse{RawResponse: resp} + result := providerResponse{RawResponse: resp} err := runtime.UnmarshalAsJSON(resp, &result.Provider) if err != nil { - return nil, err + return providerResponse{}, err } - return &result, err + return result, err } // ProviderResponse is the response envelope for operations that return a Provider type. -type ProviderResponse struct { +type providerResponse struct { // Resource provider information. - Provider *Provider + Provider *provider // RawResponse contains the underlying HTTP response. RawResponse *http.Response } // Provider - Resource provider information. -type Provider struct { +type provider struct { // The provider ID. ID *string `json:"id,omitempty"` From e1b71f75597d04e73a57b7b9e34e9a6c3512930d Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Thu, 5 May 2022 13:49:47 -0700 Subject: [PATCH 2/2] update changelog --- sdk/azcore/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/azcore/CHANGELOG.md b/sdk/azcore/CHANGELOG.md index 99c834969515..1f9cc69d94cd 100644 --- a/sdk/azcore/CHANGELOG.md +++ b/sdk/azcore/CHANGELOG.md @@ -15,6 +15,7 @@ * Removed `arm/runtime.Poller[T]`, `arm/runtime.NewPoller[T]()` and `arm/runtime.NewPollerFromResumeToken[T]()` * Removed `arm/runtime.FinalStateVia` and related `const` values * Renamed `runtime.PageProcessor` to `runtime.PagingHandler` +* The `arm/runtime.ProviderRepsonse` and `arm/runtime.Provider` types are no longer exported. ### Bugs Fixed * When per-try timeouts are enabled, only cancel the context after the body has been read and closed.