Support resource discovery for ons resources_subscriptions

Author: zexinwanoci

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Support for HTTP Header in load balancer rule set
 - Support for new optional parameters in `oci_core_instance_configuration`
 - Support for DBaaS One-off patching
+- Support resource discovery and import for `ons_subscriptions` resource
 
 ## 3.82.0 (June 24, 2020)
 

oci/export_compartment.go

@@ -639,6 +639,11 @@ func getHCLStringFromMap(builder *strings.Builder, sourceAttributes map[string]i
 				continue
 			case []interface{}:
 				switch tfSchema.Type {
+				case schema.TypeString:
+					if tfAttribute == "delivery_policy" {
+						builder.WriteString(fmt.Sprintf("%s = %q\n", tfAttribute, parseDeliveryPolicy(v[0].(interface{}))))
+						continue
+					}
 				case schema.TypeList, schema.TypeSet:
 					switch elem := tfSchema.Elem.(type) {
 					case *schema.Resource:

oci/export_definitions.go

@@ -1303,6 +1303,17 @@ var exportOnsNotificationTopicHints = &TerraformResourceHints{
 	},
 }
 
+var exportOnsSubscriptionHints = &TerraformResourceHints{
+	resourceClass:        "oci_ons_subscription",
+	datasourceClass:      "oci_ons_subscriptions",
+	datasourceItemsAttr:  "subscriptions",
+	resourceAbbreviation: "subscription",
+	discoverableLifecycleStates: []string{
+		string(oci_ons.SubscriptionLifecycleStatePending),
+		string(oci_ons.SubscriptionLifecycleStateActive),
+	},
+}
+
 var exportOsmanagementManagedInstanceGroupHints = &TerraformResourceHints{
 	resourceClass:        "oci_osmanagement_managed_instance_group",
 	datasourceClass:      "oci_osmanagement_managed_instance_groups",

oci/export_graphs.go

@@ -674,6 +674,7 @@ var odaResourceGraph = TerraformResourceGraph{
 var onsResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportOnsNotificationTopicHints},
+		{TerraformResourceHints: exportOnsSubscriptionHints},
 	},
 }
 

oci/ons_subscription_resource.go

@@ -20,6 +20,9 @@ func init() {
 
 func OnsSubscriptionResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: DefaultTimeout,
 		Create:   createOnsSubscription,
 		Read:     readOnsSubscription,

oci/ons_subscription_test.go

@@ -46,7 +46,7 @@ var (
 		"topic_id":        Representation{repType: Required, create: `${oci_ons_notification_topic.test_notification_topic.id}`},
 		"defined_tags":    Representation{repType: 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")}`},
 		"freeform_tags":   Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
-		"delivery_policy": Representation{repType: Optional, update: `{\"backoffRetryPolicy\":{\"initialDelayInFailureRetry\":60000,\"maxRetryDuration\":7000000,\"policyType\":\"EXPONENTIAL\"}, \"maxReceiveRatePerSecond\" : 0}`},
+		"delivery_policy": Representation{repType: Optional, update: `{\"backoffRetryPolicy\":{\"maxRetryDuration\":7000000,\"policyType\":\"EXPONENTIAL\"}}`},
 	}
 
 	SubscriptionResourceDependencies = DefinedTagsDependencies +
@@ -116,11 +116,6 @@ func TestOnsSubscriptionResource_basic(t *testing.T) {
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
-						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
-							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
-								return errExport
-							}
-						}
 						return err
 					},
 				),
@@ -169,6 +164,11 @@ func TestOnsSubscriptionResource_basic(t *testing.T) {
 
 					func(s *terraform.State) (err error) {
 						resId2, err = fromInstanceState(s, resourceName, "id")
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&resId2, &compartmentId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
 						if resId != resId2 {
 							return fmt.Errorf("Resource recreated when it was supposed to be updated.")
 						}
@@ -219,6 +219,18 @@ func TestOnsSubscriptionResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "state", "ACTIVE"),
 				),
 			},
+			// remove singular datasource from previous step so that it doesn't conflict with import tests
+			{
+				Config: config + compartmentIdVariableStr + SubscriptionResourceConfig,
+			},
+			// verify resource import
+			{
+				Config:                  config,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{},
+				ResourceName:            resourceName,
+			},
 		},
 	})
 }

oci/ons_subscriptions_data_source.go

@@ -5,6 +5,7 @@ package oci
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
@@ -156,6 +157,13 @@ func (s *OnsSubscriptionsDataSourceCrud) SetData() error {
 	return nil
 }
 
+func parseDeliveryPolicy(policy interface{}) string {
+	backoffRetryPolicy := policy.(map[string]interface{})["backoff_retry_policy"].([]interface{})
+	maxRetryDuration := backoffRetryPolicy[0].(map[string]interface{})["max_retry_duration"]
+	policyType := backoffRetryPolicy[0].(map[string]interface{})["policy_type"]
+	return fmt.Sprintf("{\"backoffRetryPolicy\":{\"maxRetryDuration\":%v,\"policyType\":\"%v\"}}", maxRetryDuration, policyType)
+}
+
 func modifySubscriptionSchema(resourceSchema *schema.Resource) *schema.Resource {
 	resourceSchema.Schema["delivery_policy"] = &schema.Schema{
 		Type:     schema.TypeList,

website/docs/guides/resource_discovery.html.markdown

@@ -434,6 +434,7 @@ oda
 ons
 
 * oci\_ons\_notification\_topic
+* oci\_ons\_subscription
 
 osmanagement
 

website/docs/r/ons_subscription.html.markdown

@@ -78,5 +78,9 @@ The following attributes are exported:
 
 ## Import
 
-Import is not supported for this resource.
+Subscriptions can be imported using the `id`, e.g.
+
+```
+$ terraform import oci_ons_subscription.test_subscription "id"
+```