Release v3.52.0

Release v3.52.0

Author: jotruon

CHANGELOG.md

@@ -1,4 +1,16 @@
-## 3.51.1 (Unreleased)
+## 3.52.0 (Unreleased)
+
+### Added
+- Support for specifying compartment ID for container engine options APIs
+- Support for console access to APEX and SQL Dev in autonomous databases
+- Support for Volume Performance Units in `oci_core_boot_volume` and `oci_core_volume` resources
+- Support for data safe integration in `oci_database_autonomous_database` resource
+
+### Fixed
+- Fixed `time_deletion_of_free_autonomous_database` and `time_reclamation_of_free_autonomous_database`attributes in `oci_database_autonomous_database` resource
+- Fix `ssh_public_keys` for DB systems and vm clusters, so that they are TypeSet. Otherwise, the service may return SSH keys out of order, which could result in plan diffs.
+- Extend the default operation timeout for DB backups to 1 hour, as current default of 15 minutes could possibly lead to early timeout.
+
 ## 3.51.0 (November 06, 2019)
 
 ### Added

examples/load_balancer/lb_full/lb_full.tf

@@ -364,6 +364,26 @@ resource "oci_load_balancer_rule_set" "test_rule_set" {
     }
   }
 
+  items {
+    action = "REDIRECT"
+
+    conditions {
+      attribute_name  = "PATH"
+      attribute_value = "/example"
+      operator        = "FORCE_LONGEST_PREFIX_MATCH"
+    }
+
+    redirect_uri {
+      protocol = "{protocol}"
+      host     = "in{host}"
+      port     = 8081
+      path     = "{path}/video"
+      query    = "?lang=en"
+    }
+
+    response_code = 302
+  }
+
   load_balancer_id = "${oci_load_balancer.lb1.id}"
   name             = "example_rule_set_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 v12.3.0+incompatible
+	github.com/oracle/oci-go-sdk v12.4.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

@@ -349,6 +349,8 @@ github.com/oracle/oci-go-sdk v12.2.0+incompatible h1:z5FqDVTRHSYzR9td6FdQpFw2M3M
 github.com/oracle/oci-go-sdk v12.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v12.3.0+incompatible h1:hkX0CRD+OmK3+wCbKItck+zgqD+AiPcfxBXnmdgZPlA=
 github.com/oracle/oci-go-sdk v12.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v12.4.0+incompatible h1:W/MTcMs9HOnqQA8+v4xfLxMWN1VN3Q/UtrhQiJK6WHU=
+github.com/oracle/oci-go-sdk v12.4.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/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

oci/audit_events_data_source.go

@@ -560,9 +560,9 @@ func responseToMap(obj *oci_audit.Response) map[string]interface{} {
 func stateChangeToMap(obj *oci_audit.StateChange) map[string]interface{} {
 	result := map[string]interface{}{}
 
-	result["current"] = obj.Current
+	result["current"] = genericMapToJsonMap(obj.Current)
 
-	result["previous"] = obj.Previous
+	result["previous"] = genericMapToJsonMap(obj.Previous)
 
 	return result
 }

oci/containerengine_cluster_option_data_source.go

@@ -17,6 +17,10 @@ func ContainerengineClusterOptionDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			// Computed
 			"kubernetes_versions": {
 				Type:     schema.TypeList,
@@ -55,6 +59,11 @@ func (s *ContainerengineClusterOptionDataSourceCrud) Get() error {
 		request.ClusterOptionId = &tmp
 	}
 
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "containerengine")
 
 	response, err := s.Client.GetClusterOptions(context.Background(), request)

oci/containerengine_cluster_option_test.go

@@ -16,6 +16,7 @@ import (
 var (
 	clusterOptionSingularDataSourceRepresentation = map[string]interface{}{
 		"cluster_option_id": Representation{repType: Required, create: `all`},
+		"compartment_id":    Representation{repType: Optional, create: `${var.compartment_id}`},
 	}
 
 	ClusterOptionResourceConfig = ""
@@ -46,6 +47,19 @@ func TestContainerengineClusterOptionResource_basic(t *testing.T) {
 					compartmentIdVariableStr + ClusterOptionResourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "cluster_option_id"),
+
+					resource.TestMatchResourceAttr(singularDatasourceName, "kubernetes_versions.#", regexp.MustCompile("[1-9][0-9]*")),
+				),
+			},
+			// verify singular datasource with compartment_id
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Optional, Create, clusterOptionSingularDataSourceRepresentation) +
+					compartmentIdVariableStr + ClusterOptionResourceConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "cluster_option_id"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+
 					resource.TestMatchResourceAttr(singularDatasourceName, "kubernetes_versions.#", regexp.MustCompile("[1-9][0-9]*")),
 				),
 			},

oci/containerengine_node_pool_option_data_source.go

@@ -13,6 +13,10 @@ func ContainerengineNodePoolOptionDataSource() *schema.Resource {
 	return &schema.Resource{
 		Read: readSingularContainerengineNodePoolOption,
 		Schema: map[string]*schema.Schema{
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"node_pool_option_id": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -64,6 +68,11 @@ func (s *ContainerengineNodePoolOptionDataSourceCrud) VoidState() {
 func (s *ContainerengineNodePoolOptionDataSourceCrud) Get() error {
 	request := oci_containerengine.GetNodePoolOptionsRequest{}
 
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
 	if nodePoolOptionId, ok := s.D.GetOkExists("node_pool_option_id"); ok {
 		tmp := nodePoolOptionId.(string)
 		request.NodePoolOptionId = &tmp

oci/containerengine_node_pool_option_test.go

@@ -16,6 +16,7 @@ import (
 var (
 	nodePoolOptionSingularDataSourceRepresentation = map[string]interface{}{
 		"node_pool_option_id": Representation{repType: Required, create: `all`},
+		"compartment_id":      Representation{repType: Optional, create: `${var.compartment_id}`},
 	}
 
 	NodePoolOptionResourceConfig = ""
@@ -47,6 +48,20 @@ func TestContainerengineNodePoolOptionResource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "node_pool_option_id"),
 
+					resource.TestMatchResourceAttr(singularDatasourceName, "images.#", regexp.MustCompile("[1-9][0-9]*")),
+					resource.TestMatchResourceAttr(singularDatasourceName, "kubernetes_versions.#", regexp.MustCompile("[1-9][0-9]*")),
+					resource.TestMatchResourceAttr(singularDatasourceName, "shapes.#", regexp.MustCompile("[1-9][0-9]*")),
+				),
+			},
+			// verify singular datasource
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_containerengine_node_pool_option", "test_node_pool_option", Optional, Create, nodePoolOptionSingularDataSourceRepresentation) +
+					compartmentIdVariableStr + NodePoolOptionResourceConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "node_pool_option_id"),
+
 					resource.TestMatchResourceAttr(singularDatasourceName, "images.#", regexp.MustCompile("[1-9][0-9]*")),
 					resource.TestMatchResourceAttr(singularDatasourceName, "kubernetes_versions.#", regexp.MustCompile("[1-9][0-9]*")),
 					resource.TestMatchResourceAttr(singularDatasourceName, "shapes.#", regexp.MustCompile("[1-9][0-9]*")),

oci/core_boot_volume_data_source.go

@@ -125,5 +125,9 @@ func (s *CoreBootVolumeDataSourceCrud) SetData() error {
 		s.D.Set("volume_group_id", *s.Res.VolumeGroupId)
 	}
 
+	if s.Res.VpusPerGB != nil {
+		s.D.Set("vpus_per_gb", strconv.FormatInt(*s.Res.VpusPerGB, 10))
+	}
+
 	return nil
 }