Candidate for release_v3.63.0

Candidate for release_v3.63.0

Author: jotruon

CHANGELOG.md

@@ -1,4 +1,12 @@
 ## 3.63.0 (Unreleased)
+
+### Added
+- Support update DNS name for Events
+- Support for Oracle NoSQL Database Cloud
+- Support for exporting `pay_go_strategy` and `package_type` attributes in `oci_marketplace_listing_package`, `oci_marketplace_listing_packages` datasources
+- Support for `storage_management` attribute in `oci_database_db_versions` datasource
+- Support for `instance_usage_type` attribute in `oci_oce_oce_instance` resource
+
 ## 3.62.0 (February 12, 2020)
 
 ### Added

examples/nosql/main.tf

@@ -0,0 +1,76 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+variable "table_ddl_statement" {
+  default = "CREATE TABLE IF NOT EXISTS test_table(id INTEGER, name STRING, age STRING, info JSON, PRIMARY KEY(SHARD(id)))"
+}
+
+variable "index_keys_column_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}"
+}
+
+resource "oci_nosql_table" "test_table" {
+  #Required
+  compartment_id = "${var.compartment_id}"
+  ddl_statement  = "${var.table_ddl_statement}"
+  name           = "test_table"
+
+  table_limits {
+    #Required
+    max_read_units     = "10"
+    max_storage_in_gbs = "10"
+    max_write_units    = "10"
+  }
+}
+
+resource "oci_nosql_index" "test_index" {
+  #Required
+  keys {
+    #Required
+    column_name = "${var.index_keys_column_name}"
+  }
+
+  name             = "test_index"
+  table_name_or_id = "${oci_nosql_table.test_table.id}"
+}
+
+data "oci_nosql_tables" "test_tables" {
+  #Required
+  compartment_id = "${var.compartment_id}"
+
+  filter {
+    name   = "id"
+    values = ["${oci_nosql_table.test_table.id}"]
+  }
+}
+
+output "table_name" {
+  value = [
+    "${data.oci_nosql_tables.test_tables.table_collection.0.name}",
+  ]
+}
+
+data "oci_nosql_indexes" "test_indexes" {
+  #Required
+  table_name_or_id = "${oci_nosql_table.test_table.id}"
+}
+
+output "index_name" {
+  value = [
+    "${data.oci_nosql_indexes.test_indexes.index_collection.0.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.5.0+incompatible
+	github.com/oracle/oci-go-sdk v15.6.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

@@ -352,6 +352,8 @@ github.com/oracle/oci-go-sdk v15.4.0+incompatible h1:340zNuNGctKSrh/hX9dgfstETss
 github.com/oracle/oci-go-sdk v15.4.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v15.5.0+incompatible h1:GdG5NWt+lhv0+WslpaF1dbz8KkScYba+zLdr3Nf0ElU=
 github.com/oracle/oci-go-sdk v15.5.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v15.6.0+incompatible h1:6kX7J6cJnFeWwCPUfiywDD5joxx6qQbJ0SyqnaaKlqU=
+github.com/oracle/oci-go-sdk v15.6.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/database_db_version_test.go

@@ -22,6 +22,9 @@ var (
 	dbVersionDataSourceRepresentationWithDbSystemShapeOptional = representationCopyWithNewProperties(dbVersionDataSourceRepresentationRequiredOnly, map[string]interface{}{
 		"db_system_shape": Representation{repType: Optional, create: `BM.DenseIO2.52`},
 	})
+	dbVersionDataSourceRepresentationWithStorageManagementOptional = representationCopyWithNewProperties(dbVersionDataSourceRepresentationRequiredOnly, map[string]interface{}{
+		"storage_management": Representation{repType: Optional, create: `ASM`},
+	})
 
 	DbVersionResourceConfig = DbSystemResourceConfig
 )
@@ -50,6 +53,7 @@ func TestDatabaseDbVersionResource_basic(t *testing.T) {
 					generateDataSourceFromRepresentationMap("oci_database_db_versions", "test_db_versions", Required, Create, dbVersionDataSourceRepresentationRequiredOnly) +
 					generateDataSourceFromRepresentationMap("oci_database_db_versions", "test_db_versions_by_db_system_id", Optional, Create, dbVersionDataSourceRepresentationWithDbSystemIdOptional) +
 					generateDataSourceFromRepresentationMap("oci_database_db_versions", "test_db_versions_by_db_system_shape", Optional, Create, dbVersionDataSourceRepresentationWithDbSystemShapeOptional) +
+					generateDataSourceFromRepresentationMap("oci_database_db_versions", "test_db_versions_by_storage_management", Optional, Create, dbVersionDataSourceRepresentationWithStorageManagementOptional) +
 					compartmentIdVariableStr + DbVersionResourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
@@ -68,6 +72,12 @@ func TestDatabaseDbVersionResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName+"_by_db_system_shape", "db_versions.0.is_latest_for_major_version"),
 					resource.TestCheckResourceAttrSet(datasourceName+"_by_db_system_shape", "db_versions.0.supports_pdb"),
 					resource.TestCheckResourceAttrSet(datasourceName+"_by_db_system_shape", "db_versions.0.version"),
+
+					resource.TestCheckResourceAttr(datasourceName+"_by_storage_management", "storage_management", "ASM"),
+					resource.TestCheckResourceAttrSet(datasourceName+"_by_storage_management", "db_versions.#"),
+					resource.TestCheckResourceAttrSet(datasourceName+"_by_storage_management", "db_versions.0.is_latest_for_major_version"),
+					resource.TestCheckResourceAttrSet(datasourceName+"_by_storage_management", "db_versions.0.supports_pdb"),
+					resource.TestCheckResourceAttrSet(datasourceName+"_by_storage_management", "db_versions.0.version"),
 				),
 			},
 		},

