Merge pull request #1075 from terraform-providers/release_merge_v3.77.0

Candidate for release_v3.77.0

Author: varmax2511

CHANGELOG.md

@@ -1,4 +1,14 @@
 ## 3.77.0 (Unreleased)
+
+### Added
+- Support resource discovery for `streaming` resources
+- Support resource discovery for `healthChecks` resources
+- Support resource discovery for `events` resources
+
+### Fixed
+- Fixed DNS outage causing problems for DNS records
+- Fixed string values to escape TF characters in resource discovery
+
 ## 3.76.0 (May 19, 2020)
 
 ### Added

oci/crud_helpers.go

@@ -636,6 +636,12 @@ func ResourceDeprecatedForAnother(deprecatedResourceName string, newResourceName
 	return fmt.Sprintf("The '%s' resource has been deprecated. Please use '%s' instead.", deprecatedResourceName, newResourceName)
 }
 
+func resourceNotFoundErrorMessage(resourceName string, reason string) error {
+	// Use this function to generate an error message for any resource that is not found.  The message is specially
+	// formatted so that it is detected by the handleMissingResourceError function correctly.  Do not change the message format.
+	return fmt.Errorf("%s not found. %s \n", resourceName, reason)
+}
+
 // GenerateDataSourceID generates an ID for the data source based on the current time stamp.
 func GenerateDataSourceID() string {
 	// Important, if you don't have an ID, make one up for your datasource

oci/dns_record_resource.go

@@ -368,7 +368,8 @@ func findItem(rc *[]oci_dns.Record, r *schema.ResourceData) (*oci_dns.Record, er
 		}
 	}
 
-	return nil, fmt.Errorf("target %s record could not be matched against data %s\nfrom set %+v", rType, rData, rc)
+	reason := fmt.Sprintf("Target %s record could not be matched against data %s\nfrom set %+v", rType, rData, rc)
+	return nil, resourceNotFoundErrorMessage("DNS record", reason)
 }
 
 // Match dns service transforms of rdata

oci/events_rule_test.go

