powerplatform environment billing policy id and environment group id should accept empty guid as an empty values instead of "" (#604)

* Feat: Add Bing search configuration to environment schema and DTO

* Feat: Enhance environment API to support cross-region data movement and update schema

* Feat: Update environment API to support copilot policies and add new schema attributes for Bing search and cross-region data movement

* Feat: Add support for Bing Chat and update environment AI features in the API

* Feat: Update environment API to include copilot policies and enhance billing policy handling in tests

* Feat: Add tests for generative AI features in non-US and US regions in environment resource

* Feat: Refactor environment update logic to improve readability and maintainability

* Feat: Add allow_bing_search and allow_moving_data_across_regions attributes to powerplatform_environment

* Feat: Update documentation to include allow_bing_search and allow_moving_data_across_regions attributes for powerplatform_environment

* Fix formatting and update API request to include copilotPolicies in managed environment tests

* Validate location constraints for AI generative features in powerplatform_environment resource

* Add release cycle field to SourceModel and improve error messages for location validation

* Refactor AI generative features validation logic and improve error handling for location constraints

* enhance validation: add length requirement for environment group ID

* fixing environemnt_group_id

* refactor: update billing policy ID handling to use constants for empty values

* docs: update descriptions for billing_policy_id and environment_group_id to specify empty GUID usage

* fixing TestAccEnvironmentsResource_Create_Environment_And_Add_Env_Group

* fix TestAccTestEnvironmentSettingsResource_Validate_Read

* fix TestAccManagedEnvironmentsResource_Validate_No_Dataverse

* trigger acc tests

* run_tests pipeline: clean environment that starts with "Test" and not only with "TestAcc"

* fix: update retry duration and handle environment deletion errors

---------

Co-authored-by: github-actions[bot] <tfmod442916@users.noreply.github.com>

Author: mawasile

.changes/unreleased/changed-20250227-161415.yaml

@@ -0,0 +1,5 @@
+kind: changed
+body: 'powerplatform_environment: attributes `environment_group_id` and `billing_policy_id` uses empty guid `00000000-0000-0000-0000-000000000000` as no value, instead of ""'
+time: 2025-02-27T16:14:15.118950739Z
+custom:
+    Issue: "604"

.github/workflows/run_tests.yml

@@ -130,9 +130,9 @@ jobs:
       run: |
         dotnet tool install --global Microsoft.PowerApps.CLI.Tool
         pac auth create --githubFederated --tenant ${{ secrets.ACCEPTANCE_TESTS_ENV_TENANT_ID }} --applicationId ${{ secrets.ACCEPTANCE_TESTS_ENV_CLIENT_ID }}
-        $environmentsList = (pac admin list --name "TestAcc" --json | ConvertFrom-Json)
+        $environmentsList = (pac admin list --name "Test" --json | ConvertFrom-Json)
         $environmentsList | ForEach-Object -Parallel {
-            if ($_.DisplayName.StartsWith("TestAcc")){
+            if ($_.DisplayName.StartsWith("Test")){
                 Write-Output $_.DisplayName
                 pac admin delete -env $_.EnvironmentID
             }

docs/resources/environment.md

@@ -62,11 +62,11 @@ resource "powerplatform_environment" "development" {
 - `allow_bing_search` (Boolean) Allow Bing search in the environment
 - `allow_moving_data_across_regions` (Boolean) Allow moving data across regions
 - `azure_region` (String) Azure region of the environment (westeurope, eastus etc.). Can be queried using the `powerplatform_locations` data source. This property should only be set if absolutely necessary like when trying to create an environment in the same Azure region as Azure resources or Fabric capacity.  Changing this property after environment creation will result in a destroy and recreation of the environment (you can use the [`prevent_destroy` lifecycle metatdata](https://developer.hashicorp.com/terraform/language/meta-arguments/lifecycle#prevent_destroy) as an added safeguard to prevent accidental deletion of environments).
-- `billing_policy_id` (String) Billing policy id (guid) for pay-as-you-go environments using Azure subscription billing
+- `billing_policy_id` (String) Billing policy id (guid) for pay-as-you-go environments using Azure subscription billing. To remove the environment from the billing policy, set this attribute to `00000000-0000-0000-0000-000000000000`
 - `cadence` (String) Cadence of updates for the environment (Frequent, Moderate). For more information check [here](https://learn.microsoft.com/en-us/power-platform/admin/create-environment#setting-an-environment-refresh-cadence).
 - `dataverse` (Attributes) Dataverse environment details (see [below for nested schema](#nestedatt--dataverse))
 - `description` (String) Description of the environment
-- `environment_group_id` (String) Environment group id (guid) that the environment belongs to. See [Environment groups](https://learn.microsoft.com/en-us/power-platform/admin/environment-groups) for more information.
+- `environment_group_id` (String) Environment group id (guid) that the environment belongs to. See [Environment groups](https://learn.microsoft.com/en-us/power-platform/admin/environment-groups) for more information. To remove the environment from the environment group, set this attribute to `00000000-0000-0000-0000-000000000000`
 - `owner_id` (String) Entra ID  user id (guid) of the environment owner when creating developer environment
 - `release_cycle` (String) Gives you the ability to create environments that are updated first. This allows you to experience and validate scenarios that are important to you before any updates reach your business-critical applications. See [more](https://learn.microsoft.com/en-us/power-platform/admin/early-release).
 - `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))

internal/api/client.go

@@ -144,9 +144,9 @@ func (client *Client) Execute(ctx context.Context, scopes []string, method, url
 	}
 }
 
-// RetryAfterDefault returns a random duration between 5 and 10 seconds.
+// RetryAfterDefault returns a random duration between 10 and 20 seconds.
 func DefaultRetryAfter() time.Duration {
-	return time.Duration((rand.Intn(5) + 5)) * time.Second
+	return time.Duration((rand.Intn(10) + 10)) * time.Second
 }
 
 // SleepWithContext sleeps for the given duration or until the context is canceled.

internal/api/request.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 	"net/http"
 	"runtime"
 	"time"
@@ -92,7 +91,7 @@ func retryAfter(ctx context.Context, resp *http.Response) time.Duration {
 	retryAfter, err := time.ParseDuration(retryHeader)
 	if err != nil {
 		// default retry after 5-10 seconds
-		return time.Duration((rand.Intn(5) + 5)) * time.Second
+		return DefaultRetryAfter()
 	}
 
 	return retryAfter

internal/services/environment/api_environment.go

@@ -290,14 +290,23 @@ func (client *Client) DeleteEnvironment(ctx context.Context, environmentId strin
 		Message: "Deleted using Power Platform Terraform Provider",
 	}
 
-	response, err := client.Api.Execute(ctx, nil, "DELETE", apiUrl.String(), nil, environmentDelete, []int{http.StatusAccepted}, nil)
-	if err != nil {
-		var httpError *customerrors.UnexpectedHttpStatusCodeError
-		if errors.As(err, &httpError) {
-			return fmt.Errorf("Unexpected HTTP Status %s; Body: %s", httpError.StatusText, httpError.Body)
+	response, err := client.Api.Execute(ctx, nil, "DELETE", apiUrl.String(), nil, environmentDelete, []int{http.StatusNoContent, http.StatusAccepted, http.StatusConflict}, nil)
+
+	if response.HttpResponse.StatusCode == http.StatusConflict {
+		// the is another operation in progress, let's wait for it to complete, and try again
+		tflog.Debug(ctx, "Another operation is in progress, waiting for it to complete")
+		err = client.Api.SleepWithContext(ctx, api.DefaultRetryAfter())
+		if err != nil {
+			return err
 		}
-		return err
+		return client.DeleteEnvironment(ctx, environmentId)
+	}
+
+	var httpError *customerrors.UnexpectedHttpStatusCodeError
+	if errors.As(err, &httpError) {
+		return fmt.Errorf("Unexpected HTTP Status %s; Body: %s", httpError.StatusText, httpError.Body)
 	}
+
 	tflog.Debug(ctx, "Environment Deletion Operation HTTP Status: '"+response.HttpResponse.Status+"'")
 
 	tflog.Debug(ctx, "Waiting for environment deletion operation to complete")

internal/services/environment/datasource_environments_test.go

@@ -129,8 +129,8 @@ func TestUnitEnvironmentsDataSource_Validate_Read(t *testing.T) {
 					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.environment_type", "Sandbox"),
 					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.location", "europe"),
 					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.azure_region", "westeurope"),
-					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.billing_policy_id", ""),
-					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.environment_group_id", ""),
+					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.billing_policy_id", "00000000-0000-0000-0000-000000000000"),
+					resource.TestCheckResourceAttr("data.powerplatform_environments.all", "environments.1.environment_group_id", "00000000-0000-0000-0000-000000000000"),
 					resource.TestCheckNoResourceAttr("data.powerplatform_environments.all", "environments.1.dataverse.domain"),
 					resource.TestCheckNoResourceAttr("data.powerplatform_environments.all", "environments.1.dataverse.language_code"),
 					resource.TestCheckNoResourceAttr("data.powerplatform_environments.all", "environments.1.dataverse.organization_id"),

internal/services/environment/models.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/microsoft/terraform-provider-power-platform/internal/config"
+	"github.com/microsoft/terraform-provider-power-platform/internal/constants"
 	"github.com/microsoft/terraform-provider-power-platform/internal/helpers"
 	"github.com/microsoft/terraform-provider-power-platform/internal/services/licensing"
 )
@@ -110,7 +111,7 @@ func convertCreateEnvironmentDtoFromSourceModel(ctx context.Context, environment
 		environmentDto.Properties.AzureRegion = environmentSource.AzureRegion.ValueString()
 	}
 
-	if !environmentSource.BillingPolicyId.IsNull() && environmentSource.BillingPolicyId.ValueString() != "" {
+	if !environmentSource.BillingPolicyId.IsNull() && environmentSource.BillingPolicyId.ValueString() != constants.ZERO_UUID {
 		environmentDto.Properties.BillingPolicy = BillingPolicyDto{
 			Id: environmentSource.BillingPolicyId.ValueString(),
 		}
@@ -332,15 +333,15 @@ func convertEnvironmentGroupFromDto(environmentDto EnvironmentDto, model *Source
 	if environmentDto.Properties.ParentEnvironmentGroup != nil {
 		model.EnvironmentGroupId = types.StringValue(environmentDto.Properties.ParentEnvironmentGroup.Id)
 	} else {
-		model.EnvironmentGroupId = types.StringValue("")
+		model.EnvironmentGroupId = types.StringValue(constants.ZERO_UUID)
 	}
 }
 
 func convertBillingPolicyModelFromDto(environmentDto EnvironmentDto, model *SourceModel) {
-	if environmentDto.Properties.BillingPolicy != nil {
+	if environmentDto.Properties.BillingPolicy != nil && environmentDto.Properties.BillingPolicy.Id != "" {
 		model.BillingPolicyId = types.StringValue(environmentDto.Properties.BillingPolicy.Id)
 	} else {
-		model.BillingPolicyId = types.StringValue("")
+		model.BillingPolicyId = types.StringValue(constants.ZERO_UUID)
 	}
 }
 

internal/services/environment/resource_environment.go

@@ -102,14 +102,15 @@ func (r *Resource) Schema(ctx context.Context, req resource.SchemaRequest, resp
 				},
 			},
 			"environment_group_id": schema.StringAttribute{
-				MarkdownDescription: "Environment group id (guid) that the environment belongs to. See [Environment groups](https://learn.microsoft.com/en-us/power-platform/admin/environment-groups) for more information.",
+				MarkdownDescription: "Environment group id (guid) that the environment belongs to. See [Environment groups](https://learn.microsoft.com/en-us/power-platform/admin/environment-groups) for more information. To remove the environment from the environment group, set this attribute to `00000000-0000-0000-0000-000000000000`",
 				Computed:            true,
 				Optional:            true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.UseStateForUnknown(),
 				},
 				Validators: []validator.String{
-					stringvalidator.RegexMatches(regexp.MustCompile(helpers.GuidOrEmptyValueRegex), "environment_group_id must be a valid environment group id guid"),
+					stringvalidator.LengthAtLeast(1),
+					stringvalidator.RegexMatches(regexp.MustCompile(helpers.GuidRegex), "environment_group_id must be a valid environment group id guid"),
 					stringvalidator.AlsoRequires(path.Root("dataverse").Expression()),
 				},
 			},
@@ -200,12 +201,16 @@ func (r *Resource) Schema(ctx context.Context, req resource.SchemaRequest, resp
 				},
 			},
 			"billing_policy_id": &schema.StringAttribute{
-				MarkdownDescription: "Billing policy id (guid) for pay-as-you-go environments using Azure subscription billing",
+				MarkdownDescription: "Billing policy id (guid) for pay-as-you-go environments using Azure subscription billing. To remove the environment from the billing policy, set this attribute to `00000000-0000-0000-0000-000000000000`",
 				Optional:            true,
 				Computed:            true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.UseStateForUnknown(),
 				},
+				Validators: []validator.String{
+					stringvalidator.LengthAtLeast(1),
+					stringvalidator.RegexMatches(regexp.MustCompile(helpers.GuidRegex), "billing_policy_id must be a valid billing policy id guid"),
+				},
 			},
 			"enterprise_policies": schema.SetNestedAttribute{
 				MarkdownDescription: "Enterprise policies for the environment. See [Enterprise policies](https://learn.microsoft.com/en-us/power-platform/admin/enterprise-policies) for more details.",
@@ -285,6 +290,7 @@ func (r *Resource) Schema(ctx context.Context, req resource.SchemaRequest, resp
 						MarkdownDescription: "Security group id (guid). For an empty security group, set this property to `0000000-0000-0000-0000-000000000000`",
 						Optional:            true,
 						Validators: []validator.String{
+							stringvalidator.RegexMatches(regexp.MustCompile(helpers.GuidRegex), "security_group_id must be a valid security group guid id"),
 							validators.MakeFieldRequiredWhenOtherFieldDoesNotHaveValue(path.Root("environment_type").Expression(), regexp.MustCompile(EnvironmentTypesExceptDeveloperRegex), "dataverse.security_group_id is required for all environment_type values except `Developer`"),
 						},
 					},
@@ -734,8 +740,8 @@ func (r *Resource) Delete(ctx context.Context, req resource.DeleteRequest, resp
 	err := r.EnvironmentClient.DeleteEnvironment(ctx, state.Id.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(fmt.Sprintf("Client error when deleting %s_%s", r.ProviderTypeName, r.TypeName), err.Error())
-		return
 	}
+	resp.State.RemoveResource(ctx)
 }
 
 func (r *Resource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
@@ -780,19 +786,16 @@ func (r *Resource) updateAllowBingSearch(ctx context.Context, plan *SourceModel)
 }
 
 func updateEnvironmentGroupId(plan *SourceModel, environmentDto *EnvironmentDto) {
-	if !plan.EnvironmentGroupId.IsNull() && plan.EnvironmentGroupId.ValueString() != "" {
-		envGroupId := constants.ZERO_UUID
-		if plan.EnvironmentGroupId.ValueString() != "" && plan.EnvironmentGroupId.ValueString() != constants.ZERO_UUID {
-			envGroupId = plan.EnvironmentGroupId.ValueString()
-		}
+	// if there is no value in the plan, not even empty guid, then we do nothing, attribute stop bing tracked in state
+	if !plan.EnvironmentGroupId.IsNull() {
 		environmentDto.Properties.ParentEnvironmentGroup = &ParentEnvironmentGroupDto{
-			Id: envGroupId,
+			Id: plan.EnvironmentGroupId.ValueString(),
 		}
 	}
 }
 
 func updateBillingPolicyId(plan *SourceModel, environmentDto *EnvironmentDto) {
-	if !plan.BillingPolicyId.IsNull() && plan.BillingPolicyId.ValueString() != "" {
+	if !plan.BillingPolicyId.IsNull() {
 		environmentDto.Properties.BillingPolicy = &BillingPolicyDto{
 			Id: plan.BillingPolicyId.ValueString(),
 		}
@@ -814,7 +817,7 @@ func (r *Resource) updateDataverse(ctx context.Context, plan *SourceModel, state
 }
 
 func (r *Resource) removeBillingPolicy(ctx context.Context, state *SourceModel) error {
-	if !state.BillingPolicyId.IsNull() && !state.BillingPolicyId.IsUnknown() && state.BillingPolicyId.ValueString() != "" {
+	if !state.BillingPolicyId.IsNull() && !state.BillingPolicyId.IsUnknown() && state.BillingPolicyId.ValueString() != constants.ZERO_UUID {
 		tflog.Debug(ctx, fmt.Sprintf("Removing environment %s from billing policy %s", state.Id.ValueString(), state.BillingPolicyId.ValueString()))
 		err := r.LicensingClient.RemoveEnvironmentsToBillingPolicy(ctx, state.BillingPolicyId.ValueString(), []string{state.Id.ValueString()})
 		if err != nil {
@@ -825,7 +828,7 @@ func (r *Resource) removeBillingPolicy(ctx context.Context, state *SourceModel)
 }
 
 func (r *Resource) addBillingPolicy(ctx context.Context, plan *SourceModel) error {
-	if !plan.BillingPolicyId.IsNull() && !plan.BillingPolicyId.IsUnknown() && plan.BillingPolicyId.ValueString() != "" {
+	if !plan.BillingPolicyId.IsNull() && !plan.BillingPolicyId.IsUnknown() && plan.BillingPolicyId.ValueString() != constants.ZERO_UUID {
 		tflog.Debug(ctx, fmt.Sprintf("Adding environment %s to billing policy %s", plan.Id.ValueString(), plan.BillingPolicyId.ValueString()))
 		err := r.LicensingClient.AddEnvironmentsToBillingPolicy(ctx, plan.BillingPolicyId.ValueString(), []string{plan.Id.ValueString()})
 		if err != nil {