Added - Support for Marketplace Metadata for Attribution and Attestation

Author: Lei Wang

examples/marketplace/main.tf

@@ -20,6 +20,9 @@ variable "compartment_ocid" {
 variable "region" {
 }
 
+variable "instance_ocid" {
+}
+
 provider "oci" {
   region           = var.region
   tenancy_ocid     = var.tenancy_ocid
@@ -47,6 +50,12 @@ resource "oci_marketplace_listing_package_agreement" "test_listing_package_agree
   compartment_id = var.compartment_ocid
 }
 
+resource "oci_marketplace_marketplace_external_attested_metadata" "test_marketplace_external_attested_metadata" {
+  #Required
+  compartment_id = var.compartment_ocid
+  instance_id = var.instance_ocid
+}
+
 data "oci_marketplace_listing_package_agreements" "test_listing_package_agreements" {
   #Required
   listing_id      = data.oci_marketplace_listing.test_listing.id
@@ -101,3 +110,6 @@ data "oci_marketplace_listing_taxes" "test_listing_taxes" {
   #Optional
   compartment_id = var.compartment_ocid
 }
+
+data "oci_marketplace_marketplace_metadata_public_keys" "test_marketplace_metadata_public_keys" {
+}

internal/integrationtest/marketplace_marketplace_external_attested_metadata_test.go

@@ -0,0 +1,75 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"strconv"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+
+	"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 (
+	MarketplaceMarketplaceExternalAttestedMetadataRepresentation = map[string]interface{}{
+		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"instance_id":    acctest.Representation{RepType: acctest.Required, Create: `${var.instance_id}`},
+	}
+
+	// 	MarketplaceMarketplaceExternalAttestedMetadataResourceDependencies = utils.OciImageIdsVariable +
+	// 		acctest.GenerateResourceFromRepresentationMap("oci_core_instance", "test_instance", acctest.Required, acctest.Create, CoreInstanceRepresentation) +
+	// 		AvailabilityDomainConfig + acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
+	// 		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation)
+)
+
+// issue-routing-tag: marketplace/default
+func TestMarketplaceMarketplaceExternalAttestedMetadataResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestMarketplaceMarketplaceExternalAttestedMetadataResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	instanceId := utils.GetEnvSettingWithBlankDefault("instance_ocid")
+	instanceIdVariableStr := fmt.Sprintf("variable \"instance_id\" { default = \"%s\" }\n", instanceId)
+
+	resourceName := "oci_marketplace_marketplace_external_attested_metadata.test_marketplace_external_attested_metadata"
+
+	var resId string
+	// Save TF content to Create resource with only required properties. This has to be exactly the same as the config part in the create step in the test.
+	acctest.SaveConfigContent(config+compartmentIdVariableStr+instanceIdVariableStr+
+		acctest.GenerateResourceFromRepresentationMap("oci_marketplace_marketplace_external_attested_metadata", "test_marketplace_external_attested_metadata", acctest.Required, acctest.Create, MarketplaceMarketplaceExternalAttestedMetadataRepresentation), "marketplace", "marketplaceExternalAttestedMetadata", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify Create
+		{
+			Config: config + compartmentIdVariableStr + instanceIdVariableStr +
+				acctest.GenerateResourceFromRepresentationMap("oci_marketplace_marketplace_external_attested_metadata", "test_marketplace_external_attested_metadata", acctest.Required, acctest.Create, MarketplaceMarketplaceExternalAttestedMetadataRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "instance_id", instanceId),
+
+				func(s *terraform.State) (err error) {
+					resId, err = acctest.FromInstanceState(s, resourceName, "id")
+					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
+						if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+							return errExport
+						}
+					}
+					return err
+				},
+			),
+		},
+	})
+}

internal/integrationtest/marketplace_marketplace_metadata_public_key_test.go