@@ -32,7 +32,7 @@ var (
 	ruleDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
 		"display_name":   Representation{repType: Optional, create: `This rule sends a notification upon completion of DbaaS backup`, update: `displayName2`},
-		"state":          Representation{repType: Optional, create: `ACTIVE`},
+		"state":          Representation{repType: Optional, create: `INACTIVE`},
 		"filter":         RepresentationGroup{Required, ruleDataSourceFilterRepresentation}}
 	ruleDataSourceFilterRepresentation = map[string]interface{}{
 		"name":   Representation{repType: Required, create: `id`},
@@ -44,7 +44,7 @@ var (
 		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
 		"condition":      Representation{repType: Required, create: `{\"eventType\":\"com.oraclecloud.databaseservice.autonomous.database.backup.end\"}`, update: `{}`},
 		"display_name":   Representation{repType: Required, create: `This rule sends a notification upon completion of DbaaS backup`, update: `displayName2`},
-		"is_enabled":     Representation{repType: Required, create: `false`, update: `true`},
+		"is_enabled":     Representation{repType: Required, create: `true`, update: `false`},
 		"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")}`},
 		"description":    Representation{repType: Optional, create: `description`, update: `description2`},
 		"freeform_tags":  Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
@@ -137,7 +137,7 @@ func TestEventsRuleResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", "This rule sends a notification upon completion of DbaaS backup"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "is_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 
@@ -180,7 +180,7 @@ func TestEventsRuleResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", "This rule sends a notification upon completion of DbaaS backup"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "is_enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 
@@ -239,7 +239,7 @@ func TestEventsRuleResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "is_enabled", "false"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 
@@ -261,7 +261,7 @@ func TestEventsRuleResource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
-					resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
+					resource.TestCheckResourceAttr(datasourceName, "state", "INACTIVE"),
 
 					resource.TestCheckResourceAttr(datasourceName, "rules.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "rules.0.compartment_id", compartmentId),
@@ -271,7 +271,7 @@ func TestEventsRuleResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "rules.0.display_name", "displayName2"),
 					resource.TestCheckResourceAttr(datasourceName, "rules.0.freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "rules.0.id"),
-					resource.TestCheckResourceAttr(datasourceName, "rules.0.is_enabled", "true"),
+					resource.TestCheckResourceAttr(datasourceName, "rules.0.is_enabled", "false"),
 					resource.TestCheckResourceAttrSet(datasourceName, "rules.0.state"),
 					resource.TestCheckResourceAttrSet(datasourceName, "rules.0.time_created"),
 				),
@@ -293,7 +293,7 @@ func TestEventsRuleResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
-					resource.TestCheckResourceAttr(singularDatasourceName, "is_enabled", "true"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "is_enabled", "false"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
 				),

oci/export_compartment.go

@@ -648,7 +648,7 @@ func getHCLStringFromMap(builder *strings.Builder, sourceAttributes map[string]i
 					v = varOverride
 					builder.WriteString(fmt.Sprintf("%s = %v\n", tfAttribute, v))
 				} else {
-					builder.WriteString(fmt.Sprintf("%s = %q\n", tfAttribute, v))
+					builder.WriteString(fmt.Sprintf("%s = %q\n", tfAttribute, escapeTFStrings(v)))
 				}
 				continue
 			case int, bool, float64:
@@ -680,7 +680,7 @@ func getHCLStringFromMap(builder *strings.Builder, sourceAttributes map[string]i
 									trueListVal = varOverride
 									builder.WriteString(fmt.Sprintf("%v,\n", trueListVal))
 								} else {
-									builder.WriteString(fmt.Sprintf("%q,\n", trueListVal))
+									builder.WriteString(fmt.Sprintf("%q,\n", escapeTFStrings(trueListVal)))
 								}
 							case int, bool, float64:
 								builder.WriteString(fmt.Sprintf("\"%v\",\n", trueListVal))
@@ -719,7 +719,7 @@ func getHCLStringFromMap(builder *strings.Builder, sourceAttributes map[string]i
 								mapVal = varOverride
 								builder.WriteString(fmt.Sprintf("\"%s\" = %v\n", mapKey, mapVal))
 							} else {
-								builder.WriteString(fmt.Sprintf("\"%s\" = %q\n", mapKey, mapVal))
+								builder.WriteString(fmt.Sprintf("\"%s\" = %q\n", mapKey, escapeTFStrings(mapVal)))
 							}
 						case int, bool, float64:
 							builder.WriteString(fmt.Sprintf("\"%s\" = \"%v\"\n", mapKey, mapVal))
@@ -998,6 +998,13 @@ func convertResourceDataToMap(schemaMap map[string]*schema.Schema, d *schema.Res
 	return result
 }
 
+// This function should only be used to escape TF-characters in strings
+func escapeTFStrings(val string) string {
+	val = strings.ReplaceAll(val, "%{", "%%{")
+	val = strings.ReplaceAll(val, "${", "$${")
+	return val
+}
+
 func generateTerraformNameFromResource(resourceAttributes map[string]interface{}, resourceSchema map[string]*schema.Schema) (string, error) {
 	possibleNameAttributes := []string{
 		"display_name",

oci/export_definitions.go

@@ -5,10 +5,12 @@ import (
 	oci_containerengine "github.com/oracle/oci-go-sdk/containerengine"
 	oci_core "github.com/oracle/oci-go-sdk/core"
 	oci_database "github.com/oracle/oci-go-sdk/database"
+	oci_events "github.com/oracle/oci-go-sdk/events"
 	oci_functions "github.com/oracle/oci-go-sdk/functions"
 	oci_identity "github.com/oracle/oci-go-sdk/identity"
 	oci_limits "github.com/oracle/oci-go-sdk/limits"
 	oci_load_balancer "github.com/oracle/oci-go-sdk/loadbalancer"
+	oci_streaming "github.com/oracle/oci-go-sdk/streaming"
 )
 
 // Hints for discovering and exporting this resource to configuration and state files
@@ -380,6 +382,17 @@ var exportDatabaseDbSystemHints = &TerraformResourceHints{
 	},
 }
 
+var exportEventsRuleHints = &TerraformResourceHints{
+	resourceClass:          "oci_events_rule",
+	datasourceClass:        "oci_events_rules",
+	datasourceItemsAttr:    "rules",
+	resourceAbbreviation:   "rule",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_events.RuleLifecycleStateActive),
+	},
+}
+
 var exportFunctionsApplicationHints = &TerraformResourceHints{
 	resourceClass:          "oci_functions_application",
 	datasourceClass:        "oci_functions_applications",
@@ -402,6 +415,22 @@ var exportFunctionsFunctionHints = &TerraformResourceHints{
 	},
 }
 
+var exportHealthChecksHttpMonitorHints = &TerraformResourceHints{
+	resourceClass:          "oci_health_checks_http_monitor",
+	datasourceClass:        "oci_health_checks_http_monitors",
+	datasourceItemsAttr:    "http_monitors",
+	resourceAbbreviation:   "http_monitor",
+	requireResourceRefresh: true,
+}
+
+var exportHealthChecksPingMonitorHints = &TerraformResourceHints{
+	resourceClass:          "oci_health_checks_ping_monitor",
+	datasourceClass:        "oci_health_checks_ping_monitors",
+	datasourceItemsAttr:    "ping_monitors",
+	resourceAbbreviation:   "ping_monitor",
+	requireResourceRefresh: true,
+}
+
 var exportIdentityApiKeyHints = &TerraformResourceHints{
 	resourceClass:        "oci_identity_api_key",
 	datasourceClass:      "oci_identity_api_keys",
@@ -656,3 +685,35 @@ var exportObjectStorageNamespaceHints = &TerraformResourceHints{
 	datasourceClass:      "oci_objectstorage_namespace",
 	resourceAbbreviation: "namespace",
 }
+
+var exportStreamingConnectHarnessHints = &TerraformResourceHints{
+	resourceClass:        "oci_streaming_connect_harness",
+	datasourceClass:      "oci_streaming_connect_harnesses",
+	datasourceItemsAttr:  "connect_harness",
+	resourceAbbreviation: "connect_harness",
+	discoverableLifecycleStates: []string{
+		string(oci_streaming.ConnectHarnessLifecycleStateActive),
+	},
+}
+
+var exportStreamingStreamPoolHints = &TerraformResourceHints{
+	resourceClass:          "oci_streaming_stream_pool",
+	datasourceClass:        "oci_streaming_stream_pools",
+	datasourceItemsAttr:    "stream_pools",
+	resourceAbbreviation:   "stream_pool",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_streaming.StreamPoolLifecycleStateActive),
+	},
+}
+
+var exportStreamingStreamHints = &TerraformResourceHints{
+	resourceClass:          "oci_streaming_stream",
+	datasourceClass:        "oci_streaming_streams",
+	datasourceItemsAttr:    "streams",
+	resourceAbbreviation:   "stream",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_streaming.StreamLifecycleStateActive),
+	},
+}

oci/export_graphs.go

@@ -28,9 +28,12 @@ var compartmentResourceGraphs = map[string]TerraformResourceGraph{
 	"containerengine":     containerengineResourceGraph,
 	"core":                coreResourceGraph,
 	"database":            databaseResourceGraph,
+	"events":              eventsResourceGraph,
 	"functions":           functionsResourceGraph,
+	"health_checks":       healthChecksResourceGraph,
 	"load_balancer":       loadBalancerResourceGraph,
 	"object_storage":      objectStorageResourceGraph,
+	"streaming":           streamingResourceGraph,
 	"tagging":             taggingResourceGraph,
 }
 
@@ -170,6 +173,12 @@ var databaseResourceGraph = TerraformResourceGraph{
 	},
 }
 
+var eventsResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportEventsRuleHints},
+	},
+}
+
 var functionsResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportFunctionsApplicationHints},
@@ -184,6 +193,13 @@ var functionsResourceGraph = TerraformResourceGraph{
 	},
 }
 
+var healthChecksResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportHealthChecksHttpMonitorHints},
+		{TerraformResourceHints: exportHealthChecksPingMonitorHints},
+	},
+}
+
 var identityResourceGraph = TerraformResourceGraph{
 	"oci_identity_tenancy": {
 		{TerraformResourceHints: exportIdentityAuthenticationPolicyHints},
@@ -329,6 +345,14 @@ var objectStorageResourceGraph = TerraformResourceGraph{
 	},
 }
 
+var streamingResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportStreamingConnectHarnessHints},
+		{TerraformResourceHints: exportStreamingStreamPoolHints},
+		{TerraformResourceHints: exportStreamingStreamHints},
+	},
+}
+
 var taggingResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportIdentityTagDefaultHints},

oci/export_resource_helpers.go

@@ -104,6 +104,8 @@ func init() {
 
 	exportObjectStorageBucketHints.getIdFn = getObjectStorageBucketId
 
+	exportStreamingStreamHints.processDiscoveredResourcesFn = processStreamingStream
+
 	exportContainerengineNodePoolHints.processDiscoveredResourcesFn = processContainerengineNodePool
 }
 
@@ -122,6 +124,18 @@ func processContainerengineNodePool(clients *OracleClients, resources []*OCIReso
 	return resources, nil
 }
 
+func processStreamingStream(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
+	for _, streamingStream := range resources {
+		// compartment_id conflict with stream_pool_id
+		if _, exists := streamingStream.sourceAttributes["compartment_id"]; exists {
+			if _, ok := streamingStream.sourceAttributes["stream_pool_id"]; ok {
+				delete(streamingStream.sourceAttributes, "stream_pool_id")
+			}
+		}
+	}
+	return resources, nil
+}
+
 // Custom functions to alter behavior of resource discovery and resource HCL representation
 
 func processInstances(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {

oci/marketplace_listing_package_test.go

@@ -80,7 +80,6 @@ func TestMarketplaceListingPackageResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "pricing.#", "1"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "pricing.0.rate"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "pricing.0.type"),
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "pricing.0.currency"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "resource_id"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "version"),

oci/marketplace_listing_test.go

@@ -93,16 +93,13 @@ func TestMarketplaceListingResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "package_type"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "publisher.#"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "regions.#"),
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "release_notes"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "screenshots.#"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "short_description"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "support_contacts.#"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "support_links.#"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "system_requirements"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "tagline"),
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_released"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "usage_information"),
-					resource.TestCheckResourceAttrSet(singularDatasourceName, "version"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "videos.#"),
 				),
 			},