Updating based on 67f110c5

resource-manager/cosmosdb/2022-05-15/client.go

@@ -4,7 +4,8 @@ package v2022_05_15
 // Licensed under the MIT License. See NOTICE.txt in the project root for license information.
 
 import (
-	"github.com/Azure/go-autorest/autorest"
+	"fmt"
+
 	"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2022-05-15/cosmosdb"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2022-05-15/datatransfer"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2022-05-15/graphapicompute"
@@ -17,6 +18,8 @@ import (
 	"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2022-05-15/restorables"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2022-05-15/services"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2022-05-15/sqldedicatedgateway"
+	"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
+	sdkEnv "github.com/hashicorp/go-azure-sdk/sdk/environments"
 )
 
 type Client struct {
@@ -34,56 +37,91 @@ type Client struct {
 	SqlDedicatedGateway        *sqldedicatedgateway.SqlDedicatedGatewayClient
 }
 
-func NewClientWithBaseURI(endpoint string, configureAuthFunc func(c *autorest.Client)) Client {
-
-	cosmosDBClient := cosmosdb.NewCosmosDBClientWithBaseURI(endpoint)
-	configureAuthFunc(&cosmosDBClient.Client)
-
-	dataTransferClient := datatransfer.NewDataTransferClientWithBaseURI(endpoint)
-	configureAuthFunc(&dataTransferClient.Client)
+func NewClientWithBaseURI(sdkApi sdkEnv.Api, configureFunc func(c *resourcemanager.Client)) (*Client, error) {
+	cosmosDBClient, err := cosmosdb.NewCosmosDBClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building CosmosDB client: %+v", err)
+	}
+	configureFunc(cosmosDBClient.Client)
 
-	graphAPIComputeClient := graphapicompute.NewGraphAPIComputeClientWithBaseURI(endpoint)
-	configureAuthFunc(&graphAPIComputeClient.Client)
+	dataTransferClient, err := datatransfer.NewDataTransferClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building DataTransfer client: %+v", err)
+	}
+	configureFunc(dataTransferClient.Client)
 
-	managedCassandrasClient := managedcassandras.NewManagedCassandrasClientWithBaseURI(endpoint)
-	configureAuthFunc(&managedCassandrasClient.Client)
+	graphAPIComputeClient, err := graphapicompute.NewGraphAPIComputeClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building GraphAPICompute client: %+v", err)
+	}
+	configureFunc(graphAPIComputeClient.Client)
 
-	materializedViewsBuilderClient := materializedviewsbuilder.NewMaterializedViewsBuilderClientWithBaseURI(endpoint)
-	configureAuthFunc(&materializedViewsBuilderClient.Client)
+	managedCassandrasClient, err := managedcassandras.NewManagedCassandrasClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building ManagedCassandras client: %+v", err)
+	}
+	configureFunc(managedCassandrasClient.Client)
 
-	notebookWorkspacesResourceClient := notebookworkspacesresource.NewNotebookWorkspacesResourceClientWithBaseURI(endpoint)
-	configureAuthFunc(&notebookWorkspacesResourceClient.Client)
+	materializedViewsBuilderClient, err := materializedviewsbuilder.NewMaterializedViewsBuilderClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building MaterializedViewsBuilder client: %+v", err)
+	}
+	configureFunc(materializedViewsBuilderClient.Client)
 
-	privateEndpointConnectionsClient := privateendpointconnections.NewPrivateEndpointConnectionsClientWithBaseURI(endpoint)
-	configureAuthFunc(&privateEndpointConnectionsClient.Client)
+	notebookWorkspacesResourceClient, err := notebookworkspacesresource.NewNotebookWorkspacesResourceClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building NotebookWorkspacesResource client: %+v", err)
+	}
+	configureFunc(notebookWorkspacesResourceClient.Client)
 
-	privateLinkResourcesClient := privatelinkresources.NewPrivateLinkResourcesClientWithBaseURI(endpoint)
-	configureAuthFunc(&privateLinkResourcesClient.Client)
+	privateEndpointConnectionsClient, err := privateendpointconnections.NewPrivateEndpointConnectionsClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building PrivateEndpointConnections client: %+v", err)
+	}
+	configureFunc(privateEndpointConnectionsClient.Client)
 
