Support for mysql service added

Author: rashik-bhasin

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 3.82.0 (Unreleased)
 
 ### Added
+- Support for MySQL service added
 - Support harvesting sources with Private IPs for resource `datacatalog`
 - Support `dataflow_archive_uri` for service `dataflow`
 - Support for Data Integration Service

examples/mysql/main.tf

@@ -0,0 +1,116 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_ocid" {}
+
+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_core_subnet" "test_subnet" {
+  cidr_block     = "10.0.0.0/24"
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+}
+
+resource "oci_mysql_mysql_backup" "test_mysql_backup" {
+  db_system_id = "${oci_mysql_mysql_db_system.test_mysql_backup_db_system.id}"
+}
+
+resource "oci_mysql_mysql_db_system" "test_mysql_backup_db_system" {
+  #Required
+  admin_password      = "BEstrO0ng_#11"
+  admin_username      = "adminUser"
+  availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
+  compartment_id      = "${var.compartment_ocid}"
+  configuration_id    = "${data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations.0.id}"
+  shape_name          = "VM.Standard.E2.2"
+  subnet_id           = "${oci_core_subnet.test_subnet.id}"
+
+  #Optional
+  data_storage_size_in_gb = "50"
+}
+
+resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
+  #Required
+  admin_password      = "BEstrO0ng_#11"
+  admin_username      = "adminUser"
+  availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
+  compartment_id      = "${var.compartment_ocid}"
+  configuration_id    = "${data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations.0.id}"
+  shape_name          = "VM.Standard.E2.2"
+  subnet_id           = "${oci_core_subnet.test_subnet.id}"
+
+  #Optional
+  backup_policy {
+    is_enabled        = "false"
+    retention_in_days = "10"
+    window_start_time = "01:00-00:00"
+  }
+
+  #defined_tags  = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.mysql_defined_tags_value}")}"
+  #freeform_tags = "${var.mysql_freeform_tags}"
+  description = "MySQL Database Service"
+
+  display_name   = "DBSystem001"
+  fault_domain   = "FAULT-DOMAIN-1"
+  hostname_label = "hostnameLabel"
+  ip_address     = "10.0.0.8"
+
+  maintenance {
+    window_start_time = "sun 01:00"
+  }
+
+  mysql_version = "${data.oci_mysql_mysql_versions.test_mysql_versions.versions.0.versions.0.version}"
+  port          = "3306"
+  port_x        = "33306"
+
+  # Creating DB System using a backup
+  source {
+    backup_id   = "${oci_mysql_mysql_backup.test_mysql_backup.id}"
+    source_type = "BACKUP"
+  }
+}
+
+data "oci_mysql_mysql_versions" "test_mysql_versions" {
+  compartment_id = "${var.compartment_ocid}"
+}
+
+data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
+  compartment_id = "${var.compartment_ocid}"
+
+  #Optional
+  state        = "ACTIVE"
+  display_name = "VM.Standard.E2.2.Built-in"
+  shape_name   = "VM.Standard.E2.2"
+}
+
+data "oci_mysql_shapes" "test_shapes" {
+  compartment_id      = "${var.compartment_ocid}"
+  availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
+}
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = "${var.tenancy_ocid}"
+}
+
+output "version_value" {
+  value = "${data.oci_mysql_mysql_versions.test_mysql_versions.versions.0.versions.0.version}"
+}
+
+output "configuration_id" {
+  value = "${data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations.0.id}"
+}

oci/helpers.go

