Bug Fix - zpr provider updates

Author: Girish Jambagi

internal/integrationtest/zpr_configuration_test.go

@@ -9,17 +9,17 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
-	"github.com/oracle/terraform-provider-oci/internal/resourcediscovery"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/oracle/terraform-provider-oci/httpreplay"
 	"github.com/oracle/terraform-provider-oci/internal/acctest"
+	"github.com/oracle/terraform-provider-oci/internal/resourcediscovery"
 	"github.com/oracle/terraform-provider-oci/internal/utils"
 )
 
 var (
 	ignoreChangesZprConfigurationRepresentation = map[string]interface{}{
-		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{"defined_tags", "freeform_tags", "system_tags"}},
+		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{"defined_tags", "freeform_tags"}},
 	}
 
 	ZprConfigurationRequiredOnlyResource = ZprConfigurationResourceDependencies +
@@ -128,6 +128,7 @@ func getZprConfigurationConfigurationId(resourceName string) resource.ImportStat
 			return "", fmt.Errorf("not found: %s", resourceName)
 		}
 
-		return fmt.Sprintf("%s/%s", rs.Primary.Attributes["compartment_id"], rs.Primary.Attributes["id"]), nil
+		importStateID := fmt.Sprintf("%s/%s", rs.Primary.Attributes["compartment_id"], rs.Primary.Attributes["id"])
+		return importStateID, nil
 	}
 }

internal/service/zpr/zpr_configuration_resource.go

@@ -101,7 +101,7 @@ func ZprConfigurationResource() *schema.Resource {
 func parseResourceID(id string) (string, string, error) {
 	parts := strings.SplitN(id, "/", 2)
 	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
-		return "", "", fmt.Errorf("unexpected format of ID (%s), expected compartmentId:configurationId", id)
+		return "", "", fmt.Errorf("unexpected format of ID (%s), expected compartmentId/configurationId", id)
 	}
 
 	return parts[0], parts[1], nil
@@ -349,6 +349,7 @@ func (s *ZprConfigurationResourceCrud) Get() error {
 }
 
 func (s *ZprConfigurationResourceCrud) SetData() error {
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
@@ -365,9 +366,7 @@ func (s *ZprConfigurationResourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
-	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
-	}
+	s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
 
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())