Refactoring code as per review

couchbasecloud · Sep 17, 2024 · 4c49a6a · 4c49a6a
1 parent 1ac987c
commit 4c49a6a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 26 deletions.
diff --git a/internal/resources/network_peer.go b/internal/resources/network_peer.go
@@ -459,28 +459,44 @@ func (n *NetworkPeer) getNetworkPeer(ctx context.Context, organizationId, projec
 		return nil, fmt.Errorf("%s: %w", errors.ErrUnmarshallingResponse, err)
 	}
 
+	if err := defineProviderForResponse(networkResp); err != nil {
+		return nil, err
+	}
+
+	return &networkResp, nil
+}
+
+// defineProviderForResponse sets the provider type in the retrieved network peer as per the fields populated in the provider config.
+// If the provider type is not set through terraform separately in this manner, it will throw error as v4 get doesn't return it, but it's a field in resources.
+func defineProviderForResponse(networkResp network_peer_api.GetNetworkPeeringRecordResponse) error {
 	azure, err := networkResp.AsAZURE()
-	if err == nil && azure.AzureConfigData.AzureTenantId != "" {
-		networkResp.ProviderType = "azure"
-	} else if err != nil {
-		return nil, fmt.Errorf("%s: %w", errors.ErrReadingAzureConfig, err)
+	if err != nil {
+		return fmt.Errorf("%s: %w", errors.ErrReadingAzureConfig, err)
 	}
 
 	gcp, err := networkResp.AsGCP()
-	if err == nil && gcp.GCPConfigData.ProjectId != "" {
-		networkResp.ProviderType = "gcp"
-	} else if err != nil {
-		return nil, fmt.Errorf("%s: %w", errors.ErrReadingGCPConfig, err)
+	if err != nil {
+		return fmt.Errorf("%s: %w", errors.ErrReadingGCPConfig, err)
 	}
 
 	aws, err := networkResp.AsAWS()
-	if err == nil && aws.AWSConfigData.VpcId != "" {
+	if err != nil {
+		return fmt.Errorf("%s: %w", errors.ErrReadingAWSConfig, err)
+	}
+
+	// if there is no error, set the provider type for the provider config as per the populated fields in the get response.
+	switch {
+	case azure.AzureConfigData.AzureTenantId != "":
+		networkResp.ProviderType = "azure"
+	case gcp.GCPConfigData.ProjectId != "":
+		networkResp.ProviderType = "gcp"
+	case aws.AWSConfigData.VpcId != "":
 		networkResp.ProviderType = "aws"
-	} else if err != nil {
-		return nil, fmt.Errorf("%s: %w", errors.ErrReadingAWSConfig, err)
+	default:
+		return fmt.Errorf("%s: %w", errors.ErrReadingProviderConfig, err)
 	}
 
-	return &networkResp, nil
+	return nil
 }
 
 func validateProviderTypeIsSameInPlanAndState(planProviderType, stateProviderType string) bool {

diff --git a/internal/schema/network_peer.go b/internal/schema/network_peer.go
@@ -233,8 +233,24 @@ func NewNetworkPeer(ctx context.Context, networkPeer *network_peer_api.GetNetwor
 // morphToProviderConfig is used to convert ProviderConfig from json.RawMessage format to ProviderConfig type.
 func morphToProviderConfig(networkPeer *network_peer_api.GetNetworkPeeringRecordResponse) (ProviderConfig, error) {
 	var newProviderConfig ProviderConfig
+
 	aws, err := networkPeer.AsAWS()
-	if err == nil && aws.AWSConfigData.VpcId != "" {
+	if err != nil {
+		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingAWSConfig, err)
+	}
+
+	gcp, err := networkPeer.AsGCP()
+	if err != nil {
+		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingGCPConfig, err)
+	}
+
+	azure, err := networkPeer.AsAZURE()
+	if err != nil {
+		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingAzureConfig, err)
+	}
+
+	switch {
+	case aws.AWSConfigData.VpcId != "":
 		newProviderConfig.AWSConfig = &AWSConfig{
 			ProviderId: types.StringValue(aws.ProviderId),
 			AccountId:  types.StringValue(aws.AWSConfigData.AccountId),
@@ -243,12 +259,7 @@ func morphToProviderConfig(networkPeer *network_peer_api.GetNetworkPeeringRecord
 			Region:     types.StringValue(aws.AWSConfigData.Region),
 		}
 		return newProviderConfig, nil
-	} else if err != nil {
-		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingAWSConfig, err)
-	}
-
-	gcp, err := networkPeer.AsGCP()
-	if err == nil && gcp.GCPConfigData.ProjectId != "" {
+	case gcp.GCPConfigData.ProjectId != "":
 		newProviderConfig.GCPConfig = &GCPConfig{
 			ProviderId:     types.StringValue(gcp.ProviderId),
 			Cidr:           types.StringValue(gcp.GCPConfigData.Cidr),
@@ -257,11 +268,7 @@ func morphToProviderConfig(networkPeer *network_peer_api.GetNetworkPeeringRecord
 			ServiceAccount: types.StringValue(gcp.GCPConfigData.ServiceAccount),
 		}
 		return newProviderConfig, nil
-	} else if err != nil {
-		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingGCPConfig, err)
-	}
-	azure, err := networkPeer.AsAZURE()
-	if err == nil && azure.AzureConfigData.AzureTenantId != "" {
+	case azure.AzureConfigData.AzureTenantId != "":
 		newProviderConfig.AzureConfig = &AzureConfig{
 			ProviderId:     types.StringValue(azure.ProviderId),
 			Cidr:           types.StringValue(azure.AzureConfigData.Cidr),
@@ -271,8 +278,8 @@ func morphToProviderConfig(networkPeer *network_peer_api.GetNetworkPeeringRecord
 			AzureTenantId:  types.StringValue(azure.AzureConfigData.AzureTenantId),
 		}
 		return newProviderConfig, nil
-	} else if err != nil {
-		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingAzureConfig, err)
+	default:
+		return ProviderConfig{}, fmt.Errorf("%s: %w", errors.ErrReadingProviderConfig, err)
 	}
 	return newProviderConfig, nil
 }