Merge branch 'master' into migration-PR-sdk-test-donot-delete

Author: uibm

.gitignore

@@ -26,6 +26,7 @@ website/node_modules
 *.test
 *.iml
 .vscode
+.env
 website/vendor
 *.attach
 *.xml

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.81.1 (August 6, 2025)
+
+## Bug Fixes
+
+### Resource controller
+* bypassing scc refresh after deprecation ([6401](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6401))
+
+### VPC Infrastructure
+* prevent 409 errors in is_virtual_endpoint_gateway by locking on VPC ID during create ([6378](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6378))
+
+
+
 # 1.81.0 (July 31, 2025)
 
 * Support for Cloud Internet Services 

ibm/service/resourcecontroller/data_source_ibm_resource_instance.go

@@ -190,6 +190,7 @@ func DataSourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{})
 	}
 	if _, ok := d.GetOk("name"); ok {
 		name := d.Get("name").(string)
+
 		resourceInstanceListOptions := rc.ListResourceInstancesOptions{
 			Name: &name,
 		}
@@ -302,12 +303,17 @@ func DataSourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{})
 
 		ID: instance.ResourceID,
 	}
-	service, _, err := globalClient.GetCatalogEntry(&options)
-	if err != nil {
-		return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err)
-	}
 
-	d.Set("service", service.Name)
+	// Note: Once the Compliance service (SCC) reaches its end of life, this conditional check can be revisited or safely removed.
+	if *instance.ResourceID == "compliance" {
+		d.Set("service", "compliance")
+	} else {
+		service, _, err := globalClient.GetCatalogEntry(&options)
+		if err != nil {
+			return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err)
+		}
+		d.Set("service", service.Name)
+	}
 
 	d.Set(flex.ResourceName, instance.Name)
 	d.Set(flex.ResourceCRN, instance.CRN)
@@ -354,11 +360,18 @@ func DataSourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{})
 
 		ID: instance.ResourcePlanID,
 	}
-	plan, _, err := globalClient.GetCatalogEntry(&planOptions)
-	if err != nil {
-		return fmt.Errorf("[ERROR] Error retrieving plan: %s", err)
+
+	// Note: Once the Compliance service (SCC) reaches its end of life, this conditional check can be revisited or safely removed.
+	if *instance.ResourceID == "compliance" {
+		d.Set("plan", "security-compliance-center-standard-plan")
+	} else {
+		plan, _, err := globalClient.GetCatalogEntry(&planOptions)
+		if err != nil {
+			return fmt.Errorf("[ERROR] Error retrieving plan: %s", err)
+		}
+		d.Set("plan", plan.Name)
 	}
-	d.Set("plan", plan.Name)
+
 	d.Set("crn", instance.CRN)
 	tags, err := flex.GetTagsUsingCRN(meta, *instance.CRN)
 	if err != nil {

ibm/service/resourcecontroller/resource_ibm_resource_instance.go

@@ -581,13 +581,17 @@ func ResourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{}) e
 	}
 	rsCatRepo := rsCatClient.ResourceCatalog()
 
-	serviceOff, err := rsCatRepo.GetServiceName(*instance.ResourceID)
-	if err != nil {
-		return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err)
+	// Note: Once the Compliance service (SCC) reaches its end of life, this conditional check can be revisited or safely removed.
+	if *instance.ResourceID == "compliance" {
+		d.Set("service", *instance.ResourceID)
+	} else {
+		serviceOff, err := rsCatRepo.GetServiceName(*instance.ResourceID)
+		if err != nil {
+			return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err)
+		}
+		d.Set("service", serviceOff)
 	}
 
-	d.Set("service", serviceOff)
-
 	d.Set(flex.ResourceName, instance.Name)
 	d.Set(flex.ResourceCRN, instance.CRN)
 	d.Set(flex.ResourceStatus, instance.State)
@@ -599,11 +603,17 @@ func ResourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{}) e
 	}
 	d.Set(flex.ResourceControllerURL, rcontroller+"/services/")
 
-	servicePlan, err := rsCatRepo.GetServicePlanName(*instance.ResourcePlanID)
-	if err != nil {
-		return fmt.Errorf("[ERROR] Error retrieving plan: %s", err)
+	// Note: Once the Compliance service (SCC) reaches its end of life, this conditional check can be revisited or safely removed.
+	if *instance.ResourceID == "compliance" {
+		d.Set("plan", "security-compliance-center-standard-plan")
+	} else {
+		servicePlan, err := rsCatRepo.GetServicePlanName(*instance.ResourcePlanID)
+		if err != nil {
+			return fmt.Errorf("[ERROR] Error retrieving plan: %s", err)
+		}
+		d.Set("plan", servicePlan)
 	}
-	d.Set("plan", servicePlan)
+
 	d.Set("guid", instance.GUID)
 	// ### Modificataion : Setting  "onetime_credentials"
 	d.Set("onetime_credentials", instance.OnetimeCredentials)

ibm/service/vpc/resource_ibm_is_virtual_endpoint_gateway.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
 	"github.com/IBM/go-sdk-core/v5/core"
@@ -337,6 +338,11 @@ func resourceIBMisVirtualEndpointGatewayCreate(context context.Context, d *schem
 	vpcOpt := &vpcv1.VPCIdentity{
 		ID: core.StringPtr(vpcID),
 	}
+	if vpcID != "" {
+		isVPCKey := "vpe_vpc_key_" + vpcID
+		conns.IbmMutexKV.Lock(isVPCKey)
+		defer conns.IbmMutexKV.Unlock(isVPCKey)
+	}
 
 	// update option
 	opt := sess.NewCreateEndpointGatewayOptions(targetOpt, vpcOpt)

version/version.go

@@ -5,7 +5,7 @@ import (
 )
 
 // Version is the current provider main version
-const Version = "1.81.0"
+const Version = "1.81.1"
 
 // GitCommit is the git commit that was compiled. This will be filled in by the compiler.
 var GitCommit string