Merge pull request #1253 from terraform-providers/release_merge_v4.7.0

Candidate for release_v4.7.0

Author: parrneet

CHANGELOG.md

@@ -1,9 +1,23 @@
+## 4.7.0 (Unreleased)
+
+### Added
+- Update document for service `audit`
+- Support for Flexible Load Balancer
+- Support for KMS filter listKeys based on KeyShape added
+- Support for ADBS Apex added
+- Support for Platform Integration: KMS Integration-Exadata (Phase 1)
+- Support for Management Dashboards Import
+
+### Deprecated
+- Data source `oci_database_autonomous_database_wallet` is being deprecated in favor of resource `oci_database_autonomous_database_wallet` 
+
 ## 4.6.0 (December 09, 2020)
 
 ### Added
 - Support for `metadata` field added to `identity_provider` datasources in `identity` service
 - Support for vanity hostnames in `oci_integration_integration_instance`
 - Support for Exacc infrastructure patching operation
+- Support for Flex components added in database
 
 ## 4.5.0 (December 02, 2020)
 

examples/database/adb/autonomous_data_warehouse.tf

@@ -23,7 +23,7 @@ resource "oci_database_autonomous_database" "autonomous_data_warehouse" {
   compartment_id           = var.compartment_ocid
   cpu_core_count           = "1"
   data_storage_size_in_tbs = "1"
-  db_name                  = "adbdw1"
+  db_name                  = "adbdw1f"
 
   #Optional
 //If a db version is passed, it must be valid

examples/database/adb/autonomous_data_warehouse_wallet.tf

@@ -6,14 +6,14 @@ resource "random_string" "autonomous_data_warehouse_wallet_password" {
   special = true
 }
 
-data "oci_database_autonomous_database_wallet" "autonomous_data_warehouse_wallet" {
+resource "oci_database_autonomous_database_wallet" "autonomous_data_warehouse_wallet" {
   autonomous_database_id = oci_database_autonomous_database.autonomous_data_warehouse.id
   password               = random_string.autonomous_data_warehouse_wallet_password.result
   base64_encode_content  = "true"
 }
 
 resource "local_file" "autonomous_data_warehouse_wallet_file" {
-  content_base64 = data.oci_database_autonomous_database_wallet.autonomous_data_warehouse_wallet.content
+  content_base64 = oci_database_autonomous_database_wallet.autonomous_data_warehouse_wallet.content
   filename       = "${path.module}/autonomous_data_warehouse_wallet.zip"
 }
 

examples/database/adb/autonomous_database.tf

@@ -28,7 +28,7 @@ resource "oci_database_autonomous_database" "autonomous_database" {
   compartment_id           = var.compartment_ocid
   cpu_core_count           = "1"
   data_storage_size_in_tbs = "1"
-  db_name                  = "adbdb1"
+  db_name                  = "adbdb1f"
 
   #Optional
   db_version                                     = data.oci_database_autonomous_db_versions.test_autonomous_db_versions.autonomous_db_versions[0].version
@@ -46,19 +46,31 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
   compartment_id           = var.compartment_ocid
   cpu_core_count           = "1"
   data_storage_size_in_tbs = "1"
-  db_name                  = "adbdb11"
+  db_name                  = "adbdb11f"
   db_version               = "19c"
   db_workload              = "AJD"
   license_model            = "LICENSE_INCLUDED"
   is_free_tier             = "false"
 }
 
+resource "oci_database_autonomous_database" "test_autonomous_database_apex" {
+  admin_password           = random_string.autonomous_database_admin_password.result
+  compartment_id           = var.compartment_ocid
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbapex"
+  db_version               = "19c"
+  db_workload              = "APEX"
+  license_model            = "LICENSE_INCLUDED"
+  is_free_tier             = "false"
+}
+
 resource "oci_database_autonomous_database" "test_autonomous_database_actions" {
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid
   cpu_core_count           = "1"
   data_storage_size_in_tbs = "1"
-  db_name                  = "adbdb111"
+  db_name                  = "adbdb11ff"
   db_version               = "19c"
   db_workload              = "AJD"
   license_model            = "LICENSE_INCLUDED"

examples/database/adb/autonomous_database_wallet.tf

@@ -6,14 +6,14 @@ resource "random_string" "autonomous_database_wallet_password" {
   special = true
 }
 
-data "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
+resource "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
   autonomous_database_id = oci_database_autonomous_database.autonomous_database.id
   password               = random_string.autonomous_database_wallet_password.result
   base64_encode_content  = "true"
 }
 
 resource "local_file" "autonomous_database_wallet_file" {
-  content_base64 = data.oci_database_autonomous_database_wallet.autonomous_database_wallet.content
+  content_base64 = oci_database_autonomous_database_wallet.autonomous_database_wallet.content
   filename       = "${path.module}/autonomous_database_wallet.zip"
 }
 

examples/database/flex_component/main.tf

@@ -0,0 +1,29 @@
+// Copyright (c) 2017, 2020, 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 "flex_component_name" {
+  default = "name"
+}
+
+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
+}
+
+data "oci_database_flex_components" "test_flex_components" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+
+  #Optional
+  name = var.flex_component_name
+}

