adding additional check for default currency request (#374)

mawasile · mattdot · web-flow · commit f9a895e14a88 · 2024-07-24T10:14:55.000-06:00
Co-authored-by: Matt Dotson &lt;mattdot@users.noreply.github.com&gt;
diff --git a/examples/data-sources/powerplatform_environments/cert.pkcs12 b/examples/data-sources/powerplatform_environments/cert.pkcs12
diff --git a/internal/powerplatform/api/api_client.go b/internal/powerplatform/api/api_client.go
@@ -41,6 +41,8 @@ func NewApiClientBase(config *config.ProviderConfig, baseAuth *Auth) *ApiClient
 }
 
 func TryGetScopeFromURL(url string, cloudConfig config.ProviderConfigUrls) (string, error) {
+	
+
 	switch {
 	case strings.LastIndex(url, cloudConfig.BapiUrl) != -1,
 		strings.LastIndex(url, cloudConfig.PowerAppsUrl) != -1:
diff --git a/internal/powerplatform/helpers/error.go b/internal/powerplatform/helpers/error.go
@@ -14,6 +14,7 @@ const (
 	ERROR_OBJECT_NOT_FOUND            ErrorCode = "OBJECT_NOT_FOUND"
 	ERROR_UNEXPECTED_HTTP_RETURN_CODE ErrorCode = "UNEXPECTED_HTTP_RETURN_CODE"
 	ERROR_INCORRECT_URL_FORMAT        ErrorCode = "INCORRECT_URL_FORMAT"
+	ERROR_ENVIRONMENT_URL_NOT_FOUND   ErrorCode = "ENVIRONMENT_URL_NOT_FOUND"
 )
 
 type providerError struct {
diff --git a/internal/powerplatform/services/authorization/api_user.go b/internal/powerplatform/services/authorization/api_user.go
@@ -247,6 +247,9 @@ func (client *UserClient) GetEnvironmentUrlById(ctx context.Context, environment
 		return "", err
 	}
 	environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")
+	if environmentUrl == "" {
+		return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")
+	}
 	return environmentUrl, nil
 }
 
diff --git a/internal/powerplatform/services/data_record/api_data_record.go b/internal/powerplatform/services/data_record/api_data_record.go
@@ -90,6 +90,9 @@ func (client *DataRecordClient) GetEnvironmentUrlById(ctx context.Context, envir
 		return "", err
 	}
 	environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")
+	if environmentUrl == "" {
+		return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")
+	}
 	return environmentUrl, nil
 }
 
diff --git a/internal/powerplatform/services/environment/api_environment.go b/internal/powerplatform/services/environment/api_environment.go
@@ -220,6 +220,9 @@ func (client *EnvironmentClient) GetEnvironmentUrlById(ctx context.Context, envi
 		return "", err
 	}
 	environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")
+	if environmentUrl == "" {
+		return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")
+	}
 	return environmentUrl, nil
 }
 