@@ -0,0 +1,60 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"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/utils"
+)
+
+var (
+	MarketplaceMarketplaceMetadataPublicKeyDataSourceRepresentation = map[string]interface{}{
+		"compartment_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
+	}
+
+	MarketplaceMarketplaceMetadataPublicKeyResourceConfig = ""
+)
+
+// issue-routing-tag: marketplace/default
+func TestMarketplaceMarketplaceMetadataPublicKeyResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestMarketplaceMarketplaceMetadataPublicKeyResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	datasourceName := "data.oci_marketplace_marketplace_metadata_public_keys.test_marketplace_metadata_public_keys"
+
+	acctest.SaveConfigContent("", "", "", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_marketplace_marketplace_metadata_public_keys", "test_marketplace_metadata_public_keys", acctest.Required, acctest.Create, MarketplaceMarketplaceMetadataPublicKeyDataSourceRepresentation) +
+				compartmentIdVariableStr + MarketplaceMarketplaceMetadataPublicKeyResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.#"),
+				resource.TestCheckResourceAttr(datasourceName, "marketplace_metadata_public_keys.0.certificate_chain.#", "1"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.certificate_thumbprint"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.exponent"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.key_algorithm"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.key_id"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.key_type"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.key_use"),
+				resource.TestCheckResourceAttrSet(datasourceName, "marketplace_metadata_public_keys.0.modulus"),
+			),
+		},
+	})
+}

internal/service/marketplace/marketplace_export.go

@@ -37,6 +37,11 @@ var exportMarketplacePublicationHints = &tf_export.TerraformResourceHints{
 	},
 }
 
+var exportMarketplaceMarketplaceExternalAttestedMetadataHints = &tf_export.TerraformResourceHints{
+	ResourceClass:        "oci_marketplace_marketplace_external_attested_metadata",
+	ResourceAbbreviation: "marketplace_external_attested_metadata",
+}
+
 var marketplaceResourceGraph = tf_export.TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportMarketplaceAcceptedAgreementHints},

internal/service/marketplace/marketplace_marketplace_external_attested_metadata_resource.go

@@ -0,0 +1,108 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package marketplace
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	oci_marketplace "github.com/oracle/oci-go-sdk/v65/marketplace"
+
+	"github.com/oracle/terraform-provider-oci/internal/client"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+)
+
+func MarketplaceMarketplaceExternalAttestedMetadataResource() *schema.Resource {
+	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Timeouts: tfresource.DefaultTimeout,
+		Create:   createMarketplaceMarketplaceExternalAttestedMetadata,
+		Read:     readMarketplaceMarketplaceExternalAttestedMetadata,
+		Delete:   deleteMarketplaceMarketplaceExternalAttestedMetadata,
+		Schema: map[string]*schema.Schema{
+			// Required
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"instance_id": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			// Optional
+
+			// Computed
+			"serialized_jwt": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func createMarketplaceMarketplaceExternalAttestedMetadata(d *schema.ResourceData, m interface{}) error {
+	sync := &MarketplaceMarketplaceExternalAttestedMetadataResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).MarketplaceClient()
+
+	return tfresource.CreateResource(d, sync)
+}
+
+func readMarketplaceMarketplaceExternalAttestedMetadata(d *schema.ResourceData, m interface{}) error {
+	return nil
+}
+
+func deleteMarketplaceMarketplaceExternalAttestedMetadata(d *schema.ResourceData, m interface{}) error {
+	return nil
+}
+
+type MarketplaceMarketplaceExternalAttestedMetadataResourceCrud struct {
+	tfresource.BaseCrud
+	Client                 *oci_marketplace.MarketplaceClient
+	Res                    *oci_marketplace.MarketplaceExternalAttestedMetadata
+	DisableNotFoundRetries bool
+}
+
+func (s *MarketplaceMarketplaceExternalAttestedMetadataResourceCrud) ID() string {
+	return fmt.Sprintf("%s/%s", s.D.Get("compartment_id").(string), s.D.Get("instance_id").(string))
+}
+
+func (s *MarketplaceMarketplaceExternalAttestedMetadataResourceCrud) Create() error {
+	request := oci_marketplace.CreateMarketplaceExternalAttestedMetadataRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if instanceId, ok := s.D.GetOkExists("instance_id"); ok {
+		tmp := instanceId.(string)
+		request.InstanceId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "marketplace")
+
+	response, err := s.Client.CreateMarketplaceExternalAttestedMetadata(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response.MarketplaceExternalAttestedMetadata
+	return nil
+}
+
+func (s *MarketplaceMarketplaceExternalAttestedMetadataResourceCrud) SetData() error {
+	if s.Res.SerializedJwt != nil {
+		s.D.Set("serialized_jwt", *s.Res.SerializedJwt)
+	}
+
+	return nil
+}