Bug fix - Update marketplace documentation and make a resource discoverable

Author: Terraform Team Automation

internal/integrationtest/marketplace_accepted_agreement_test.go

@@ -152,6 +152,7 @@ func TestMarketplaceAcceptedAgreementResource_basic(t *testing.T) {
 				},
 			),
 		},
+
 		// verify datasource
 		{
 			Config: config +

internal/integrationtest/marketplace_publication_test.go

@@ -137,6 +137,7 @@ func TestMarketplacePublicationResource_basic(t *testing.T) {
 		{
 			Config: config + compartmentIdVariableStr + MarketplacePublicationResourceDependencies,
 		},
+
 		// verify Create with optionals
 		{
 			Config: config + compartmentIdVariableStr + MarketplacePublicationResourceDependencies +

internal/service/marketplace/marketplace_export.go

@@ -1,12 +1,16 @@
 package marketplace
 
 import (
-	oci_marketplace "github.com/oracle/oci-go-sdk/v65/marketplace"
+	"context"
+	"fmt"
 
+	oci_marketplace "github.com/oracle/oci-go-sdk/v65/marketplace"
 	tf_export "github.com/oracle/terraform-provider-oci/internal/commonexport"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
 )
 
 func init() {
+	exportMarketplacePublicationHints.FindResourcesOverrideFn = findPublications
 	tf_export.RegisterCompartmentGraphs("marketplace", marketplaceResourceGraph)
 }
 
@@ -28,12 +32,72 @@ 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) {
+	results := []*tf_export.OCIResource{}
+	request := oci_marketplace.ListPublicationsRequest{}
+	request.ListingType = oci_marketplace.ListPublicationsListingTypeCommunity
+	request.CompartmentId = &parent.CompartmentId
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(true, "marketplace")
+
+	response, err := ctx.Clients.MarketplaceClient().ListPublications(context.Background(), request)
+	if err != nil {
+		return nil, err
+	}
+
+	request.Page = response.OpcNextPage
+
+	for request.Page != nil {
+		listResponse, err := ctx.Clients.MarketplaceClient().ListPublications(context.Background(), request)
+		if err != nil {
+			return nil, err
+		}
+		response.Items = append(response.Items, listResponse.Items...)
+		request.Page = listResponse.OpcNextPage
+	}
+
+	for _, publication := range response.Items {
+		publicationResource := tf_export.ResourcesMap[tfMeta.ResourceClass]
+
+		d := publicationResource.TestResourceData()
+		d.SetId(*publication.Id)
+
+		if err := publicationResource.Read(d, ctx.Clients); err != nil {
+			rdError := &tf_export.ResourceDiscoveryError{ResourceType: tfMeta.ResourceClass, ParentResource: parent.TerraformName, Error: err, ResourceGraph: resourceGraph}
+			ctx.AddErrorToList(rdError)
+			continue
+		}
+
+		resource := &tf_export.OCIResource{
+			CompartmentId:    parent.CompartmentId,
+			SourceAttributes: tf_export.ConvertResourceDataToMap(publicationResource.Schema, d),
+			RawResource:      publication,
+			TerraformResource: tf_export.TerraformResource{
+				Id:             d.Id(),
+				TerraformClass: tfMeta.ResourceClass,
+			},
+			GetHclStringFn: tf_export.GetHclStringFromGenericMap,
+			Parent:         parent,
+		}
+
+		if resource.TerraformName, err = tf_export.GenerateTerraformNameFromResource(resource.SourceAttributes, publicationResource.Schema); err != nil {
+			resource.TerraformName = fmt.Sprintf("%s_%s", parent.Parent.TerraformName, *publication.Name)
+			resource.TerraformName = tf_export.CheckDuplicateResourceName(resource.TerraformName)
+		}
+
+		results = append(results, resource)
+	}
+
+	return results, nil
+}

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 used in non-commercial realms.
 * `listing_id` - (Required) The unique identifier for the listing.
 
 

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 used in non-commercial 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.