Merge pull request #953 from terraform-providers/release_merge_v3.58.0

Candidate for release_v3.58.0

Author: varmax2511

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 3.58.0 (Unreleased)
+
+### Added
+- Support for `description` field in networking routing rules in `oci_core_route_table` and `oci_core_security_list`
+- Support for Stop/Start Digital Assistant Instance
+- Support for `oci_database_database` resource for exadata infrastructure
+
 ## 3.57.0 (January 09, 2020)
 
 ### Added

examples/database/db_systems/db_exadata/resources.tf

@@ -59,3 +59,21 @@ resource "oci_database_exadata_iorm_config" "test_exadata_iorm_config" {
     share   = 1
   }
 }
+
+resource "oci_database_database" "test_database" {
+  #Required
+  database {
+    admin_password = "${var.db_admin_password}"
+    db_name        = "${var.second_db_name}"
+    character_set  = "${var.character_set}"
+    ncharacter_set = "${var.n_character_set}"
+    db_workload    = "${var.db_workload}"
+
+    db_backup_config {
+      auto_backup_enabled = false
+    }
+  }
+
+  db_home_id = "${data.oci_database_db_homes.db_homes.db_homes.0.db_home_id}"
+  source     = "NONE"
+}

examples/database/db_systems/db_exadata/variables.tf

@@ -31,6 +31,10 @@ variable "db_name" {
   default = "aTFdb"
 }
 
+variable "second_db_name" {
+  default = "aTFdb2"
+}
+
 variable "db_version" {
   default = "12.1.0.2"
 }

examples/networking/route_table/route_table.tf

@@ -7,6 +7,10 @@ variable "private_key_path" {}
 variable "compartment_ocid" {}
 variable "region" {}
 
