Merge pull request #965 from terraform-providers/release_gh

Merge 3.60.0 into master

Author: alexng-canuck

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 3.59.1 (Unreleased)
+## 3.60.0 (Unreleased)
+
+### Added
+- Support `shape` property as customer input for `oci_database_data_guard_association`.
+
 ## 3.59.0 (January 22, 2020)
 
 ### Added

examples/database/dataguard/vm_shape/dataguard.tf

@@ -111,6 +111,7 @@ resource "oci_database_data_guard_association" "test_data_guard_association" {
 
   #required for NewDbSystem creation_type
   display_name        = "TFExampleDataGuardAssociationVM"
+  shape               = "VM.Standard2.1"
   subnet_id           = "${oci_core_subnet.test_subnet.id}"
   availability_domain = "${oci_core_subnet.test_subnet.availability_domain}"
   nsg_ids             = ["${oci_core_network_security_group.test_network_security_group.id}"]

examples/database/db_systems/db_exadata/resources.tf

@@ -10,7 +10,7 @@ resource "oci_database_db_system" "test_db_system" {
   db_home {
     database {
       admin_password = "${var.db_admin_password}"
-      db_name        = "${var.db_name}"
+      db_name        = "TFdb1Exa"
       character_set  = "${var.character_set}"
       ncharacter_set = "${var.n_character_set}"
       db_workload    = "${var.db_workload}"
@@ -22,7 +22,7 @@ resource "oci_database_db_system" "test_db_system" {
     }
 
     db_version   = "${var.db_version}"
-    display_name = "${var.db_home_display_name}"
+    display_name = "MyTFDBHome1Exa"
   }
 
   disk_redundancy  = "${var.db_disk_redundancy}"
@@ -64,7 +64,7 @@ resource "oci_database_database" "test_database" {
   #Required
   database {
     admin_password = "${var.db_admin_password}"
-    db_name        = "${var.second_db_name}"
+    db_name        = "TFdb2Exa"
     character_set  = "${var.character_set}"
     ncharacter_set = "${var.n_character_set}"
     db_workload    = "${var.db_workload}"

examples/database/db_systems/db_exadata/variables.tf

@@ -27,22 +27,10 @@ variable "db_admin_password" {
   default = "BEstrO0ng_#12"
 }
 
-variable "db_name" {
-  default = "aTFdb"
-}
-
-variable "second_db_name" {
-  default = "aTFdb2"
-}
-
 variable "db_version" {
   default = "12.1.0.2"
 }
 
-variable "db_home_display_name" {
-  default = "MyTFDBHome"
-}
-
 variable "db_disk_redundancy" {
   default = "HIGH"
 }

examples/database/db_systems/db_vm/main.tf

@@ -23,18 +23,10 @@ variable "db_admin_password" {
   default = "BEstrO0ng_#12"
 }
 
-variable "db_name" {
-  default = "aTFdb"
-}
-
 variable "db_version" {
   default = "19.0.0.0"
 }
 
-variable "db_home_display_name" {
-  default = "MyTFDBHome"
-}
-
 variable "db_disk_redundancy" {
   default = "NORMAL"
 }
@@ -43,10 +35,6 @@ variable "sparse_diskgroup" {
   default = true
 }
 
-variable "db_system_display_name" {
-  default = "MyTFDBSystem"
-}
-
 variable "hostname" {
   default = "myoracledb"
 }
@@ -266,7 +254,7 @@ resource "oci_database_db_system" "test_db_system" {
   db_home {
     database {
       admin_password = "${var.db_admin_password}"
-      db_name        = "${var.db_name}"
+      db_name        = "aTFdbVm"
       character_set  = "${var.character_set}"
       ncharacter_set = "${var.n_character_set}"
       db_workload    = "${var.db_workload}"
@@ -278,7 +266,7 @@ resource "oci_database_db_system" "test_db_system" {
     }
 
     db_version   = "${var.db_version}"
-    display_name = "${var.db_home_display_name}"
+    display_name = "MyTFDBHomeVm"
   }
 
   db_system_options {
@@ -289,7 +277,7 @@ resource "oci_database_db_system" "test_db_system" {
   shape                   = "${var.db_system_shape}"
   subnet_id               = "${oci_core_subnet.subnet.id}"
   ssh_public_keys         = ["${var.ssh_public_key}"]
-  display_name            = "${var.db_system_display_name}"
+  display_name            = "MyTFDBSystemVM"
   hostname                = "${var.hostname}"
   data_storage_size_in_gb = "${var.data_storage_size_in_gb}"
   license_model           = "${var.license_model}"

examples/database/db_systems/resources.tf

@@ -9,7 +9,7 @@ resource "oci_database_db_system" "test_db_system" {
   db_home {
     database {
       admin_password = "${var.db_admin_password}"
-      db_name        = "${var.db_name}"
+      db_name        = "aTFdb1"
       character_set  = "${var.character_set}"
       ncharacter_set = "${var.n_character_set}"
       db_workload    = "${var.db_workload}"
@@ -18,11 +18,6 @@ resource "oci_database_db_system" "test_db_system" {
       db_backup_config {
         auto_backup_enabled     = true
         recovery_window_in_days = 10
-
-        backup_destination_details {
-          id   = "${oci_database_backup_destination.test_backup_destination_nfs1.id}"
-          type = "NFS"
-        }
       }
 
       freeform_tags = {
@@ -31,7 +26,7 @@ resource "oci_database_db_system" "test_db_system" {
     }
 
     db_version   = "${var.db_version}"
-    display_name = "${var.db_home_display_name}"
+    display_name = "MyTFDBHome1"
   }
 
   disk_redundancy = "${var.db_disk_redundancy}"
@@ -55,29 +50,13 @@ resource "oci_database_db_system" "test_db_system" {
   }
 }
 
-resource "oci_database_backup_destination" "test_backup_destination_nfs1" {
-  #Required
-  compartment_id = "${var.compartment_ocid}"
-  display_name   = "testBackupDestinationNFS"
-  type           = "NFS"
-
-  #Optional
-  connection_string = "connectionString"
-
-  freeform_tags = {
-    "Department" = "Finance"
-  }
-
-  local_mount_point_path = "local_mount_point_path"
-}
-
 // The creation of an oci_database_db_system requires that it be created with exactly one oci_database_db_home. Therefore the first db home will have to be a property of the db system resource and any further db homes to be added to the db system will have to be added as first class resources using "oci_database_db_home".
 resource "oci_database_db_home" "test_db_home" {
   db_system_id = "${oci_database_db_system.test_db_system.id}"
 
   database {
     admin_password = "${var.db_admin_password}"
-    db_name        = "${var.db_home_db_name}3"
+    db_name        = "aTFdb2"
     character_set  = "${var.character_set}"
     ncharacter_set = "${var.n_character_set}"
     db_workload    = "${var.db_workload}"
@@ -89,32 +68,11 @@ resource "oci_database_db_home" "test_db_home" {
 
     db_backup_config {
       auto_backup_enabled = true
-
-      backup_destination_details {
-        id   = "${oci_database_backup_destination.test_backup_destination_nfs2.id}"
-        type = "NFS"
-      }
     }
   }
 
   db_version   = "${var.db_version}"
-  display_name = "${var.db_home_display_name}"
-}
-
-resource "oci_database_backup_destination" "test_backup_destination_nfs2" {
-  #Required
-  compartment_id = "${var.compartment_ocid}"
-  display_name   = "testBackupDestinationNFS"
-  type           = "NFS"
-
-  #Optional
-  connection_string = "connectionString"
-
-  freeform_tags = {
-    "Department" = "Finance"
-  }
-
-  local_mount_point_path = "local_mount_point_path"
+  display_name = "MyTFDBHome2"
 }
 
 resource "oci_database_backup" "test_backup" {

examples/database/db_systems/variables.tf

@@ -32,22 +32,10 @@ variable "db_admin_password" {
   default = "BEstrO0ng_#12"
 }
 
-variable "db_name" {
-  default = "aTFdb"
-}
-
-variable "db_home_db_name" {
-  default = "aTFdb2"
-}
-
 variable "db_version" {
   default = "12.1.0.2"
 }
 
-variable "db_home_display_name" {
-  default = "MyTFDBHome1"
-}
-
 variable "db_disk_redundancy" {
   default = "HIGH"
 }

examples/database/exadata_cc/vm_cluster.tf

@@ -167,12 +167,10 @@ resource "oci_database_backup_destination" "test_backup_destination_nfs" {
   type           = "NFS"
 
   #Optional
-  connection_string = "connectionString"
 
   freeform_tags = {
     "Department" = "Finance"
   }
-
   local_mount_point_path = "local_mount_point_path"
 }
 

examples/datacatalog/main.tf

@@ -0,0 +1,69 @@
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_ocid" {}
+variable "compartment_id" {}
+variable "region" {}
+
+variable "connection_password" {}
+
+provider "oci" {
+  region           = "${var.region}"
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+}
+
+resource "oci_datacatalog_catalog" test_oci_datacatalog_catalog {
+  compartment_id = "${var.compartment_id}"
+}
+
+data "oci_datacatalog_catalogs" test_oci_datacatalog_catalogs {
+  compartment_id = "${var.compartment_ocid}"
+}
+
+resource "oci_datacatalog_data_asset" test_oci_datacatalog_dataAsset {
+  display_name = "test_data_assets"
+  type_key     = "${data.oci_datacatalog_catalog_types.test_catalog_types_dataAsset.type_collection.0.key}"
+  catalog_id   = "${oci_datacatalog_catalog.test_oci_datacatalog_catalog.id}"
+
+  properties {
+    default.host     = "jbanford-host"
+    default.port     = "1521"
+    default.database = "SID"
+  }
+}
+
+#
+resource "oci_datacatalog_connection" test_connection {
+  catalog_id     = "${oci_datacatalog_catalog.test_oci_datacatalog_catalog.id}"
+  type_key       = "${data.oci_datacatalog_catalog_types.test_catalog_types_connection.type_collection.0.key}"
+  data_asset_key = "${oci_datacatalog_data_asset.test_oci_datacatalog_dataAsset.id}"
+  display_name   = "connection_name"
+
+  properties {
+    default.username = "scott"
+  }
+
+  enc_properties {
+    default.password = "${var.connection_password}"
+  }
+
+  is_default = true
+}
+
+data "oci_datacatalog_catalog_types" test_catalog_types_dataAsset {
+  catalog_id    = "${oci_datacatalog_catalog.test_oci_datacatalog_catalog.id}"
+  type_category = "dataAsset"
+  name          = "Oracle Database"
+  state         = "ACTIVE"
+}
+
+data "oci_datacatalog_catalog_types" test_catalog_types_connection {
+  catalog_id    = "${oci_datacatalog_catalog.test_oci_datacatalog_catalog.id}"
+  type_category = "connection"
+  name          = "Jdbc"
+  state         = "ACTIVE"
+}