diff --git a/internal/powerplatform/services/environment/datasource_environments.go b/internal/powerplatform/services/environment/datasource_environments.go
@@ -12,6 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	api "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/api"
+	helpers "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/helpers"
 )
 
 var (
@@ -196,10 +197,13 @@ func (d *EnvironmentsDataSource) Read(ctx context.Context, req datasource.ReadRe
 		currencyCode := ""
 		defaultCurrency, err := d.EnvironmentClient.GetDefaultCurrencyForEnvironment(ctx, env.Name)
 		if err != nil {
-			resp.Diagnostics.AddWarning(fmt.Sprintf("Error when reading default currency for environment %s", env.Name), err.Error())
+			if helpers.Code(err) != helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND {
+				resp.Diagnostics.AddWarning(fmt.Sprintf("Error when reading default currency for environment %s", env.Name), err.Error())
+			}
 		} else {
 			currencyCode = defaultCurrency.IsoCurrencyCode
 		}
+
 		env, err := ConvertSourceModelFromEnvironmentDto(env, &currencyCode, nil, nil)
 		if err != nil {
 			resp.Diagnostics.AddError(fmt.Sprintf("Error when converting environment %s", env.DisplayName), err.Error())
diff --git a/internal/powerplatform/services/environment/resource_environment.go b/internal/powerplatform/services/environment/resource_environment.go
@@ -19,6 +19,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 
 	api "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/api"
+	helpers "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/helpers"
 	powerplatform_helpers "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/helpers"
 	powerplatform_modifiers "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/modifiers"
 	licensing "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/services/licensing"
@@ -298,7 +299,10 @@ func (r *EnvironmentResource) Read(ctx context.Context, req resource.ReadRequest
 	currencyCode := ""
 	defaultCurrency, err := r.EnvironmentClient.GetDefaultCurrencyForEnvironment(ctx, envDto.Name)
 	if err != nil {
-		resp.Diagnostics.AddWarning(fmt.Sprintf("Error when reading default currency for environment %s", envDto.Name), err.Error())
+		if helpers.Code(err) != helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND {
+			resp.Diagnostics.AddWarning(fmt.Sprintf("Error when reading default currency for environment %s", envDto.Name), err.Error())
+		}
+
 		if !state.Dataverse.IsNull() && !state.Dataverse.IsUnknown() {
 			var dataverseSourceModel DataverseSourceModel
 			state.Dataverse.As(ctx, &dataverseSourceModel, basetypes.ObjectAsOptions{UnhandledNullAsEmpty: true, UnhandledUnknownAsEmpty: true})
diff --git a/internal/powerplatform/services/environment_settings/api_environment_settings.go b/internal/powerplatform/services/environment_settings/api_environment_settings.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	api "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/api"
+	powerplatform_helpers "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/helpers"
 )
 
 func NewEnvironmentSettingsClient(api *api.ApiClient) EnvironmentSettingsClient {
@@ -32,7 +33,6 @@ func (client *EnvironmentSettingsClient) DataverseExists(ctx context.Context, en
 	return env.Properties.LinkedEnvironmentMetadata.InstanceURL != "", nil
 }
 
-
 func (client *EnvironmentSettingsClient) GetEnvironmentSettings(ctx context.Context, environmentId string) (*EnvironmentSettingsDto, error) {
 	environmentUrl, err := client.GetEnvironmentUrlById(ctx, environmentId)
 	if err != nil {
@@ -84,6 +84,9 @@ func (client *EnvironmentSettingsClient) GetEnvironmentUrlById(ctx context.Conte
 		return "", err
 	}
 	environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")
+	if environmentUrl == "" {
+		return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")
+	}
 	return environmentUrl, nil
 }
 
diff --git a/internal/powerplatform/services/solution/api_solution.go b/internal/powerplatform/services/solution/api_solution.go
@@ -287,6 +287,9 @@ func (client *SolutionClient) GetEnvironmentUrlById(ctx context.Context, environ
 		return "", err
 	}
 	environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")
+	if environmentUrl == "" {
+		return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")
+	}
 	return environmentUrl, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ func NewApiClientBase(config config.ProviderConfig, baseAuth Auth) *ApiClient`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func TryGetScopeFromURL(url string, cloudConfig config.ProviderConfigUrls) (string, error) {`
	`44`	`+`
	`45`	`+`
`44`	`46`	`switch {`
`45`	`47`	`case strings.LastIndex(url, cloudConfig.BapiUrl) != -1,`
`46`	`48`	`strings.LastIndex(url, cloudConfig.PowerAppsUrl) != -1:`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ const (`
`14`	`14`	`ERROR_OBJECT_NOT_FOUND ErrorCode = "OBJECT_NOT_FOUND"`
`15`	`15`	`ERROR_UNEXPECTED_HTTP_RETURN_CODE ErrorCode = "UNEXPECTED_HTTP_RETURN_CODE"`
`16`	`16`	`ERROR_INCORRECT_URL_FORMAT ErrorCode = "INCORRECT_URL_FORMAT"`
	`17`	`+ ERROR_ENVIRONMENT_URL_NOT_FOUND ErrorCode = "ENVIRONMENT_URL_NOT_FOUND"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`type providerError struct {`
Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,9 @@ func (client *UserClient) GetEnvironmentUrlById(ctx context.Context, environment`
`247`	`247`	`return "", err`
`248`	`248`	`}`
`249`	`249`	`environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")`
	`250`	`+ if environmentUrl == "" {`
	`251`	`+ return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")`
	`252`	`+ }`
`250`	`253`	`return environmentUrl, nil`
`251`	`254`	`}`
`252`	`255`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ func (client *DataRecordClient) GetEnvironmentUrlById(ctx context.Context, envir`
`90`	`90`	`return "", err`
`91`	`91`	`}`
`92`	`92`	`environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")`
	`93`	`+ if environmentUrl == "" {`
	`94`	`+ return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")`
	`95`	`+ }`
`93`	`96`	`return environmentUrl, nil`
`94`	`97`	`}`
`95`	`98`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,9 @@ func (client *EnvironmentClient) GetEnvironmentUrlById(ctx context.Context, envi`
`220`	`220`	`return "", err`
`221`	`221`	`}`
`222`	`222`	`environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")`
	`223`	`+ if environmentUrl == "" {`
	`224`	`+ return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")`
	`225`	`+ }`
`223`	`226`	`return environmentUrl, nil`
`224`	`227`	`}`
`225`	`228`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"strings"`
`12`	`12`
`13`	`13`	`api "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/api"`
	`14`	`+ powerplatform_helpers "github.com/microsoft/terraform-provider-power-platform/internal/powerplatform/helpers"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`func NewEnvironmentSettingsClient(api *api.ApiClient) EnvironmentSettingsClient {`
`@@ -32,7 +33,6 @@ func (client *EnvironmentSettingsClient) DataverseExists(ctx context.Context, en`
`32`	`33`	`return env.Properties.LinkedEnvironmentMetadata.InstanceURL != "", nil`
`33`	`34`	`}`
`34`	`35`
`35`		`-`
`36`	`36`	`func (client EnvironmentSettingsClient) GetEnvironmentSettings(ctx context.Context, environmentId string) (EnvironmentSettingsDto, error) {`
`37`	`37`	`environmentUrl, err := client.GetEnvironmentUrlById(ctx, environmentId)`
`38`	`38`	`if err != nil {`
`@@ -84,6 +84,9 @@ func (client *EnvironmentSettingsClient) GetEnvironmentUrlById(ctx context.Conte`
`84`	`84`	`return "", err`
`85`	`85`	`}`
`86`	`86`	`environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")`
	`87`	`+ if environmentUrl == "" {`
	`88`	`+ return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")`
	`89`	`+ }`
`87`	`90`	`return environmentUrl, nil`
`88`	`91`	`}`
`89`	`92`
Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,9 @@ func (client *SolutionClient) GetEnvironmentUrlById(ctx context.Context, environ`
`287`	`287`	`return "", err`
`288`	`288`	`}`
`289`	`289`	`environmentUrl := strings.TrimSuffix(env.Properties.LinkedEnvironmentMetadata.InstanceURL, "/")`
	`290`	`+ if environmentUrl == "" {`
	`291`	`+ return "", powerplatform_helpers.WrapIntoProviderError(nil, powerplatform_helpers.ERROR_ENVIRONMENT_URL_NOT_FOUND, "environment url not found, please check if the environment has dataverse linked")`
	`292`	`+ }`
`290`	`293`	`return environmentUrl, nil`
`291`	`294`	`}`
`292`	`295`