update(partner center sell): env handeling fix

Signed-off-by: Peter Harasztia <[email protected]>
HarasztiaPeter · Oct 14, 2024 · acdb2ec · acdb2ec
1 parent 55efd3b
commit acdb2ec
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_deployment.go
@@ -684,10 +684,6 @@ func resourceIbmOnboardingCatalogDeploymentUpdate(context context.Context, d *sc
 			" The resource must be re-created to update this property.", "catalog_plan_id")
 		return flex.DiscriminatedTerraformErrorf(nil, errMsg, "ibm_onboarding_catalog_deployment", "update", "catalog_plan_id-forces-new").GetDiag()
 	}
-	if d.HasChange("env") {
-		updateCatalogDeploymentOptions.SetEnv(d.Get("env").(string))
-		hasChange = true
-	}
 	if d.HasChange("active") {
 		newActive := d.Get("active").(bool)
 		patchVals.Active = &newActive

diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_plan.go
@@ -646,10 +646,6 @@ func resourceIbmOnboardingCatalogPlanUpdate(context context.Context, d *schema.R
 			" The resource must be re-created to update this property.", "catalog_product_id")
 		return flex.DiscriminatedTerraformErrorf(nil, errMsg, "ibm_onboarding_catalog_plan", "update", "catalog_product_id-forces-new").GetDiag()
 	}
-	if d.HasChange("env") {
-		updateCatalogPlanOptions.SetEnv(d.Get("env").(string))
-		hasChange = true
-	}
 	if d.HasChange("active") {
 		newActive := d.Get("active").(bool)
 		patchVals.Active = &newActive

diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go b/ibm/service/partnercentersell/resource_ibm_onboarding_catalog_product.go
@@ -852,10 +852,6 @@ func resourceIbmOnboardingCatalogProductUpdate(context context.Context, d *schem
 			" The resource must be re-created to update this property.", "product_id")
 		return flex.DiscriminatedTerraformErrorf(nil, errMsg, "ibm_onboarding_catalog_product", "update", "product_id-forces-new").GetDiag()
 	}
-	if d.HasChange("env") {
-		updateCatalogProductOptions.SetEnv(d.Get("env").(string))
-		hasChange = true
-	}
 	if d.HasChange("active") {
 		newActive := d.Get("active").(bool)
 		patchVals.Active = &newActive

diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go b/ibm/service/partnercentersell/resource_ibm_onboarding_iam_registration.go
@@ -1380,10 +1380,6 @@ func resourceIbmOnboardingIamRegistrationUpdate(context context.Context, d *sche
 			" The resource must be re-created to update this property.", "product_id")
 		return flex.DiscriminatedTerraformErrorf(nil, errMsg, "ibm_onboarding_iam_registration", "update", "product_id-forces-new").GetDiag()
 	}
-	if d.HasChange("env") {
-		updateIamRegistrationOptions.SetEnv(d.Get("env").(string))
-		hasChange = true
-	}
 	if d.HasChange("enabled") {
 		newEnabled := d.Get("enabled").(bool)
 		patchVals.Enabled = &newEnabled

diff --git a/ibm/service/partnercentersell/resource_ibm_onboarding_resource_broker.go b/ibm/service/partnercentersell/resource_ibm_onboarding_resource_broker.go
@@ -470,14 +470,13 @@ func resourceIbmOnboardingResourceBrokerUpdate(context context.Context, d *schem
 	updateResourceBrokerOptions := &partnercentersellv1.UpdateResourceBrokerOptions{}
 
 	updateResourceBrokerOptions.SetBrokerID(d.Id())
+	if _, ok := d.GetOk("env"); ok {
+		updateResourceBrokerOptions.SetEnv(d.Get("env").(string))
+	}
 
 	hasChange := false
 
 	patchVals := &partnercentersellv1.BrokerPatch{}
-	if d.HasChange("env") {
-		updateResourceBrokerOptions.SetEnv(d.Get("env").(string))
-		hasChange = true
-	}
 	if d.HasChange("auth_username") {
 		newAuthUsername := d.Get("auth_username").(string)
 		patchVals.AuthUsername = &newAuthUsername