-	rbacsClient := rbacs.NewRbacsClientWithBaseURI(endpoint)
-	configureAuthFunc(&rbacsClient.Client)
+	privateLinkResourcesClient, err := privatelinkresources.NewPrivateLinkResourcesClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building PrivateLinkResources client: %+v", err)
+	}
+	configureFunc(privateLinkResourcesClient.Client)
 
-	restorablesClient := restorables.NewRestorablesClientWithBaseURI(endpoint)
-	configureAuthFunc(&restorablesClient.Client)
+	rbacsClient, err := rbacs.NewRbacsClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building Rbacs client: %+v", err)
+	}
+	configureFunc(rbacsClient.Client)
 
-	servicesClient := services.NewServicesClientWithBaseURI(endpoint)
-	configureAuthFunc(&servicesClient.Client)
+	restorablesClient, err := restorables.NewRestorablesClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building Restorables client: %+v", err)
+	}
+	configureFunc(restorablesClient.Client)
 
-	sqlDedicatedGatewayClient := sqldedicatedgateway.NewSqlDedicatedGatewayClientWithBaseURI(endpoint)
-	configureAuthFunc(&sqlDedicatedGatewayClient.Client)
+	servicesClient, err := services.NewServicesClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building Services client: %+v", err)
+	}
+	configureFunc(servicesClient.Client)
 
-	return Client{
-		CosmosDB:                   &cosmosDBClient,
-		DataTransfer:               &dataTransferClient,
-		GraphAPICompute:            &graphAPIComputeClient,
-		ManagedCassandras:          &managedCassandrasClient,
-		MaterializedViewsBuilder:   &materializedViewsBuilderClient,
-		NotebookWorkspacesResource: &notebookWorkspacesResourceClient,
-		PrivateEndpointConnections: &privateEndpointConnectionsClient,
-		PrivateLinkResources:       &privateLinkResourcesClient,
-		Rbacs:                      &rbacsClient,
-		Restorables:                &restorablesClient,
-		Services:                   &servicesClient,
-		SqlDedicatedGateway:        &sqlDedicatedGatewayClient,
+	sqlDedicatedGatewayClient, err := sqldedicatedgateway.NewSqlDedicatedGatewayClientWithBaseURI(sdkApi)
+	if err != nil {
+		return nil, fmt.Errorf("building SqlDedicatedGateway client: %+v", err)
 	}
+	configureFunc(sqlDedicatedGatewayClient.Client)
+
+	return &Client{
+		CosmosDB:                   cosmosDBClient,
+		DataTransfer:               dataTransferClient,
+		GraphAPICompute:            graphAPIComputeClient,
+		ManagedCassandras:          managedCassandrasClient,
+		MaterializedViewsBuilder:   materializedViewsBuilderClient,
+		NotebookWorkspacesResource: notebookWorkspacesResourceClient,
+		PrivateEndpointConnections: privateEndpointConnectionsClient,
+		PrivateLinkResources:       privateLinkResourcesClient,
+		Rbacs:                      rbacsClient,
+		Restorables:                restorablesClient,
+		Services:                   servicesClient,
+		SqlDedicatedGateway:        sqlDedicatedGatewayClient,
+	}, nil
 }

resource-manager/cosmosdb/2022-05-15/cosmosdb/client.go

@@ -1,18 +1,26 @@
 package cosmosdb
 
-import "github.com/Azure/go-autorest/autorest"
+import (
+	"fmt"
+
+	"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
+	sdkEnv "github.com/hashicorp/go-azure-sdk/sdk/environments"
+)
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See NOTICE.txt in the project root for license information.
 
 type CosmosDBClient struct {
-	Client  autorest.Client
-	baseUri string
+	Client *resourcemanager.Client
 }
 
-func NewCosmosDBClientWithBaseURI(endpoint string) CosmosDBClient {
-	return CosmosDBClient{
-		Client:  autorest.NewClientWithUserAgent(userAgent()),
-		baseUri: endpoint,
+func NewCosmosDBClientWithBaseURI(sdkApi sdkEnv.Api) (*CosmosDBClient, error) {
+	client, err := resourcemanager.NewResourceManagerClient(sdkApi, "cosmosdb", defaultApiVersion)
+	if err != nil {
+		return nil, fmt.Errorf("instantiating CosmosDBClient: %+v", err)
 	}
+
+	return &CosmosDBClient{
+		Client: client,
+	}, nil
 }