Refactor client registration logic to avoid expanding client struct

Author: alexng-canuck

oci/analytics_analytics_instance_data_source.go

@@ -25,7 +25,7 @@ func AnalyticsAnalyticsInstanceDataSource() *schema.Resource {
 func readSingularAnalyticsAnalyticsInstance(d *schema.ResourceData, m interface{}) error {
 	sync := &AnalyticsAnalyticsInstanceDataSourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).analyticsClient
+	sync.Client = m.(*OracleClients).analyticsClient()
 
 	return ReadResource(sync)
 }

oci/analytics_analytics_instance_resource.go

@@ -141,7 +141,7 @@ func AnalyticsAnalyticsInstanceResource() *schema.Resource {
 func createAnalyticsAnalyticsInstance(d *schema.ResourceData, m interface{}) error {
 	sync := &AnalyticsAnalyticsInstanceResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).analyticsClient
+	sync.Client = m.(*OracleClients).analyticsClient()
 
 	var powerOff = false
 	if powerState, ok := sync.D.GetOkExists("state"); ok {
@@ -201,15 +201,15 @@ func (s *AnalyticsAnalyticsInstanceResourceCrud) StopOacInstance() error {
 func readAnalyticsAnalyticsInstance(d *schema.ResourceData, m interface{}) error {
 	sync := &AnalyticsAnalyticsInstanceResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).analyticsClient
+	sync.Client = m.(*OracleClients).analyticsClient()
 
 	return ReadResource(sync)
 }
 
 func updateAnalyticsAnalyticsInstance(d *schema.ResourceData, m interface{}) error {
 	sync := &AnalyticsAnalyticsInstanceResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).analyticsClient
+	sync.Client = m.(*OracleClients).analyticsClient()
 
 	// switch to power on
 	powerOn, powerOff := false, false
@@ -247,7 +247,7 @@ func updateAnalyticsAnalyticsInstance(d *schema.ResourceData, m interface{}) err
 func deleteAnalyticsAnalyticsInstance(d *schema.ResourceData, m interface{}) error {
 	sync := &AnalyticsAnalyticsInstanceResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).analyticsClient
+	sync.Client = m.(*OracleClients).analyticsClient()
 	sync.DisableNotFoundRetries = true
 
 	return DeleteResource(d, sync)

oci/analytics_analytics_instance_test.go

@@ -426,7 +426,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
 
 func testAccCheckAnalyticsAnalyticsInstanceDestroy(s *terraform.State) error {
 	noResourceFound := true
-	client := testAccProvider.Meta().(*OracleClients).analyticsClient
+	client := testAccProvider.Meta().(*OracleClients).analyticsClient()
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type == "oci_analytics_analytics_instance" {
 			noResourceFound = false
@@ -478,7 +478,7 @@ func init() {
 }
 
 func sweepAnalyticsAnalyticsInstanceResource(compartment string) error {
-	analyticsClient := GetTestClients(&schema.ResourceData{}).analyticsClient
+	analyticsClient := GetTestClients(&schema.ResourceData{}).analyticsClient()
 	analyticsInstanceIds, err := getAnalyticsInstanceIds(compartment)
 	if err != nil {
 		return err
@@ -509,7 +509,7 @@ func getAnalyticsInstanceIds(compartment string) ([]string, error) {
 	}
 	var resourceIds []string
 	compartmentId := compartment
-	analyticsClient := GetTestClients(&schema.ResourceData{}).analyticsClient
+	analyticsClient := GetTestClients(&schema.ResourceData{}).analyticsClient()
 
 	listAnalyticsInstancesRequest := oci_analytics.ListAnalyticsInstancesRequest{}
 	listAnalyticsInstancesRequest.CompartmentId = &compartmentId
@@ -536,7 +536,7 @@ func analyticsInstanceSweepWaitCondition(response common.OCIOperationResponse) b
 }
 
 func analyticsInstanceSweepResponseFetchOperation(client *OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
-	_, err := client.analyticsClient.GetAnalyticsInstance(context.Background(), oci_analytics.GetAnalyticsInstanceRequest{
+	_, err := client.analyticsClient().GetAnalyticsInstance(context.Background(), oci_analytics.GetAnalyticsInstanceRequest{
 		AnalyticsInstanceId: resourceId,
 		RequestMetadata: common.RequestMetadata{
 			RetryPolicy: retryPolicy,

oci/analytics_analytics_instances_data_source.go

@@ -50,7 +50,7 @@ func AnalyticsAnalyticsInstancesDataSource() *schema.Resource {
 func readAnalyticsAnalyticsInstances(d *schema.ResourceData, m interface{}) error {
 	sync := &AnalyticsAnalyticsInstancesDataSourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).analyticsClient
+	sync.Client = m.(*OracleClients).analyticsClient()
 
 	return ReadResource(sync)
 }

oci/analytics_clients.go

@@ -0,0 +1,29 @@
+// Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+
+package oci
+
+import (
+	oci_analytics "github.com/oracle/oci-go-sdk/analytics"
+
+	oci_common "github.com/oracle/oci-go-sdk/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_analytics.AnalyticsClient", &OracleClient{initClientFn: initAnalyticsAnalyticsClient})
+}
+
+func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
+	client, err := oci_analytics.NewAnalyticsClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) analyticsClient() *oci_analytics.AnalyticsClient {
+	return m.GetClient("oci_analytics.AnalyticsClient").(*oci_analytics.AnalyticsClient)
+}

oci/apigateway_clients.go

@@ -0,0 +1,46 @@
+// Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+
+package oci
+
+import (
+	oci_apigateway "github.com/oracle/oci-go-sdk/apigateway"
+
+	oci_common "github.com/oracle/oci-go-sdk/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_apigateway.DeploymentClient", &OracleClient{initClientFn: initApigatewayDeploymentClient})
+	RegisterOracleClient("oci_apigateway.GatewayClient", &OracleClient{initClientFn: initApigatewayGatewayClient})
+}
+
+func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
+	client, err := oci_apigateway.NewDeploymentClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) deploymentClient() *oci_apigateway.DeploymentClient {
+	return m.GetClient("oci_apigateway.DeploymentClient").(*oci_apigateway.DeploymentClient)
+}
+
+func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
+	client, err := oci_apigateway.NewGatewayClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) gatewayClient() *oci_apigateway.GatewayClient {
+	return m.GetClient("oci_apigateway.GatewayClient").(*oci_apigateway.GatewayClient)
+}

oci/apigateway_deployment_data_source.go

@@ -25,7 +25,7 @@ func ApigatewayDeploymentDataSource() *schema.Resource {
 func readSingularApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 	sync := &ApigatewayDeploymentDataSourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).deploymentClient
+	sync.Client = m.(*OracleClients).deploymentClient()
 
 	return ReadResource(sync)
 }

oci/apigateway_deployment_resource.go

@@ -599,7 +599,7 @@ func ApigatewayDeploymentResource() *schema.Resource {
 func createApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 	sync := &ApigatewayDeploymentResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).deploymentClient
+	sync.Client = m.(*OracleClients).deploymentClient()
 	sync.WorkRequestsClient = m.(*OracleClients).gatewayWorkRequestsClient
 
 	return CreateResource(d, sync)
@@ -608,7 +608,7 @@ func createApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 func readApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 	sync := &ApigatewayDeploymentResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).deploymentClient
+	sync.Client = m.(*OracleClients).deploymentClient()
 	sync.WorkRequestsClient = m.(*OracleClients).gatewayWorkRequestsClient
 
 	return ReadResource(sync)
@@ -617,7 +617,7 @@ func readApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 func updateApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 	sync := &ApigatewayDeploymentResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).deploymentClient
+	sync.Client = m.(*OracleClients).deploymentClient()
 	sync.WorkRequestsClient = m.(*OracleClients).gatewayWorkRequestsClient
 
 	return UpdateResource(d, sync)
@@ -626,7 +626,7 @@ func updateApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 func deleteApigatewayDeployment(d *schema.ResourceData, m interface{}) error {
 	sync := &ApigatewayDeploymentResourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).deploymentClient
+	sync.Client = m.(*OracleClients).deploymentClient()
 	sync.WorkRequestsClient = m.(*OracleClients).gatewayWorkRequestsClient
 	sync.DisableNotFoundRetries = true
 

oci/apigateway_deployment_test.go

@@ -526,7 +526,7 @@ func TestApigatewayDeploymentResource_basic(t *testing.T) {
 
 func testAccCheckApigatewayDeploymentDestroy(s *terraform.State) error {
 	noResourceFound := true
-	client := testAccProvider.Meta().(*OracleClients).deploymentClient
+	client := testAccProvider.Meta().(*OracleClients).deploymentClient()
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type == "oci_apigateway_deployment" {
 			noResourceFound = false
@@ -578,7 +578,7 @@ func init() {
 }
 
 func sweepApigatewayDeploymentResource(compartment string) error {
-	deploymentClient := GetTestClients(&schema.ResourceData{}).deploymentClient
+	deploymentClient := GetTestClients(&schema.ResourceData{}).deploymentClient()
 	deploymentIds, err := getDeploymentIds(compartment)
 	if err != nil {
 		return err
@@ -609,7 +609,7 @@ func getDeploymentIds(compartment string) ([]string, error) {
 	}
 	var resourceIds []string
 	compartmentId := compartment
-	deploymentClient := GetTestClients(&schema.ResourceData{}).deploymentClient
+	deploymentClient := GetTestClients(&schema.ResourceData{}).deploymentClient()
 
 	listDeploymentsRequest := oci_apigateway.ListDeploymentsRequest{}
 	listDeploymentsRequest.CompartmentId = &compartmentId
@@ -636,7 +636,7 @@ func deploymentSweepWaitCondition(response common.OCIOperationResponse) bool {
 }
 
 func deploymentSweepResponseFetchOperation(client *OracleClients, resourceId *string, retryPolicy *common.RetryPolicy) error {
-	_, err := client.deploymentClient.GetDeployment(context.Background(), oci_apigateway.GetDeploymentRequest{
+	_, err := client.deploymentClient().GetDeployment(context.Background(), oci_apigateway.GetDeploymentRequest{
 		DeploymentId: resourceId,
 		RequestMetadata: common.RequestMetadata{
 			RetryPolicy: retryPolicy,

oci/apigateway_deployments_data_source.go

@@ -47,7 +47,7 @@ func ApigatewayDeploymentsDataSource() *schema.Resource {
 func readApigatewayDeployments(d *schema.ResourceData, m interface{}) error {
 	sync := &ApigatewayDeploymentsDataSourceCrud{}
 	sync.D = d
-	sync.Client = m.(*OracleClients).deploymentClient
+	sync.Client = m.(*OracleClients).deploymentClient()
 
 	return ReadResource(sync)
 }