Support for Marketplace-Community Catalog

Author: varmax2511

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Support save report in cost analysis
 - Support for Capacity Reservations
 - Support for Renaming Analytics Service to HeatWave
+- Support for Marketplace-Community Catalog
+
 ## 4.18.0 (March 17, 2021)
 
 ### Added

examples/marketplace/publication/publication.tf

@@ -0,0 +1,145 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {
+
+}
+
+variable "publication_freeform_tags" {
+  default = { "Department" = "Finance" }
+}
+
+variable "publication_is_agreement_acknowledged" {
+  default = true
+}
+
+variable "publication_listing_type" {
+  default = "COMMUNITY"
+}
+
+variable "publication_long_description" {
+  default = "longDescription"
+}
+
+variable "publication_name" {
+  default = "name"
+}
+
+variable "publication_names" {
+  default = ["name"]
+}
+
+variable "publication_operating_systems" {
+  default = []
+}
+
+variable "publication_package_details_eula_eula_type" {
+  default = "TEXT"
+}
+
+variable "publication_package_details_eula_license_text" {
+  default = "licenseText"
+}
+
+variable "publication_package_details_operating_system_name" {
+  default = "name"
+}
+
+variable "publication_package_details_package_type" {
+  default = "IMAGE"
+}
+
+variable "publication_package_details_package_version" {
+  default = "packageVersion"
+}
+
+variable "publication_short_description" {
+  default = "shortDescription"
+}
+
+variable "publication_support_contacts_email" {
+  default = "email"
+}
+
+variable "publication_support_contacts_name" {
+  default = "name"
+}
+
+variable "publication_support_contacts_phone" {
+  default = "phone"
+}
+
+variable "publication_support_contacts_subject" {
+  default = "subject"
+}
+
+variable "image_id" {
+
+}
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "oci_marketplace_publication" "test_publication" {
+  #Required
+  compartment_id            = var.compartment_id
+  is_agreement_acknowledged = var.publication_is_agreement_acknowledged
+  listing_type              = var.publication_listing_type
+  name                      = var.publication_name
+  package_details {
+    #Required
+    eula {
+      #Required
+      eula_type = var.publication_package_details_eula_eula_type
+
+      #Optional
+      license_text = var.publication_package_details_eula_license_text
+    }
+    operating_system {
+
+      #Optional
+      name = var.publication_package_details_operating_system_name
+    }
+    package_type    = var.publication_package_details_package_type
+    package_version = var.publication_package_details_package_version
+
+    #Required
+    image_id = var.image_id
+  }
+  short_description = var.publication_short_description
+  support_contacts {
+
+    #Optional
+    email   = var.publication_support_contacts_email
+    name    = var.publication_support_contacts_name
+    phone   = var.publication_support_contacts_phone
+    subject = var.publication_support_contacts_subject
+  }
+
+  #Optional
+  freeform_tags    = var.publication_freeform_tags
+  long_description = var.publication_long_description
+}
+
+data "oci_marketplace_publications" "test_publications" {
+  #Required
+  compartment_id = var.compartment_id
+  listing_type   = var.publication_listing_type
+
+  #Optional
+  name              = var.publication_names
+  operating_systems = var.publication_operating_systems
+  publication_id    = oci_marketplace_publication.test_publication.id
+}
+

oci/core_image_data_source.go

@@ -104,6 +104,8 @@ func (s *CoreImageDataSourceCrud) SetData() error {
 		s.D.Set("launch_options", nil)
 	}
 
+	s.D.Set("listing_type", s.Res.ListingType)
+
 	if s.Res.OperatingSystem != nil {
 		s.D.Set("operating_system", *s.Res.OperatingSystem)
 	}

oci/core_image_resource.go

@@ -204,6 +204,10 @@ func CoreImageResource() *schema.Resource {
 					},
 				},
 			},
+			"listing_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"operating_system": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -475,6 +479,8 @@ func (s *CoreImageResourceCrud) SetData() error {
 		s.D.Set("launch_options", nil)
 	}
 
+	s.D.Set("listing_type", s.Res.ListingType)
+
 	if s.Res.OperatingSystem != nil {
 		s.D.Set("operating_system", *s.Res.OperatingSystem)
 	}

oci/core_images_data_source.go

@@ -203,6 +203,8 @@ func (s *CoreImagesDataSourceCrud) SetData() error {
 			image["launch_options"] = nil
 		}
 
+		image["listing_type"] = r.ListingType
+
 		if r.OperatingSystem != nil {
 			image["operating_system"] = *r.OperatingSystem
 		}

oci/export_definitions.go

@@ -32,6 +32,7 @@ import (
 	oci_load_balancer "github.com/oracle/oci-go-sdk/v36/loadbalancer"
 	oci_logging "github.com/oracle/oci-go-sdk/v36/logging"
 	oci_management_agent "github.com/oracle/oci-go-sdk/v36/managementagent"
+	oci_marketplace "github.com/oracle/oci-go-sdk/v36/marketplace"
 	oci_monitoring "github.com/oracle/oci-go-sdk/v36/monitoring"
 	oci_mysql "github.com/oracle/oci-go-sdk/v36/mysql"
 	oci_nosql "github.com/oracle/oci-go-sdk/v36/nosql"
@@ -1586,6 +1587,17 @@ var exportMarketplaceAcceptedAgreementHints = &TerraformResourceHints{
 	requireResourceRefresh: true,
 }
 
+var exportMarketplacePublicationHints = &TerraformResourceHints{
+	resourceClass:          "oci_marketplace_publication",
+	datasourceClass:        "oci_marketplace_publications",
+	datasourceItemsAttr:    "publications",
+	resourceAbbreviation:   "publication",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_marketplace.PublicationLifecycleStateActive),
+	},
+}
+
 var exportMeteringComputationQueryHints = &TerraformResourceHints{
 	resourceClass:          "oci_metering_computation_query",
 	datasourceClass:        "oci_metering_computation_queries",