+variable "route_table_route_rules_description" {
+  default = "description"
+}
+
 provider "oci" {
   tenancy_ocid     = "${var.tenancy_ocid}"
   user_ocid        = "${var.user_ocid}"
@@ -34,6 +38,7 @@ resource "oci_core_route_table" "example_route_table" {
   display_name   = "exampleRouteTable"
 
   route_rules {
+    description       = "${var.route_table_route_rules_description}"
     destination       = "0.0.0.0/0"
     destination_type  = "CIDR_BLOCK"
     network_entity_id = "${oci_core_internet_gateway.example_ig.id}"

examples/networking/security_list/security_list.tf

@@ -9,6 +9,14 @@ variable "private_key_path" {}
 variable "compartment_ocid" {}
 variable "region" {}
 
+variable "security_list_egress_security_rules_description" {
+  default = "description"
+}
+
+variable "security_list_ingress_security_rules_description" {
+  default = "description"
+}
+
 provider "oci" {
   tenancy_ocid     = "${var.tenancy_ocid}"
   user_ocid        = "${var.user_ocid}"
@@ -40,8 +48,9 @@ resource "oci_core_security_list" "example_security_list" {
 
   // allow outbound udp traffic on a port range
   egress_security_rules {
+    description = "${var.security_list_egress_security_rules_description}"
     destination = "0.0.0.0/0"
-    protocol    = "17"        // udp
+    protocol    = "17"                                                     // udp
     stateless   = true
 
     udp_options {
@@ -71,9 +80,10 @@ resource "oci_core_security_list" "example_security_list" {
 
   // allow inbound icmp traffic of a specific type
   ingress_security_rules {
-    protocol  = 1
-    source    = "0.0.0.0/0"
-    stateless = true
+    description = "${var.security_list_ingress_security_rules_description}"
+    protocol    = 1
+    source      = "0.0.0.0/0"
+    stateless   = true
 
     icmp_options {
       type = 3

examples/oracle_digital_assistant/main.tf

@@ -6,6 +6,10 @@ variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
 
+variable "oda_instance_state" {
+  default = "INACTIVE"
+}
+
 variable "compartment_ocid" {}
 
 provider "oci" {
@@ -21,6 +25,9 @@ resource "oci_oda_oda_instance" "TFOdaInstance" {
   shape_name     = "DEVELOPMENT"
   description    = "test instance"
   display_name   = "TestInstance"
+
+  #Optional
+  state = "${var.oda_instance_state}"
 }
 
 data "oci_oda_oda_instances" "TFOdaInstances" {

examples/osmanagement/main.tf

@@ -115,7 +115,7 @@ resource "null_resource" "remote-exec" {
     inline = [
       "sudo -E wget http://yum-${var.region}.oracle.com/yum-${var.region}-ol7.repo",
       "sudo yum-config-manager --enable ol7_oci_included",
-      "sudo yum --enablerepo ol7_oci_included install osms-agent",
+      "sudo yum -y --enablerepo ol7_oci_included install osms-agent",
     ]
   }
 }
@@ -257,9 +257,9 @@ data "oci_osmanagement_managed_instance" "test_managed_instance" {
 }
 
 output "managed_instance_output" {
-  value = ["${data.oci_osmanagement_managed_instance.test_managed_instance}"]
+  value = ["${data.oci_osmanagement_managed_instance.test_managed_instance.managed_instance_groups}"]
 }
 
 output "managed_instance_groups_output" {
-  value = ["${data.oci_osmanagement_managed_instance_groups.test_managed_instance_groups}"]
+  value = ["${data.oci_osmanagement_managed_instance_groups.test_managed_instance_groups.display_name}"]
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v15.0.0+incompatible
+	github.com/oracle/oci-go-sdk v15.1.0+incompatible
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/yaml.v2 v2.2.2

go.sum

@@ -342,6 +342,8 @@ github.com/oracle/oci-go-sdk v14.0.0+incompatible h1:DqmXj/YCn1RLTBO4wKNdZ5lTT6D
 github.com/oracle/oci-go-sdk v14.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v15.0.0+incompatible h1:DN9mJZUJMm2IKY9z+lDg7Hz6e+ns1PtWSSbQ8PrmOmw=
 github.com/oracle/oci-go-sdk v15.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v15.1.0+incompatible h1:J+ZPaUim4XZqjdZK13GDsdtu/arw8NzFZGVdQzlrFZo=
+github.com/oracle/oci-go-sdk v15.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
 github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

oci/core_route_table_resource.go

@@ -77,6 +77,11 @@ func CoreRouteTableResource() *schema.Resource {
 							Computed:   true,
 							Deprecated: FieldDeprecatedForAnother("cidr_block", "destination"),
 						},
+						"description": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
 						"destination": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -367,6 +372,11 @@ func (s *CoreRouteTableResourceCrud) mapToRouteRule(fieldKeyFormat string) (oci_
 		result.DestinationType = tmp
 	}
 
+	if description, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "description")); ok && description != "" {
+		tmp := description.(string)
+		result.Description = &tmp
+	}
+
 	cidrBlockChanged := false
 	cidrBlock, cidrBlockPresent := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "cidr_block"))
 	if cidrBlockPresent && s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "cidr_block")) {
@@ -406,6 +416,10 @@ func RouteRuleToMap(obj oci_core.RouteRule) map[string]interface{} {
 		result["cidr_block"] = string(*obj.CidrBlock)
 	}
 
+	if obj.Description != nil {
+		result["description"] = string(*obj.Description)
+	}
+
 	if obj.Destination != nil {
 		result["destination"] = string(*obj.Destination)
 	}
@@ -434,6 +448,9 @@ func routeRulesHashCodeForSets(v interface{}) int {
 	} else if destinationPresent && destination != "" {
 		buf.WriteString(fmt.Sprintf("%v-", destination))
 	}
+	if description, ok := m["description"]; ok && description != "" {
+		buf.WriteString(fmt.Sprintf("%v-", description))
+	}
 	if destinationPresent && destination != "" {
 		buf.WriteString(fmt.Sprintf("%v-", destination))
 	} else if cidrBlockPresent && cidrBlock != "" {