Added - Resource discovery for

Author: Terraform Team Automation

examples/marketplace/main.tf

@@ -30,14 +30,14 @@ provider "oci" {
 
 resource "oci_marketplace_accepted_agreement" "test_accepted_agreement" {
   #Required
-  agreement_id    = oci_marketplace_listing_package_agreement.test_listing_package_agreement.agreement_id
+  agreement_id    = data.oci_marketplace_listing_package_agreement.test_listing_package_agreement.agreement_id
   compartment_id  = var.compartment_ocid
   listing_id      = data.oci_marketplace_listing.test_listing.id
   package_version = data.oci_marketplace_listing.test_listing.default_package_version
-  signature       = oci_marketplace_listing_package_agreement.test_listing_package_agreement.signature
+  signature       = data.oci_marketplace_listing_package_agreement.test_listing_package_agreement.signature
 }
 
-resource "oci_marketplace_listing_package_agreement" "test_listing_package_agreement" {
+data "oci_marketplace_listing_package_agreement" "test_listing_package_agreement" {
   #Required
   agreement_id    = data.oci_marketplace_listing_package_agreements.test_listing_package_agreements.agreements[0].id
   listing_id      = data.oci_marketplace_listing.test_listing.id

internal/integrationtest/marketplace_accepted_agreement_test.go

@@ -47,21 +47,25 @@ var (
 	}
 
 	MarketplaceAcceptedAgreementRepresentation = map[string]interface{}{
-		"agreement_id":    acctest.Representation{RepType: acctest.Required, Create: `${oci_marketplace_listing_package_agreement.test_listing_package_agreement.agreement_id}`},
+		"agreement_id":    acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing_package_agreement.test_listing_package_agreement.agreement_id}`},
 		"compartment_id":  acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 		"listing_id":      acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing.test_listing.id}`},
 		"package_version": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing.test_listing.default_package_version}`},
-		"defined_tags":    acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"display_name":    acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 		"freeform_tags":   acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
-		"signature":       acctest.Representation{RepType: acctest.Required, Create: `${oci_marketplace_listing_package_agreement.test_listing_package_agreement.signature}`},
+		"signature":       acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing_package_agreement.test_listing_package_agreement.signature}`},
+		"lifecycle":       acctest.RepresentationGroup{RepType: acctest.Required, Group: MarketplaceAcceptedAgreementIgnoreChangesRepresentation},
+	}
+
+	MarketplaceAcceptedAgreementIgnoreChangesRepresentation = map[string]interface{}{
+		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`signature`}},
 	}
 
 	MarketplaceAcceptedAgreementResourceDependencies = DefinedTagsDependencies +
 		acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listings", "test_listings", acctest.Required, acctest.Create, MarketplaceMarketplaceListingDataSourceRepresentation) +
 		acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing", "test_listing", acctest.Required, acctest.Create, MarketplaceMarketplaceListingSingularDataSourceRepresentation) +
-		acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreements", "test_listing_package_agreements", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_marketplace_listing_package_agreement", "test_listing_package_agreement", acctest.Required, acctest.Create, MarketplaceListingPackageAgreementManagementRepresentation)
+		acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreements", "test_listing_package_agreements", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementsDataSourceRepresentation) +
+		acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreement", "test_listing_package_agreement", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation)
 )
 
 // issue-routing-tag: marketplace/default

internal/integrationtest/marketplace_listing_package_agreement_test.go