examples/load_balancer/lb_full/lb_full.tf

@@ -129,6 +129,10 @@ resource "oci_core_route_table" "routetable1" {
 resource "oci_core_public_ip" "test_reserved_ip" {
   compartment_id = "${var.compartment_ocid}"
   lifetime       = "RESERVED"
+
+  lifecycle {
+    ignore_changes = [private_ip_id]
+  }
 }
 
 resource "oci_core_security_list" "securitylist1" {
@@ -263,6 +267,33 @@ resource "oci_load_balancer" "lb2" {
   display_name = "lb1"
 }
 
+
+variable "load_balancer_shape_details_maximum_bandwidth_in_mbps" {
+  default = 100
+}
+
+variable "load_balancer_shape_details_minimum_bandwidth_in_mbps" {
+  default = 10
+}
+
+resource "oci_load_balancer" "flex_lb" {
+  shape          = "flexible"
+  compartment_id = var.compartment_ocid
+
+  subnet_ids = [
+    oci_core_subnet.subnet1.id,
+    oci_core_subnet.subnet2.id,
+  ]
+
+  shape_details {
+      #Required
+      maximum_bandwidth_in_mbps = var.load_balancer_shape_details_maximum_bandwidth_in_mbps
+      minimum_bandwidth_in_mbps = var.load_balancer_shape_details_minimum_bandwidth_in_mbps
+    }
+
+  display_name = "flex_lb"
+}
+
 resource "oci_load_balancer_backend_set" "lb-bes1" {
   name             = "lb-bes1"
   load_balancer_id = oci_load_balancer.lb1.id

examples/management_dashboard/main.tf

@@ -0,0 +1,33 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+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
+}
+
+data "oci_management_dashboard_management_dashboards_export" "test_export" {
+  export_dashboard_id = "{\"dashboardIds\":[\"ocid1.managementdashboard.dev..aaaaaaaazrrxainoaive7adj77uqejld45vch7zkoqrlh5fwv2_dummy_ocids\"]}"
+}
+
+// example showing import_details usage
+resource "oci_management_dashboard_management_dashboards_import" "test_import_via_tf_variable" {
+  import_details = var.test_import_details
+}
+
+// example showing import_details_file usage, sample.json content is same as var.test_import_details
+resource "oci_management_dashboard_management_dashboards_import" "test_import_via_file" {
+  import_details_file = "sample.json"
+}
+
+output "test_export_data_all" {
+  value = data.oci_management_dashboard_management_dashboards_export.test_export
+}
+
+output "test_export_data_dashboards" {
+  value = data.oci_management_dashboard_management_dashboards_export.test_export.export_details
+}
+