Skip to content

Commit

Permalink
Refactoring schema code again to resolve UT errors
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulomeeCb committed Sep 17, 2024
1 parent 2cad0ec commit ef8f167
Showing 1 changed file with 22 additions and 15 deletions.
37 changes: 22 additions & 15 deletions internal/schema/network_peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand All @@ -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),
Expand All @@ -271,10 +278,10 @@ 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

}

// AttributeTypes returns a mapping of field names to their respective attribute types for the PeeringStatus struct.
Expand Down

0 comments on commit ef8f167

Please sign in to comment.