Support for MySQL resource discovery added

Author: rashik-bhasin

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Support resource discovery and import for `ons_subscriptions` resource
 - Support resource discovery for `oci_objectstorage_replication_policy` resource
 - Support for specifying the retry timeout duration for API errors in resource discovery using argument `retry_timeout` in the export command. The default retry duration is 15s.
+- Support for `MySQL` resource discovery
 
 ## 3.82.0 (June 24, 2020)
 

oci/export_definitions.go

@@ -27,6 +27,7 @@ import (
 	oci_limits "github.com/oracle/oci-go-sdk/limits"
 	oci_load_balancer "github.com/oracle/oci-go-sdk/loadbalancer"
 	oci_monitoring "github.com/oracle/oci-go-sdk/monitoring"
+	oci_mysql "github.com/oracle/oci-go-sdk/mysql"
 	oci_nosql "github.com/oracle/oci-go-sdk/nosql"
 	oci_oce "github.com/oracle/oci-go-sdk/oce"
 	oci_oda "github.com/oracle/oci-go-sdk/oda"
@@ -1427,3 +1428,24 @@ var exportDataSafeDataSafePrivateEndpointHints = &TerraformResourceHints{
 		string(oci_data_safe.ListDataSafePrivateEndpointsLifecycleStateActive),
 	},
 }
+
+var exportMysqlMysqlBackupHints = &TerraformResourceHints{
+	resourceClass:        "oci_mysql_mysql_backup",
+	datasourceClass:      "oci_mysql_mysql_backups",
+	datasourceItemsAttr:  "backups",
+	resourceAbbreviation: "mysql_backup",
+	discoverableLifecycleStates: []string{
+		string(oci_mysql.BackupLifecycleStateActive),
+	},
+}
+
+var exportMysqlMysqlDbSystemHints = &TerraformResourceHints{
+	resourceClass:          "oci_mysql_mysql_db_system",
+	datasourceClass:        "oci_mysql_mysql_db_systems",
+	datasourceItemsAttr:    "db_systems",
+	resourceAbbreviation:   "mysql_db_system",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_mysql.DbSystemLifecycleStateActive),
+	},
+}

oci/export_graphs.go

@@ -70,6 +70,7 @@ var compartmentResourceGraphs = map[string]TerraformResourceGraph{
 	"load_balancer":       loadBalancerResourceGraph,
 	"marketplace":         marketplaceResourceGraph,
 	"monitoring":          monitoringResourceGraph,
+	"mysql":               mysqlResourceGraph,
 	"nosql":               nosqlResourceGraph,
 	"object_storage":      objectStorageResourceGraph,
 	"oce":                 oceResourceGraph,
@@ -608,6 +609,13 @@ var monitoringResourceGraph = TerraformResourceGraph{
 	},
 }
 
+var mysqlResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportMysqlMysqlBackupHints},
+		{TerraformResourceHints: exportMysqlMysqlDbSystemHints},
+	},
+}
+
 var nosqlResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportNosqlTableHints},

oci/export_resource_helpers.go

@@ -396,6 +396,10 @@ func init() {
 	exportDnsRrsetHints.getIdFn = getDnsRrsetId
 	exportDnsRrsetHints.findResourcesOverrideFn = findDnsRrset
 	exportDnsRrsetHints.processDiscoveredResourcesFn = processDnsRrset
+
+	exportMysqlMysqlBackupHints.requireResourceRefresh = true
+	exportMysqlMysqlBackupHints.processDiscoveredResourcesFn = filterMysqlBackups
+	exportMysqlMysqlDbSystemHints.processDiscoveredResourcesFn = processMysqlDbSystem
 }
 
 func processDnsRrset(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
@@ -757,6 +761,40 @@ func filterSecondaryVnicAttachments(clients *OracleClients, resources []*OCIReso
 	return results, nil
 }
 
+func filterMysqlBackups(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
+	results := []*OCIResource{}
+
+	// Filter out Mysql Backups that are automatically created. We cannot operate on "Automatic" backups.
+	for _, backup := range resources {
+		sourceDetails, exists := backup.sourceAttributes["creation_type"]
+
+		if exists && sourceDetails.(string) == "AUTOMATIC" {
+			continue
+		}
+
+		results = append(results, backup)
+	}
+
+	return results, nil
+}
+
+// TODO: remove this when service fixes source
+func processMysqlDbSystem(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
+	for _, dbSystem := range resources {
+		if source, exists := dbSystem.sourceAttributes["source"]; exists {
+			if sourceList := source.([]interface{}); len(sourceList) > 0 {
+				if sourceMap, ok := sourceList[0].(map[string]interface{}); ok {
+					if sourceMap["source_type"].(string) == "NONE" {
+						delete(dbSystem.sourceAttributes, "source")
+					}
+				}
+			}
+		}
+	}
+
+	return resources, nil
+}
+
 func filterSourcedBootVolumes(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
 	results := []*OCIResource{}
 

website/docs/guides/resource_discovery.html.markdown

@@ -117,6 +117,7 @@ The generated `.tf` files contain the Terraform configuration with the resources
     * `load_balancer` - Discovers load balancer resources within the specified compartment
     * `marketplace` - Discovers marketplace resources within the specified compartment
     * `monitoring` - Discovers monitoring resources within the specified compartment
+    * `mysql` - Discovers mysql resources within the specified compartment
     * `nosql` - Discovers nosql resources within the specified compartment
     * `oce` - Discovers oce resources within the specified compartment
     * `object_storage` - Discovers object storage resources within the specified compartment
@@ -411,6 +412,11 @@ monitoring
 
 * oci\_monitoring\_alarm
 
+mysql
+    
+* oci\_mysql\_mysql\_backup
+* oci\_mysql\_mysql\_db\_system
+
 nosql
 
 * oci\_nosql\_table