fix: bypassing scc refresh after deprecation (#6401)

* fix: bypassing scc refresh after deprecation

* fix: bypassing scc refresh after deprecation

* added end of life comments on checks

Author: pavanm87

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)