Merge pull request #1105 from terraform-providers/release_merge_v3.83.0

Candidate for release_v3.83.0

Author: yifnfan

CHANGELOG.md

@@ -1,4 +1,17 @@
 ## 3.83.0 (Unreleased)
+
+### Added
+- Support for Metering Computation service
+- Support for Oracle Cloud VmWare Provisioning service
+- Support for Virtual LAN in core service
+- Support for HTTP Header in load balancer rule set
+- Support for new optional parameters in `oci_core_instance_configuration`
+- Support for DBaaS One-off patching
+- Support resource discovery and import for `ons_subscriptions` resource
+- Support resource discovery for `oci_objectstorage_replication_policy` resource
+- Support for specifying the retry timeout duration for API errors in resource discovery using argument `retry_timeout` in the export command. The default retry duration is 15s.
+- Support for `MySQL` resource discovery
+
 ## 3.82.0 (June 24, 2020)
 
 ### Added

examples/compute/instance_pool/instance_pool.tf

@@ -136,6 +136,25 @@ resource "oci_core_instance_configuration" "test_instance_configuration" {
   instance_details {
     instance_type = "compute"
 
+    block_volumes {
+      create_details {
+        compartment_id      = "${var.compartment_ocid}"
+        display_name        = "TestCreateVolumeDetails"
+        availability_domain = "${data.oci_identity_availability_domain.ad.name}"
+        size_in_gbs         = 50
+        vpus_per_gb         = 2
+      }
+
+      attach_details {
+        type                                = "paravirtualized"
+        display_name                        = "TestAttachVolumeDetails"
+        is_read_only                        = true
+        device                              = "TestDeviceName"
+        is_pv_encryption_in_transit_enabled = true
+        is_shareable                        = true
+      }
+    }
+
     launch_details {
       compartment_id                      = "${var.compartment_ocid}"
       ipxe_script                         = "ipxeScript"

examples/compute/vlan/vlan.tf

@@ -0,0 +1,76 @@
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_ocid" {}
+variable "region" {}
+
+variable defined_tag_namespace_name {
+  default = ""
+}
+
+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_internet_gateway" "test_internet_gateway" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_network_security_group" "test_network_security_group" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_route_table" "test_route_table" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+}
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = "${var.tenancy_ocid}"
+}
+
+resource "oci_identity_tag_namespace" "tag-namespace1" {
+  compartment_id = "${var.tenancy_ocid}"
+  description    = "example tag namespace"
+  name           = "${var.defined_tag_namespace_name != "" ? var.defined_tag_namespace_name : "example-tag-namespace-all"}"
+
+  is_retired = false
+}
+
+resource "oci_identity_tag" "tag1" {
+  description      = "example tag"
+  name             = "example-tag"
+  tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace1.id}"
+  is_retired       = false
+}
+
+resource "oci_core_vlan" "test_vlan" {
+  #Required
+  availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
+  cidr_block          = "10.0.1.0/24"
+  compartment_id      = "${var.compartment_ocid}"
+  vcn_id              = "${oci_core_vcn.test_vcn.id}"
+
+  #Optional
+  display_name   = "displayName"
+  nsg_ids        = ["${oci_core_network_security_group.test_network_security_group.id}"]
+  route_table_id = "${oci_core_route_table.test_route_table.id}"
+  vlan_tag       = "10"
+  defined_tags   = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}"
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+}

examples/load_balancer/lb_full/lb_full.tf

@@ -399,6 +399,12 @@ resource "oci_load_balancer_rule_set" "test_rule_set" {
     response_code = 302
   }
 
+  items {
+    action                         = "HTTP_HEADER"
+    are_invalid_characters_allowed = true
+    http_large_header_size_in_kb   = 8
+  }
+
   load_balancer_id = "${oci_load_balancer.lb1.id}"
   name             = "example_rule_set_name"
 }

examples/metering_computation/main.tf

@@ -0,0 +1,61 @@
+// Copyright (c) 2017, 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+
+// These variables would commonly be defined as environment variables or sourced in a .env file
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_ocid" {}
+variable "region" {}
+
+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}"
+}
+
+variable "time_usage_ended" {}
+variable "time_usage_started" {}
+variable "dimensions_value" {}
+
+resource "oci_metering_computation_usage" "test_usage" {
+  #Required
+  granularity        = "DAILY"
+  tenant_id          = "${var.tenancy_ocid}"
+  time_usage_ended   = "${var.time_usage_ended}"
+  time_usage_started = "${var.time_usage_started}"
+
+  #Optional
+  compartment_depth = 1
+
+  filter = <<EOF
+{
+        "operator": "AND",
+        "dimensions": [],
+        "tags": [],
+        "filters": [
+            {
+				"operator": "OR",
+                "dimensions": [
+				    {
+                        "key": "compartmentName",
+                        "value": "${var.dimensions_value}"
+					}
+                ],
+                "filters": [],
+                "tags": []
+		    }
+        ]
+}
+EOF
+
+  group_by   = ["service"]
+  query_type = "COST"
+}
+
+data "oci_metering_computation_configuration" "test_configuration" {
+  tenant_id = "${var.tenancy_ocid}"
+}