Candidate for release_v3.38.0

Candidate for release_v3.38.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 3.37.1 (Unreleased)
+## 3.38.0 (Unreleased)
+
+### Added
+- Documentation update for `oci_waas_waas_policy` and `oci_waas_certificate` with the latest WAF API change
+
+### Fixed
+- Fixed the invalid parameter issue on provisioning `oci_core_network_security_group_security_rule` with `icmp_options` without optional attribute `code`
+
 ## 3.37.0 (August 07, 2019)
 
 ### Added

examples/compute/instance/block.tf

@@ -11,7 +11,6 @@ resource "oci_core_volume" "TFBlock" {
 resource "oci_core_volume_attachment" "TFBlockAttach" {
   count           = "${var.NumInstances * var.NumIscsiVolumesPerInstance}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.TFInstance.*.id[floor(count.index / var.NumIscsiVolumesPerInstance)]}"
   volume_id       = "${oci_core_volume.TFBlock.*.id[count.index]}"
   device          = "${count.index == 0 ? var.volume_attachment_device : ""}"
@@ -35,7 +34,6 @@ resource "oci_core_volume" "TFBlockParavirtualized" {
 resource "oci_core_volume_attachment" "TFBlockAttachParavirtualized" {
   count           = "${var.NumInstances * var.NumParavirtualizedVolumesPerInstance}"
   attachment_type = "paravirtualized"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.TFInstance.*.id[floor(count.index / var.NumParavirtualizedVolumesPerInstance)]}"
   volume_id       = "${oci_core_volume.TFBlockParavirtualized.*.id[count.index]}"
 

examples/compute/private_ip/env-vars

@@ -37,7 +37,6 @@ resource "oci_core_volume" "TFVolume" {
 
 resource "oci_core_volume_attachment" "TFVolumeAttachment" {
   attachment_type                     = "paravirtualized"
-  compartment_id                      = "${var.compartment_ocid}"
   instance_id                         = "${oci_core_instance.TFInstance.id}"
   volume_id                           = "${oci_core_volume.TFVolume.id}"
   display_name                        = "tf-vol-attach"

examples/compute/pv_encryption_enabled_volume_attachment/compute.tf

@@ -76,7 +76,6 @@ resource "oci_core_volume" "TFVolume" {
 
 resource "oci_core_volume_attachment" "TFVolumeAttachment" {
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.TFInstance.id}"
   volume_id       = "${oci_core_volume.TFVolume.id}"
 }

examples/compute/windows/windows.tf

@@ -1,8 +1,6 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
-/*
- * This example demonstrates the various dhcp option configurations.
- */
+# This example demonstrates the various dhcp option configurations.
 
 variable "tenancy_ocid" {}
 variable "user_ocid" {}
@@ -19,17 +17,17 @@ provider "oci" {
   region           = "${var.region}"
 }
 
-resource "oci_core_vcn" "ExampleVCN" {
+resource "oci_core_vcn" "example_vcn" {
   cidr_block     = "10.1.0.0/16"
   compartment_id = "${var.compartment_ocid}"
-  display_name   = "TFExampleVCN"
+  display_name   = "exampleVCN"
   dns_label      = "tfexamplevcn"
 }
 
-resource "oci_core_dhcp_options" "ExampleDhcpOptions1" {
+resource "oci_core_dhcp_options" "example_dhcp_options_1" {
   compartment_id = "${var.compartment_ocid}"
-  vcn_id         = "${oci_core_vcn.ExampleVCN.id}"
-  display_name   = "TFExampleDhcpOptions1"
+  vcn_id         = "${oci_core_vcn.example_vcn.id}"
+  display_name   = "exampleDhcpOptions1"
 
   // required
   options {
@@ -44,10 +42,10 @@ resource "oci_core_dhcp_options" "ExampleDhcpOptions1" {
   }
 }
 
-resource "oci_core_dhcp_options" "ExampleDhcpOptions2" {
+resource "oci_core_dhcp_options" "example_dhcp_options_2" {
   compartment_id = "${var.compartment_ocid}"
-  vcn_id         = "${oci_core_vcn.ExampleVCN.id}"
-  display_name   = "TFExampleDhcpOptions2"
+  vcn_id         = "${oci_core_vcn.example_vcn.id}"
+  display_name   = "exampleDhcpOptions2"
 
   // required
   options {

examples/networking/dhcp_options/dhcp_options.tf

@@ -1,52 +1,19 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
-variable "ip_sec_connection_cpe_local_identifier" {
-  default = "189.44.2.135"
-}
 
-variable "ip_sec_connection_cpe_local_identifier_type" {
-  default = "IP_ADDRESS"
-}
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
 
-variable "ip_sec_connection_defined_tags_value" {
-  default = "value"
-}
-
-variable "ip_sec_connection_display_name" {
-  default = "MyIPSecConnection"
-}
-
-variable "ip_sec_connection_freeform_tags" {
-  default = {
-    "Department" = "Finance"
-  }
-}
-
-variable "ip_sec_connection_static_routes" {
-  default = ["10.0.0.0/16"]
-}
-
-variable "ip_sec_connection_tunnel_configuration_bgp_session_config_customer_bgp_asn" {
-  default = "1587232876"
-}
-
-variable "ip_sec_connection_tunnel_configuration_bgp_session_config_customer_interface_ip" {
-  default = "10.0.0.16/31"
-}
-
-variable "ip_sec_connection_tunnel_configuration_bgp_session_config_oracle_interface_ip" {
-  default = "10.0.0.17/31"
-}
+variable "compartment_ocid" {}
 
-variable "ip_sec_connection_tunnel_configuration_display_name" {
-  default = "MyIPSecConnection"
-}
-
-variable "ip_sec_connection_tunnel_configuration_routing" {
-  default = "BGP"
-}
-
-variable "ip_sec_connection_tunnel_configuration_shared_secret" {
-  default = "sharedSecret"
+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_cpe "test_cpe" {
@@ -65,14 +32,17 @@ resource "oci_core_ipsec" "test_ip_sec_connection" {
   compartment_id = "${var.compartment_ocid}"
   cpe_id         = "${oci_core_cpe.test_cpe.id}"
   drg_id         = "${oci_core_drg.test_drg.id}"
-  static_routes  = "${var.ip_sec_connection_static_routes}"
+  static_routes  = ["10.0.0.0/16"]
 
   #Optional
-  cpe_local_identifier      = "${var.ip_sec_connection_cpe_local_identifier}"
-  cpe_local_identifier_type = "${var.ip_sec_connection_cpe_local_identifier_type}"
-  defined_tags              = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.ip_sec_connection_defined_tags_value}")}"
-  display_name              = "${var.ip_sec_connection_display_name}"
-  freeform_tags             = "${var.ip_sec_connection_freeform_tags}"
+  cpe_local_identifier      = "189.44.2.135"
+  cpe_local_identifier_type = "IP_ADDRESS"
+  defined_tags              = "${map("${oci_identity_tag_namespace.tag_namespace1.name}.${oci_identity_tag.tag1.name}", "value")}"
+  display_name              = "MyIPSecConnection"
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
 }
 
 data "oci_core_ipsec_connections" "test_ip_sec_connections" {
@@ -99,12 +69,33 @@ resource "oci_core_ipsec_connection_tunnel_management" "test_ipsec_connection_tu
 
   #Optional
   bgp_session_info {
-    customer_bgp_asn      = "${var.ip_sec_connection_tunnel_configuration_bgp_session_config_customer_bgp_asn}"
-    customer_interface_ip = "${var.ip_sec_connection_tunnel_configuration_bgp_session_config_customer_interface_ip}"
-    oracle_interface_ip   = "${var.ip_sec_connection_tunnel_configuration_bgp_session_config_oracle_interface_ip}"
+    customer_bgp_asn      = "1587232876"
+    customer_interface_ip = "10.0.0.16/31"
+    oracle_interface_ip   = "10.0.0.17/31"
   }
 
-  display_name  = "${var.ip_sec_connection_tunnel_configuration_display_name}"
-  routing       = "${var.ip_sec_connection_tunnel_configuration_routing}"
-  shared_secret = "${var.ip_sec_connection_tunnel_configuration_shared_secret}"
+  display_name  = "MyIPSecConnection"
+  routing       = "BGP"
+  shared_secret = "sharedSecret"
+}
+
+resource "oci_identity_tag_namespace" "tag_namespace1" {
+  #Required
+  compartment_id = "${var.tenancy_ocid}"
+  description    = "Just a test"
+  name           = "testexamples-tag-namespace"
+}
+
+resource "oci_identity_tag" "tag1" {
+  #Required
+  description      = "tf example tag"
+  name             = "tf-example-tag"
+  tag_namespace_id = "${oci_identity_tag_namespace.tag_namespace1.id}"
+}
+
+resource "oci_identity_tag" "tag2" {
+  #Required
+  description      = "tf example tag 2"
+  name             = "tf-example-tag-2"
+  tag_namespace_id = "${oci_identity_tag_namespace.tag_namespace1.id}"
 }

examples/networking/ipsec_connections/ipsec_connection.tf

@@ -1,15 +1,13 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
-/*
- * Sets up a VCN with:
- * - NAT gateway
- * - bastion subnet and bastion instance
- * - private subnet that routes all traffic to the NAT
- * - a test instance in the private subnet
- *
- * After applying, you should be able to ssh into the private instance
- * via the bastion and verify internet access via the NAT.
- */
+# Sets up a VCN with:
+# - NAT gateway
+# - bastion subnet and bastion instance
+# - private subnet that routes all traffic to the NAT
+# - a test instance in the private subnet
+#
+# After applying, you should be able to ssh into the private instance
+# via the bastion and verify internet access via the NAT.
 
 variable "tenancy_ocid" {}
 variable "user_ocid" {}