BugFix - fix container repository RD

Author: Haley Gao

examples/artifacts/Repositories/repository.tf

@@ -6,7 +6,7 @@ variable "user_ocid" {}
 variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
-variable "compartment_id" {}
+variable "compartment_ocid" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -18,7 +18,7 @@ provider "oci" {
 
 resource "oci_artifacts_repository" "test_repository" {
   #Required
-  compartment_id  = var.compartment_id
+  compartment_id  = var.compartment_ocid
   is_immutable    = false
   repository_type = "GENERIC"
 }
@@ -48,7 +48,7 @@ resource "oci_artifacts_generic_artifact" "test_artifact_by_source" {
 
 data "oci_artifacts_repositories" "test_repositories" {
   #Required
-  compartment_id = var.compartment_id
+  compartment_id = var.compartment_ocid
   state = "AVAILABLE"
 }
 

internal/integrationtest/artifacts_container_configuration_test.go

@@ -18,6 +18,8 @@ import (
 )
 
 var (
+	ArtifactsContainerConfigurationRequiredOnlyResource = ArtifactsContainerConfigurationResourceDependencies + acctest.GenerateResourceFromRepresentationMap("oci_artifacts_container_configuration", "test_container_configuration", acctest.Required, acctest.Create, ArtifactscontainerConfigurationRepresentation)
+
 	ArtifactsContainerConfigurationResourceConfig = ArtifactsContainerConfigurationResourceDependencies +
 		acctest.GenerateResourceFromRepresentationMap("oci_artifacts_container_configuration", "test_container_configuration", acctest.Optional, acctest.Update, ArtifactscontainerConfigurationRepresentation)
 
@@ -104,5 +106,15 @@ func TestArtifactsContainerConfigurationResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "namespace"),
 			),
 		},
+		// verify resource import
+		{
+			Config:            config + ArtifactsContainerConfigurationRequiredOnlyResource,
+			ImportState:       true,
+			ImportStateVerify: true,
+			ImportStateVerifyIgnore: []string{
+				"compartment_id",
+			},
+			ResourceName: resourceName,
+		},
 	})
 }

internal/integrationtest/artifacts_generic_artifact_test.go

@@ -25,6 +25,8 @@ import (
 )
 
 var (
+	ArtifactsGenericArtifactRequiredOnlyResource = ArtifactsGenericArtifactResourceDependencies + acctest.GenerateResourceFromRepresentationMap("oci_artifacts_generic_artifact", "test_generic_artifact", acctest.Required, acctest.Create, ArtifactsGenericArtifactRepresentation)
+
 	ArtifactsGenericArtifactResourceConfig = ArtifactsGenericArtifactResourceDependencies +
 		acctest.GenerateResourceFromRepresentationMap("oci_artifacts_generic_artifact", "test_generic_artifact", acctest.Optional, acctest.Update, ArtifactsGenericArtifactRepresentation)
 
@@ -159,6 +161,14 @@ func TestArtifactsGenericArtifactResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "version"),
 			),
 		},
+		// verify resource import
+		{
+			Config:                  config + ArtifactsGenericArtifactRequiredOnlyResource,
+			ImportState:             true,
+			ImportStateVerify:       true,
+			ImportStateVerifyIgnore: []string{"artifact_id"},
+			ResourceName:            resourceName,
+		},
 	})
 }
 

internal/service/artifacts/artifacts_container_configuration_resource.go