@@ -59,6 +59,14 @@ variable "InstanceImageOCID" {
 	  }
 	}
 	`
+	MysqlConfigurationIdVariable = `
+	variable "MysqlConfigurationOCID" {
+	  type = "map"
+	  default = {
+		us-ashburn-1 = "ocid1.mysqlconfiguration.oc1..aaaaaaaah6o6qu3gdbxnqg6aw56amnosmnaycusttaa7abyq2tdgpgubvsgj"
+	  }
+	}
+	`
 	OciWindowsImageIdsVariable = `
 	variable "InstanceImageOCID" {
 		type = "map"

oci/mysql_clients.go

@@ -0,0 +1,64 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	oci_mysql "github.com/oracle/oci-go-sdk/mysql"
+
+	oci_common "github.com/oracle/oci-go-sdk/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_mysql.DbBackupsClient", &OracleClient{initClientFn: initMysqlDbBackupsClient})
+	RegisterOracleClient("oci_mysql.DbSystemClient", &OracleClient{initClientFn: initMysqlDbSystemClient})
+	RegisterOracleClient("oci_mysql.MysqlaasClient", &OracleClient{initClientFn: initMysqlMysqlaasClient})
+}
+
+func initMysqlDbBackupsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
+	client, err := oci_mysql.NewDbBackupsClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) dbBackupsClient() *oci_mysql.DbBackupsClient {
+	return m.GetClient("oci_mysql.DbBackupsClient").(*oci_mysql.DbBackupsClient)
+}
+
+func initMysqlDbSystemClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
+	client, err := oci_mysql.NewDbSystemClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) dbSystemClient() *oci_mysql.DbSystemClient {
+	return m.GetClient("oci_mysql.DbSystemClient").(*oci_mysql.DbSystemClient)
+}
+
+func initMysqlMysqlaasClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
+	client, err := oci_mysql.NewMysqlaasClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) mysqlaasClient() *oci_mysql.MysqlaasClient {
+	return m.GetClient("oci_mysql.MysqlaasClient").(*oci_mysql.MysqlaasClient)
+}

oci/mysql_mysql_backup_data_source.go

@@ -0,0 +1,131 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	oci_mysql "github.com/oracle/oci-go-sdk/mysql"
+)
+
+func init() {
+	RegisterDatasource("oci_mysql_mysql_backup", MysqlMysqlBackupDataSource())
+}
+
+func MysqlMysqlBackupDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["backup_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return GetSingularDataSourceItemSchema(MysqlMysqlBackupResource(), fieldMap, readSingularMysqlMysqlBackup)
+}
+
+func readSingularMysqlMysqlBackup(d *schema.ResourceData, m interface{}) error {
+	sync := &MysqlMysqlBackupDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).dbBackupsClient()
+
+	return ReadResource(sync)
+}
+
+type MysqlMysqlBackupDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_mysql.DbBackupsClient
+	Res    *oci_mysql.GetBackupResponse
+}
+
+func (s *MysqlMysqlBackupDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *MysqlMysqlBackupDataSourceCrud) Get() error {
+	request := oci_mysql.GetBackupRequest{}
+
+	if backupId, ok := s.D.GetOkExists("backup_id"); ok {
+		tmp := backupId.(string)
+		request.BackupId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "mysql")
+
+	response, err := s.Client.GetBackup(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *MysqlMysqlBackupDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.BackupSizeInGBs != nil {
+		s.D.Set("backup_size_in_gbs", *s.Res.BackupSizeInGBs)
+	}
+
+	s.D.Set("backup_type", s.Res.BackupType)
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	s.D.Set("creation_type", s.Res.CreationType)
+
+	if s.Res.DataStorageSizeInGBs != nil {
+		s.D.Set("data_storage_size_in_gb", *s.Res.DataStorageSizeInGBs)
+	}
+
+	if s.Res.DbSystemId != nil {
+		s.D.Set("db_system_id", *s.Res.DbSystemId)
+	}
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", definedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.Description != nil {
+		s.D.Set("description", *s.Res.Description)
+	}
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
+
+	if s.Res.MysqlVersion != nil {
+		s.D.Set("mysql_version", *s.Res.MysqlVersion)
+	}
+
+	if s.Res.RetentionInDays != nil {
+		s.D.Set("retention_in_days", *s.Res.RetentionInDays)
+	}
+
+	if s.Res.ShapeName != nil {
+		s.D.Set("shape_name", *s.Res.ShapeName)
+	}
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	if s.Res.TimeUpdated != nil {
+		s.D.Set("time_updated", s.Res.TimeUpdated.String())
+	}
+
+	return nil
+}