oci/database_db_versions_data_source.go

@@ -26,6 +26,10 @@ func DatabaseDbVersionsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"storage_management": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"db_versions": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -91,6 +95,10 @@ func (s *DatabaseDbVersionsDataSourceCrud) Get() error {
 		request.DbSystemShape = &tmp
 	}
 
+	if storageManagement, ok := s.D.GetOkExists("storage_management"); ok {
+		request.StorageManagement = oci_database.DbSystemOptionsStorageManagementEnum(storageManagement.(string))
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "database")
 
 	response, err := s.Client.ListDbVersions(context.Background(), request)

oci/events_rule_resource.go

@@ -512,17 +512,15 @@ func EventsActionToMap(obj oci_events.Action) map[string]interface{} {
 			result["id"] = string(*v.Id)
 		}
 
+		if v.IsEnabled != nil {
+			result["is_enabled"] = bool(*v.IsEnabled)
+		}
+
 		if v.LifecycleMessage != nil {
 			result["lifecycle_message"] = string(*v.LifecycleMessage)
 		}
 
 		result["state"] = string(v.LifecycleState)
-		if v.LifecycleState == oci_events.ActionLifecycleStateActive {
-			result["is_enabled"] = true
-		}
-		if v.LifecycleState == oci_events.ActionLifecycleStateInactive {
-			result["is_enabled"] = false
-		}
 	case oci_events.NotificationServiceAction:
 		result["action_type"] = "ONS"
 
@@ -538,17 +536,15 @@ func EventsActionToMap(obj oci_events.Action) map[string]interface{} {
 			result["id"] = string(*v.Id)
 		}
 
+		if v.IsEnabled != nil {
+			result["is_enabled"] = bool(*v.IsEnabled)
+		}
+
 		if v.LifecycleMessage != nil {
 			result["lifecycle_message"] = string(*v.LifecycleMessage)
 		}
 
 		result["state"] = string(v.LifecycleState)
-		if v.LifecycleState == oci_events.ActionLifecycleStateActive {
-			result["is_enabled"] = true
-		}
-		if v.LifecycleState == oci_events.ActionLifecycleStateInactive {
-			result["is_enabled"] = false
-		}
 	case oci_events.StreamingServiceAction:
 		result["action_type"] = "OSS"
 
@@ -564,17 +560,15 @@ func EventsActionToMap(obj oci_events.Action) map[string]interface{} {
 			result["id"] = string(*v.Id)
 		}
 
+		if v.IsEnabled != nil {
+			result["is_enabled"] = bool(*v.IsEnabled)
+		}
+
 		if v.LifecycleMessage != nil {
 			result["lifecycle_message"] = string(*v.LifecycleMessage)
 		}
 
 		result["state"] = string(v.LifecycleState)
-		if v.LifecycleState == oci_events.ActionLifecycleStateActive {
-			result["is_enabled"] = true
-		}
-		if v.LifecycleState == oci_events.ActionLifecycleStateInactive {
-			result["is_enabled"] = false
-		}
 	default:
 		log.Printf("[WARN] Received 'action_type' of unknown type %v", obj)
 		return nil

oci/marketplace_listing_data_source.go

@@ -662,6 +662,8 @@ func LinkToMap(obj oci_marketplace.Link) map[string]interface{} {
 		result["href"] = string(*obj.Href)
 	}
 
+	result["rel"] = string(obj.Rel)
+
 	return result
 }
 

oci/marketplace_listing_package_data_source.go

@@ -53,6 +53,10 @@ func MarketplaceListingPackageDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"pay_go_strategy": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"rate": {
 							Type:     schema.TypeFloat,
 							Computed: true,
@@ -302,6 +306,8 @@ func (s *MarketplaceListingPackageDataSourceCrud) SetData() error {
 func OrchestrationVariableToMap(obj oci_marketplace.OrchestrationVariable) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	result["data_type"] = string(obj.DataType)
+
 	if obj.DefaultValue != nil {
 		result["default_value"] = string(*obj.DefaultValue)
 	}
@@ -328,8 +334,15 @@ func OrchestrationVariableToMap(obj oci_marketplace.OrchestrationVariable) map[s
 func PricingModelToMap(obj *oci_marketplace.PricingModel) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	result["currency"] = string(obj.Currency)
+
+	result["pay_go_strategy"] = string(obj.PayGoStrategy)
+
 	if obj.Rate != nil {
 		result["rate"] = float32(*obj.Rate)
 	}
+
+	result["type"] = string(obj.Type)
+
 	return result
 }

oci/marketplace_listing_package_test.go

@@ -59,6 +59,7 @@ func TestMarketplaceListingPackageResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "listing_packages.0.listing_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "listing_packages.0.resource_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "listing_packages.0.time_created"),
+					resource.TestCheckResourceAttrSet(datasourceName, "listing_packages.0.package_type"),
 					resource.TestCheckResourceAttrSet(datasourceName, "listing_packages.0.package_version"),
 				),
 			},
@@ -75,6 +76,9 @@ func TestMarketplaceListingPackageResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "app_catalog_listing_resource_version"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "package_type"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "pricing.#", "1"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "pricing.0.rate"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "pricing.0.type"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "pricing.0.currency"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "resource_id"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "version"),