@@ -5,7 +5,6 @@ package artifacts
 
 import (
 	"context"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
 	oci_artifacts "github.com/oracle/oci-go-sdk/v65/artifacts"
@@ -16,6 +15,9 @@ import (
 
 func ArtifactsContainerConfigurationResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: tfresource.DefaultTimeout,
 		Create:   createArtifactsContainerConfiguration,
 		Read:     readArtifactsContainerConfiguration,
@@ -80,6 +82,7 @@ type ArtifactsContainerConfigurationResourceCrud struct {
 
 func (s *ArtifactsContainerConfigurationResourceCrud) ID() string {
 	return s.D.Get("compartment_id").(string)
+	//return GetContainerConfigurationCompositeId(s.D.Get("compartment_id").(string))
 }
 
 func (s *ArtifactsContainerConfigurationResourceCrud) Create() error {
@@ -112,6 +115,9 @@ func (s *ArtifactsContainerConfigurationResourceCrud) Get() error {
 	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
 		tmp := compartmentId.(string)
 		request.CompartmentId = &tmp
+	} else {
+		tmp := s.D.Id()
+		request.CompartmentId = &tmp
 	}
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "artifacts")

internal/service/artifacts/artifacts_export.go

@@ -11,6 +11,7 @@ import (
 func init() {
 	exportArtifactsContainerRepositoryHints.GetIdFn = getArtifactsContainerRepositoryId
 	exportArtifactsContainerImageSignatureHints.GetIdFn = getArtifactsContainerImageSignatureId
+	exportArtifactsGenericArtifactHints.GetIdFn = getArtifactsGenericArtifactId
 	exportArtifactsRepositoryHints.GetIdFn = getArtifactsRepositoryId
 	tf_export.RegisterCompartmentGraphs("artifacts", artifactsResourceGraph)
 }
@@ -26,8 +27,7 @@ func getArtifactsRepositoryId(resource *tf_export.OCIResource) (string, error) {
 }
 
 func getArtifactsContainerRepositoryId(resource *tf_export.OCIResource) (string, error) {
-
-	repositoryId, ok := resource.SourceAttributes["repository_id"].(string)
+	repositoryId, ok := resource.SourceAttributes["id"].(string)
 	if !ok {
 		return "", fmt.Errorf("[ERROR] unable to find repositoryId for Artifacts ContainerRepository")
 	}
@@ -43,13 +43,22 @@ func getArtifactsContainerImageSignatureId(resource *tf_export.OCIResource) (str
 	return imageSignatureId, nil
 }
 
+func getArtifactsGenericArtifactId(resource *tf_export.OCIResource) (string, error) {
+
+	artifactId, ok := resource.SourceAttributes["id"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find artifactId for Artifacts GenericArtifact")
+	}
+	return artifactId, nil
+}
+
+// Hints for discovering and exporting this resource to configuration and state files
 var exportArtifactsContainerConfigurationHints = &tf_export.TerraformResourceHints{
 	ResourceClass:        "oci_artifacts_container_configuration",
 	DatasourceClass:      "oci_artifacts_container_configuration",
 	ResourceAbbreviation: "container_configuration",
 }
 
-// Hints for discovering and exporting this resource to configuration and state files
 var exportArtifactsContainerRepositoryHints = &tf_export.TerraformResourceHints{
 	ResourceClass:          "oci_artifacts_container_repository",
 	DatasourceClass:        "oci_artifacts_container_repositories",
@@ -83,10 +92,31 @@ var exportArtifactsRepositoryHints = &tf_export.TerraformResourceHints{
 	},
 }
 
+var exportArtifactsGenericArtifactHints = &tf_export.TerraformResourceHints{
+	ResourceClass:          "oci_artifacts_generic_artifact",
+	DatasourceClass:        "oci_artifacts_generic_artifacts",
+	DatasourceItemsAttr:    "generic_artifact_collection",
+	IsDatasourceCollection: true,
+	ResourceAbbreviation:   "generic_artifact",
+	RequireResourceRefresh: true,
+	DiscoverableLifecycleStates: []string{
+		string(oci_artifacts.GenericArtifactLifecycleStateAvailable),
+	},
+}
+
 var artifactsResourceGraph = tf_export.TerraformResourceGraph{
 	"oci_identity_compartment": {
+		{TerraformResourceHints: exportArtifactsContainerConfigurationHints},
 		{TerraformResourceHints: exportArtifactsContainerRepositoryHints},
 		{TerraformResourceHints: exportArtifactsContainerImageSignatureHints},
 		{TerraformResourceHints: exportArtifactsRepositoryHints},
 	},
+	"oci_artifacts_repository": {
+		{
+			TerraformResourceHints: exportArtifactsGenericArtifactHints,
+			DatasourceQueryParams: map[string]string{
+				"repository_id": "id",
+			},
+		},
+	},
 }

internal/service/artifacts/artifacts_generic_artifact_resource.go

@@ -17,6 +17,9 @@ import (
 
 func ArtifactsGenericArtifactResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: tfresource.DefaultTimeout,
 		Create:   createArtifactsGenericArtifact,
 		Read:     readArtifactsGenericArtifact,
@@ -189,6 +192,9 @@ func (s *ArtifactsGenericArtifactResourceCrud) Get() error {
 	if artifactId, ok := s.D.GetOkExists("artifact_id"); ok {
 		tmp := artifactId.(string)
 		request.ArtifactId = &tmp
+	} else {
+		tmp := s.D.Id()
+		request.ArtifactId = &tmp
 	}
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "artifacts")
@@ -248,6 +254,9 @@ func (s *ArtifactsGenericArtifactResourceCrud) Delete() error {
 }
 
 func (s *ArtifactsGenericArtifactResourceCrud) SetData() error {
+	if s.Res.Id != nil {
+		s.D.Set("artifact_id", *s.Res.Id)
+	}
 
 	if s.Res.ArtifactPath != nil {
 		s.D.Set("artifact_path", *s.Res.ArtifactPath)
@@ -291,7 +300,6 @@ func (s *ArtifactsGenericArtifactResourceCrud) SetData() error {
 
 	return nil
 }
-
 func GenericArtifactSummaryToMap(obj oci_artifacts.GenericArtifactSummary) map[string]interface{} {
 	result := map[string]interface{}{}
 

website/docs/guides/resource_discovery.html.markdown

@@ -385,9 +385,11 @@ apm_synthetics
 
 artifacts
 
+* oci\_artifacts\_container\_configuration
 * oci\_artifacts\_container\_repository
 * oci\_artifacts\_container\_image\_signature
 * oci\_artifacts\_repository
+* oci\_artifacts\_generic\_artifact
 
 auto_scaling
 
@@ -601,10 +603,8 @@ dataflow
 * oci\_dataflow\_run\_statement
 
 dataintegration
-
+    
 * oci\_dataintegration\_workspace
-* oci\_dataintegration\_workspace\_project
-* oci\_dataintegration\_workspace\_folder
 
 datascience
 

website/docs/r/artifacts_generic_artifact.html.markdown

@@ -64,4 +64,8 @@ The `timeouts` block allows you to specify [timeouts](https://registry.terraform
 
 ## Import
 
-Import is not supported for this resource.
+GenericArtifacts can be imported using the `id`, e.g.
+
+```
+$ terraform import oci_artifacts_generic_artifact.test_generic_artifact "generic/artifacts/{artifactId}" 
+```