Merge pull request #1291 from terraform-providers/release_gh

Releasing version 4.12.0

Author: srishtipmishra

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.12.0 (Unreleased)
+
+### Added
+- Support for Infrequent Access object storage tier added
+- Support for NG-VPN Multiple Encryption Domain and Public Logging
+- Support for ExaCC Customer Contacts Phase 2 added
+- Support for OnPrem database
+
+### Notes
+- Update Resource discovery Partial Success Exit status from 2 to 64
+
 ## 4.11.0 (January 27, 2021)
 
 ### Added

README.md

@@ -20,9 +20,9 @@ Requirements
 ------------
 
 - [Terraform](https://www.terraform.io/downloads.html) v0.10.1 or greater
-- [Go](https://golang.org/doc/install) 1.11.4 (recommended)
+- [Go](https://golang.org/doc/install) 1.12.3 (recommended)
 
-Note: You may use any version 1.8 or above to build the provider. However, the `goimports`, `go vet`, and `gofmt` code checks will only pass when using version 1.11.
+Note: You may use any version 1.8 or above to build the provider. However, the `goimports`, `go vet`, and `gofmt` code checks will only pass when using version 1.12.
 
 
 Building the Provider

examples/bds/autoscaling/main.tf renamed to examples/big_data_service/autoscaling/main.tf

@@ -1,5 +1,5 @@
 
-// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
 
 variable "tenancy_ocid" {}

examples/bds/main.tf renamed to examples/big_data_service/main.tf

@@ -5,7 +5,7 @@ This example contains Terraform configuration to provision a virtual machine in
 ## What this example covers
 
 -   Deploying networking resources that creates a VCN, Subnet, Route Table, Internet Gateway and a Security List to allow RDP & WinRM traffic for the VM
-    -   [networking.tf](networking.tf)
+    -   [windows.tf](windows.tf)
 -   Deploying a Windows VM instance with one of [published images on OCI](https://docs.cloud.oracle.com/iaas/images/)
     -   [windows.tf](windows.tf)
 -   Using the Windows version for [Cloud-Init](https://cloud-init.io/) -  [Cloudbase-Init](https://cloudbase.it/cloudbase-init/) available on the VM to setup and configure Windows

examples/compute/windows/README.md

@@ -0,0 +1,72 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+// Create an External Container Database resource
+resource "oci_database_external_container_database" "test_external_container_database" {
+  compartment_id = var.compartment_ocid
+  display_name = var.external_container_database_display_name
+
+  #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+  #defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+}
+
+// Create a Connector using credential name for the External Container Database resource
+resource "oci_database_external_database_connector" "test_external_container_database_connector" {
+    connection_credentials {
+        credential_type = var.credential_type
+        credential_name = var.credential_name
+    }
+    connection_string {
+        hostname = var.hostname
+        port = var.port
+        protocol = var.protocol
+        service = var.service
+    }
+    connector_agent_id = var.connector_agent_id
+    display_name = var.external_database_connector_display_name
+    external_database_id = oci_database_external_container_database.test_external_container_database.id
+    connector_type = var.connector_type
+    #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+    #defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
+
+    freeform_tags = {
+      "Department" = "Finance"
+    }
+}
+
+// Enable Database Management
+
+resource "oci_database_external_container_database_management" "test_enable_external_container_database_management" {
+    external_container_database_id = oci_database_external_container_database.test_external_container_database.id
+    external_database_connector_id = oci_database_external_database_connector.test_external_container_database_connector.id
+    license_model = var.license_model
+    enable_management = true
+}
+
+// Disable Database Management
+
+resource "oci_database_external_container_database_management" "test_disable_external_container_database_management" {
+    depends_on = [oci_database_external_container_database_management.test_enable_external_container_database_management,
+    oci_database_external_pluggable_database_management.test_disable_external_pluggable_database_management]
+    external_container_database_id = oci_database_external_container_database.test_external_container_database.id
+    external_database_connector_id = oci_database_external_database_connector.test_external_container_database_connector.id
+    enable_management = false
+}
+
+data "oci_database_external_container_database" "test_external_container_database" {
+	#Required
+	external_container_database_id = oci_database_external_container_database.test_external_container_database.id
+}
+
+data "oci_database_external_container_databases" "test_external_container_databases" {
+	#Required
+	compartment_id = var.compartment_ocid
+
+	#Optional
+	display_name = var.external_container_database_display_name
+	state = var.external_database_state
+}

examples/database/external_databases/external_container_database.tf

@@ -0,0 +1,71 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+// Create an External Non-Container Database resource
+resource "oci_database_external_non_container_database" "test_external_non_container_database" {
+  compartment_id = var.compartment_ocid
+  display_name = var.external_non_container_database_display_name
+
+  #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+  #defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+}
+
+// Create a connector using credential name for the External Non-Container Database resource
+resource "oci_database_external_database_connector" "test_external_non_container_database_connector" {
+    connection_credentials {
+        credential_type = var.credential_type
+        credential_name = var.credential_name
+    }
+    connection_string {
+        hostname = var.hostname
+        port = var.port
+        protocol = var.protocol
+        service = var.service
+    }
+    connector_agent_id = var.connector_agent_id
+    display_name = var.external_database_connector_display_name
+    external_database_id = oci_database_external_non_container_database.test_external_non_container_database.id
+    connector_type = var.connector_type
+    #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+    #defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
+
+    freeform_tags = {
+      "Department" = "Finance"
+    }
+}
+
+// Enable Database Management
+
+resource "oci_database_external_non_container_database_management" "test_enable_external_non_container_database_management" {
+    external_non_container_database_id = oci_database_external_non_container_database.test_external_non_container_database.id
+    external_database_connector_id = oci_database_external_database_connector.test_external_non_container_database_connector.id
+    license_model = var.license_model
+    enable_management = true
+}
+
+//Disable Database Management
+
+resource "oci_database_external_non_container_database_management" "test_disable_external_non_container_database_management" {
+    depends_on = [oci_database_external_non_container_database_management.test_enable_external_non_container_database_management]
+    external_non_container_database_id = oci_database_external_non_container_database.test_external_non_container_database.id
+    external_database_connector_id = oci_database_external_database_connector.test_external_non_container_database_connector.id
+    enable_management = false
+}
+
+data "oci_database_external_non_container_database" "test_external_non_container_database" {
+	#Required
+	external_non_container_database_id = oci_database_external_non_container_database.test_external_non_container_database.id
+}
+
+data "oci_database_external_non_container_databases" "test_external_non_container_databases" {
+	#Required
+	compartment_id = var.compartment_ocid
+
+	#Optional
+	display_name = var.external_non_container_database_display_name
+	state = var.external_database_state
+}

examples/database/external_databases/external_non_container_database.tf

@@ -0,0 +1,70 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+// Create an External Pluggable Database resource
+resource "oci_database_external_pluggable_database" "test_external_pluggable_database" {
+  compartment_id = var.compartment_ocid
+  display_name = var.external_pluggable_database_display_name
+  external_container_database_id = oci_database_external_container_database.test_external_container_database.id
+
+  #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+  #defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+}
+
+// Create a Connector using credential name for the External Pluggable Database resource
+resource "oci_database_external_database_connector" "test_external_pluggable_database_connector" {
+    connection_credentials {
+        credential_type = var.credential_type
+        credential_name = var.credential_name
+    }
+    connection_string {
+        hostname = var.hostname
+        port = var.port
+        protocol = var.protocol
+        service = var.service
+    }
+    connector_agent_id = var.connector_agent_id
+    display_name = var.external_database_connector_display_name
+    external_database_id = oci_database_external_pluggable_database.test_external_pluggable_database.id
+    connector_type = var.connector_type
+    #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+    #defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"}
+
+    freeform_tags = {
+      "Department" = "Finance"
+    }
+}
+
+// Enable Database Management for the External Pluggable Database
+resource "oci_database_external_pluggable_database_management" "test_enable_external_pluggable_database_management" {
+    depends_on = [oci_database_external_container_database_management.test_enable_external_container_database_management]
+    external_pluggable_database_id = oci_database_external_pluggable_database.test_external_pluggable_database.id
+    external_database_connector_id = oci_database_external_database_connector.test_external_pluggable_database_connector.id
+    enable_management = true
+}
+
+// Disable Database Management for the External Pluggable Database
+resource "oci_database_external_pluggable_database_management" "test_disable_external_pluggable_database_management" {
+    depends_on = [oci_database_external_pluggable_database_management.test_enable_external_pluggable_database_management]
+    external_pluggable_database_id = oci_database_external_pluggable_database.test_external_pluggable_database.id
+    external_database_connector_id = oci_database_external_database_connector.test_external_pluggable_database_connector.id
+    enable_management = false
+}
+
+data "oci_database_external_pluggable_database" "test_external_pluggable_database" {
+	#Required
+	external_pluggable_database_id = oci_database_external_pluggable_database.test_external_pluggable_database.id
+}
+
+data "oci_database_external_pluggable_databases" "test_external_pluggable_databases" {
+	#Required
+	compartment_id = var.compartment_ocid
+
+	#Optional
+	display_name = var.external_pluggable_database_display_name
+	state = var.external_database_state
+}

examples/database/external_databases/external_pluggable_database.tf

@@ -0,0 +1,9 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+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
+}

examples/database/external_databases/provider.tf

@@ -0,0 +1,93 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "ssh_public_key" {
+}
+
+variable "ssh_private_key" {
+}
+
+variable "external_container_database_display_name" {
+    default = "myTestExternalContainerDatabase"
+}
+
+variable "external_non_container_database_display_name" {
+    default = "myTestExternalNonContainerDatabase"
+}
+
+variable "external_pluggable_database_display_name" {
+    default = "myTestExternalPluggableDatabase"
+}
+
+variable "credential_type" {
+    default = "NAME_REFERENCE"
+}
+
+variable "credential_name" {
+    default = "credential.name"
+}
+
+variable "username" {
+    default = "username"
+}
+
+variable "password" {
+    default = "password"
+}
+
+variable "role" {
+    default = "SYSDBA"
+}
+
+variable "hostname" {
+    default = "host.name"
+}
+
+variable "port" {
+    default = 10
+}
+
+variable "protocol" {
+    default = "TCP"
+}
+
+variable "service" {
+    default = "myService"
+}
+
+variable "connector_agent_id" {
+    default = "testConnectorId"
+}
+
+variable "external_database_connector_display_name" {
+    default = "myTestConnector"
+}
+
+variable "connector_type" {
+    default = "MACS"
+}
+
+variable "license_model" {
+    default = "BRING_YOUR_OWN_LICENSE"
+}
+
+variable "external_database_state" {
+    default = "AVAILABLE"
+}