@@ -15,14 +15,14 @@ import (
 )
 
 var (
-	MarketplaceListingPackageAgreementManagementRepresentation = map[string]interface{}{
+	MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation = map[string]interface{}{
 		"agreement_id":    acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing_package_agreements.test_listing_package_agreements.agreements.0.id}`},
 		"listing_id":      acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing.test_listing.id}`},
 		"package_version": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing.test_listing.default_package_version}`},
 		"compartment_id":  acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
 	}
 
-	MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation = map[string]interface{}{
+	MarketplaceMarketplaceListingPackageAgreementsDataSourceRepresentation = map[string]interface{}{
 		"listing_id":      acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing.test_listing.id}`},
 		"package_version": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_marketplace_listing.test_listing.default_package_version}`},
 		"compartment_id":  acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
@@ -42,42 +42,42 @@ func TestMarketplaceListingPackageAgreementResource_basic(t *testing.T) {
 	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
-	datasourceName := "data.oci_marketplace_listing_package_agreements.test_listing_package_agreements"
-	resourceName := "oci_marketplace_listing_package_agreement.test_listing_package_agreement"
+	listDatasourceName := "data.oci_marketplace_listing_package_agreements.test_listing_package_agreements"
+	getDatasourceName := "data.oci_marketplace_listing_package_agreement.test_listing_package_agreement"
 
 	acctest.SaveConfigContent("", "", "", t)
 
 	acctest.ResourceTest(t, nil, []resource.TestStep{
-		// verify resource
+		// verify get datasource
 		{
 			Config: config +
-				acctest.GenerateResourceFromRepresentationMap("oci_marketplace_listing_package_agreement", "test_listing_package_agreement", acctest.Required, acctest.Create, MarketplaceListingPackageAgreementManagementRepresentation) +
-				acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreements", "test_listing_package_agreements", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation) +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreement", "test_listing_package_agreement", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation) +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreements", "test_listing_package_agreements", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementsDataSourceRepresentation) +
 				compartmentIdVariableStr + MarketplaceListingPackageAgreementResourceConfig,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttrSet(resourceName, "agreement_id"),
-				resource.TestCheckResourceAttrSet(resourceName, "listing_id"),
-				resource.TestCheckResourceAttrSet(resourceName, "package_version"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "agreement_id"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "listing_id"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "package_version"),
 
-				resource.TestCheckResourceAttrSet(resourceName, "content_url"),
-				resource.TestCheckResourceAttrSet(resourceName, "id"),
-				resource.TestCheckResourceAttrSet(resourceName, "prompt"),
-				resource.TestCheckResourceAttrSet(resourceName, "signature"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "content_url"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "id"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "prompt"),
+				resource.TestCheckResourceAttrSet(getDatasourceName, "signature"),
 			),
 		},
-		// verify datasource
+		// verify list datasource
 		{
 			Config: config +
-				acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreements", "test_listing_package_agreements", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementDataSourceRepresentation) +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_listing_package_agreements", "test_listing_package_agreements", acctest.Required, acctest.Create, MarketplaceMarketplaceListingPackageAgreementsDataSourceRepresentation) +
 				compartmentIdVariableStr + MarketplaceListingPackageAgreementResourceConfig,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttrSet(datasourceName, "listing_id"),
+				resource.TestCheckResourceAttrSet(listDatasourceName, "listing_id"),
 
-				resource.TestCheckResourceAttrSet(datasourceName, "agreements.#"),
-				resource.TestCheckResourceAttrSet(datasourceName, "agreements.0.author"),
-				resource.TestCheckResourceAttrSet(datasourceName, "agreements.0.content_url"),
-				resource.TestCheckResourceAttrSet(datasourceName, "agreements.0.id"),
-				resource.TestCheckResourceAttrSet(datasourceName, "agreements.0.prompt"),
+				resource.TestCheckResourceAttrSet(listDatasourceName, "agreements.#"),
+				resource.TestCheckResourceAttrSet(listDatasourceName, "agreements.0.author"),
+				resource.TestCheckResourceAttrSet(listDatasourceName, "agreements.0.content_url"),
+				resource.TestCheckResourceAttrSet(listDatasourceName, "agreements.0.id"),
+				resource.TestCheckResourceAttrSet(listDatasourceName, "agreements.0.prompt"),
 			),
 		},
 	})

internal/service/marketplace/marketplace_export.go

@@ -2,11 +2,11 @@ package marketplace
 
 import (
 	oci_marketplace "github.com/oracle/oci-go-sdk/v65/marketplace"
-
 	tf_export "github.com/oracle/terraform-provider-oci/internal/commonexport"
 )
 
 func init() {
+	exportMarketplacePublicationHints.FindResourcesOverrideFn = findPublications
 	tf_export.RegisterCompartmentGraphs("marketplace", marketplaceResourceGraph)
 }
 
@@ -28,12 +28,25 @@ var exportMarketplacePublicationHints = &tf_export.TerraformResourceHints{
 	ResourceAbbreviation:   "publication",
 	RequireResourceRefresh: true,
 	DiscoverableLifecycleStates: []string{
+		string(oci_marketplace.PublicationLifecycleStateCreating),
 		string(oci_marketplace.PublicationLifecycleStateActive),
 	},
 }
 
 var marketplaceResourceGraph = tf_export.TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportMarketplaceAcceptedAgreementHints},
+		{TerraformResourceHints: exportMarketplacePublicationHints},
 	},
 }
+
+func findPublications(ctx *tf_export.ResourceDiscoveryContext, tfMeta *tf_export.TerraformResourceAssociation, parent *tf_export.OCIResource, resourceGraph *tf_export.TerraformResourceGraph) (resources []*tf_export.OCIResource, err error) {
+	if tfMeta.DatasourceQueryParams == nil {
+		tfMeta.DatasourceQueryParams = map[string]string{}
+	}
+	// Setting the "listing_type" field to the special value "COMMUNITY" will
+	// result in terraform fetching community listings (i.e. publications)
+	// when populating the "oci_marketplace_publications" data source
+	tfMeta.DatasourceQueryParams["listing_type"] = "'COMMUNITY'"
+	return tf_export.FindResourcesGeneric(ctx, tfMeta, parent, resourceGraph)
+}

internal/service/marketplace/marketplace_listing_package_agreement_resource.go renamed to internal/service/marketplace/marketplace_listing_package_agreement_data_source.go

@@ -13,33 +13,27 @@ import (
 	"github.com/oracle/terraform-provider-oci/internal/tfresource"
 )
 
-func MarketplaceListingPackageAgreementResource() *schema.Resource {
+func MarketplaceListingPackageAgreementDataSource() *schema.Resource {
 	return &schema.Resource{
-		Create: createMarketplaceListingPackageAgreement,
-		Read:   readMarketplaceListingPackageAgreement,
-		Delete: deleteMarketplaceListingPackageAgreement,
+		Read: readMarketplaceListingPackageAgreement,
 		Schema: map[string]*schema.Schema{
 			"agreement_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"listing_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"package_version": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			// Optional
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
-				ForceNew: true,
 			},
 			// Computed
 			"author": {
@@ -62,39 +56,24 @@ func MarketplaceListingPackageAgreementResource() *schema.Resource {
 	}
 }
 
-func createMarketplaceListingPackageAgreement(d *schema.ResourceData, m interface{}) error {
-	sync := &MarketplaceListingPackageAgreementResourceCrud{}
-	sync.D = d
-	sync.Client = m.(*client.OracleClients).MarketplaceClient()
-	return tfresource.CreateResource(d, sync)
-}
-
 func readMarketplaceListingPackageAgreement(d *schema.ResourceData, m interface{}) error {
-	sync := &MarketplaceListingPackageAgreementResourceCrud{}
+	sync := &MarketplaceListingPackageAgreementDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).MarketplaceClient()
 	return tfresource.ReadResource(sync)
 }
 
-func deleteMarketplaceListingPackageAgreement(d *schema.ResourceData, m interface{}) error {
-	sync := &MarketplaceListingPackageAgreementResourceCrud{}
-	sync.D = d
-	sync.Client = m.(*client.OracleClients).MarketplaceClient()
-	return tfresource.DeleteResource(d, sync)
-}
-
-type MarketplaceListingPackageAgreementResourceCrud struct {
-	tfresource.BaseCrud
-	Client                 *oci_marketplace.MarketplaceClient
-	Res                    *oci_marketplace.GetAgreementResponse
-	DisableNotFoundRetries bool
+type MarketplaceListingPackageAgreementDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_marketplace.MarketplaceClient
+	Res    *oci_marketplace.GetAgreementResponse
 }
 
-func (s *MarketplaceListingPackageAgreementResourceCrud) ID() string {
-	return *s.Res.Id
+func (s *MarketplaceListingPackageAgreementDataSourceCrud) VoidState() {
+	s.D.SetId("")
 }
 
-func (s *MarketplaceListingPackageAgreementResourceCrud) Create() error {
+func (s *MarketplaceListingPackageAgreementDataSourceCrud) Get() error {
 	request := oci_marketplace.GetAgreementRequest{}
 
 	if agreementId, ok := s.D.GetOkExists("agreement_id"); ok {
@@ -128,15 +107,7 @@ func (s *MarketplaceListingPackageAgreementResourceCrud) Create() error {
 	return nil
 }
 
-func (s *MarketplaceListingPackageAgreementResourceCrud) Get() error {
-	return nil
-}
-
-func (s *MarketplaceListingPackageAgreementResourceCrud) Delete() error {
-	return nil
-}
-
-func (s *MarketplaceListingPackageAgreementResourceCrud) SetData() error {
+func (s *MarketplaceListingPackageAgreementDataSourceCrud) SetData() error {
 	if s.Res == nil {
 		return nil
 	}

internal/service/marketplace/register_datasource.go

@@ -12,6 +12,7 @@ func RegisterDatasource() {
 	tfresource.RegisterDatasource("oci_marketplace_listing", MarketplaceListingDataSource())
 	tfresource.RegisterDatasource("oci_marketplace_listing_package", MarketplaceListingPackageDataSource())
 	tfresource.RegisterDatasource("oci_marketplace_listing_package_agreements", MarketplaceListingPackageAgreementsDataSource())
+	tfresource.RegisterDatasource("oci_marketplace_listing_package_agreement", MarketplaceListingPackageAgreementDataSource())
 	tfresource.RegisterDatasource("oci_marketplace_listing_packages", MarketplaceListingPackagesDataSource())
 	tfresource.RegisterDatasource("oci_marketplace_listing_taxes", MarketplaceListingTaxesDataSource())
 	tfresource.RegisterDatasource("oci_marketplace_listings", MarketplaceListingsDataSource())

internal/service/marketplace/register_resource.go

@@ -8,5 +8,4 @@ import "github.com/oracle/terraform-provider-oci/internal/tfresource"
 func RegisterResource() {
 	tfresource.RegisterResource("oci_marketplace_accepted_agreement", MarketplaceAcceptedAgreementResource())
 	tfresource.RegisterResource("oci_marketplace_publication", MarketplacePublicationResource())
-	tfresource.RegisterResource("oci_marketplace_listing_package_agreement", MarketplaceListingPackageAgreementResource())
 }

website/docs/d/marketplace_listing.html.markdown

@@ -43,7 +43,7 @@ data "oci_marketplace_listing" "test_listing" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Optional) The unique identifier for the compartment.
+* `compartment_id` - (Optional) The unique identifier for the compartment. It is mandatory when using in government realms.
 * `listing_id` - (Required) The unique identifier for the listing.
 
 

website/docs/r/marketplace_listing_package_agreement.html.markdown renamed to website/docs/d/marketplace_listing_package_agreement.html.markdown

@@ -8,16 +8,16 @@ description: |-
 ---
 
 # Data Source: oci_marketplace_listing_package_agreement_management
-This resource provides details about a specific Listing Package Agreement resource in Oracle Cloud Infrastructure Marketplace service.
+This data source provides details about a specific Listing Package Agreement resource in Oracle Cloud Infrastructure Marketplace service.
 
-This resource can be used to retrieve the time-based signature of terms of use agreement for a package that can be used to
+It can be used to retrieve the time-based signature of terms of use agreement for a package that can be used to
 accept the agreement.
 
 
 ## Example Usage
 
 ```hcl
-resource "oci_marketplace_listing_package_agreement" "test_listing_package_agreement" {
+data "oci_marketplace_listing_package_agreement" "test_listing_package_agreement" {
 	#Required
 	agreement_id = oci_marketplace_agreement.test_agreement.id
 	listing_id = oci_marketplace_listing.test_listing.id
@@ -53,4 +53,4 @@ The following attributes are exported:
 
 ## Import
 
-Import is not supported for this resource.
+Import is not supported for this resource.

website/docs/d/marketplace_listings.html.markdown

@@ -52,7 +52,7 @@ data "oci_marketplace_listings" "test_listings" {
 The following arguments are supported:
 
 * `category` - (Optional) Name of the product category or categories. If you specify multiple categories, then Marketplace returns any listing with one or more matching categories. 
-* `compartment_id` - (Optional) The unique identifier for the compartment.
+* `compartment_id` - (Optional) The unique identifier for the compartment.  It is mandatory when using in government realms.
 * `image_id` - (Optional) The image identifier of the listing.
 * `is_featured` - (Optional) Indicates whether to show only featured listings. If this is set to `false` or is omitted, then all listings will be returned. 
 * `listing_id` - (Optional) The unique identifier for the listing.