Merge pull request #1120 from terraform-providers/release_merge_v3.86.0

Candidate for release_v3.86.0

Author: abhilash-av

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 3.86.0 (Unreleased)
+
+### Added
+- Support for BYOL in `oci_oce_oce_instance`
+
 ## 3.85.0 (July 15, 2020)
 
 ### Added

examples/oce/main.tf

@@ -33,12 +33,13 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   tenancy_name             = "${var.tenancy_name}"
 
   #optional
-  freeform_tags        = "${map("freeformkey", "freeformvalue")}"
-  description          = "description"
-  instance_access_type = "PUBLIC"
-  instance_usage_type  = "NONPRIMARY"
-  upgrade_schedule     = "UPGRADE_IMMEDIATELY"
-  waf_primary_domain   = "oracle.com"
+  freeform_tags         = "${map("freeformkey", "freeformvalue")}"
+  description           = "description"
+  instance_access_type  = "PUBLIC"
+  instance_usage_type   = "NONPRIMARY"
+  instance_license_type = "BYOL"
+  upgrade_schedule      = "UPGRADE_IMMEDIATELY"
+  waf_primary_domain    = "oracle.com"
 }
 
 data "oci_oce_oce_instances" "test_oce_instances" {

examples/storage/fss/variables.tf

@@ -14,9 +14,7 @@ variable "ssh_public_key" {}
 
 variable "ssh_private_key" {}
 
-variable "api_public_key" {
-  default = "-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fGHcxbEs3VaWoKaGUiPHGZ5ILiOXCcWN4nOgLr6CSzUjtgjmN3aA6rsT2mYiD+M5EecDbEUMectUhNtLl5LPABN9kpjuR0zxCJXvYYQiCBtdjb1/YxrZI9T/9Jtd+cTabCahJHR/cR8jFmvO4cKJCa/0+Y00zvktrqniHIn3edGAKC4Ttlwj/1NqT0ZVePMXg3rWHPsIW6ONfdn6FNfMet8Qa8K3C9xVvzImlYx8PQBy/44Ilu5T3A+puwb2QMeZnQZGDALOY4MvrBTTA1TdjFpg1NChj2rGYzreysqlnKFu+1qg64wel39kHkppz4Fv2vaLXF9qIeDjeo3G4sHQIDAQAB-----END PUBLIC KEY-----"
-}
+variable "api_public_key" {}
 
 variable "my_vcn-cidr" {
   default = "10.0.0.0/16"

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v21.3.0+incompatible
+	github.com/oracle/oci-go-sdk v21.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

@@ -461,6 +461,8 @@ github.com/oracle/oci-go-sdk v21.2.0+incompatible h1:iaZTdpIQjd73yYCju+s+3dgG49Z
 github.com/oracle/oci-go-sdk v21.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
 github.com/oracle/oci-go-sdk v21.3.0+incompatible h1:MB9osCinobSml7oDBfph+7Jv9M1yqH4I/iC/BJuURPM=
 github.com/oracle/oci-go-sdk v21.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v21.4.0+incompatible h1:ORX+RXBuG/INBs+rgx6S3qoShEZ5+rwEEyRn2s6bPiw=
+github.com/oracle/oci-go-sdk v21.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 h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

oci/audit_configuration_test.go

@@ -24,7 +24,7 @@ var (
 
 	configurationRepresentation = map[string]interface{}{
 		"compartment_id":        Representation{repType: Required, create: `${var.tenancy_ocid}`},
-		"retention_period_days": Representation{repType: Required, create: `100`, update: `91`},
+		"retention_period_days": Representation{repType: Required, create: `365`},
 	}
 
 	ConfigurationResourceDependencies = ""
@@ -57,7 +57,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Required, Create, configurationRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
-					resource.TestCheckResourceAttr(resourceName, "retention_period_days", "100"),
+					resource.TestCheckResourceAttr(resourceName, "retention_period_days", "365"),
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
@@ -77,7 +77,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Optional, Update, configurationRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", tenancyId),
-					resource.TestCheckResourceAttr(resourceName, "retention_period_days", "91"),
+					resource.TestCheckResourceAttr(resourceName, "retention_period_days", "365"),
 
 					func(s *terraform.State) (err error) {
 						resId2, err = fromInstanceState(s, resourceName, "id")
@@ -96,7 +96,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", tenancyId),
 
-					resource.TestCheckResourceAttr(singularDatasourceName, "retention_period_days", "91"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "retention_period_days", "365"),
 				),
 			},
 		},

oci/budget_alert_rule_test.go

@@ -67,6 +67,7 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
 
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+	tenancyId := getEnvSettingWithBlankDefault("tenancy_ocid")
 
 	resourceName := "oci_budget_alert_rule.test_alert_rule"
 	datasourceName := "data.oci_budget_alert_rules.test_alert_rules"
@@ -129,7 +130,7 @@ func TestBudgetAlertRuleResource_basic(t *testing.T) {
 						compositeId = "budgets/" + budgetId + "/alertRules/" + resId
 						log.Printf("[DEBUG] Composite ID to import: %s", compositeId)
 						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
-							if errExport := testExportCompartmentWithResourceName(&compositeId, &compartmentId, resourceName); errExport != nil {
+							if errExport := testExportCompartmentWithResourceName(&compositeId, &tenancyId, resourceName); errExport != nil {
 								return errExport
 							}
 						}

oci/budget_budget_test.go

@@ -304,7 +304,7 @@ func TestBudgetBudgetResource_basic(t *testing.T) {
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
 						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
-							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+							if errExport := testExportCompartmentWithResourceName(&resId, &tenancyId, resourceName); errExport != nil {
 								return errExport
 							}
 						}

oci/core_dhcp_options_resource_test.go

@@ -556,22 +556,13 @@ func TestResourceCoreDHCPOptions_changeOptionsOrder(t *testing.T) {
   						display_name   = "testDhcpOptions"
 
   						// required
-  						options {
-    						type = "DomainNameServer"
-    						server_type = "VcnLocalPlusInternet"
-  						}
-
   						options {
     						type = "DomainNameServer"
 							server_type = "CustomDnsServer"
     						custom_dns_servers = ["8.8.4.4", "8.8.8.8"]
 						}
 					}`,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					CheckResourceSetContainsElementWithProperties("oci_core_dhcp_options.opt", "options", map[string]string{
-						"type":        "DomainNameServer",
-						"server_type": "VcnLocalPlusInternet",
-					}, []string{}),
 					CheckResourceSetContainsElementWithProperties("oci_core_dhcp_options.opt", "options", map[string]string{
 						"type":                 "DomainNameServer",
 						"server_type":          "CustomDnsServer",
@@ -599,24 +590,12 @@ func TestResourceCoreDHCPOptions_changeOptionsOrder(t *testing.T) {
     						type = "DomainNameServer"
     						server_type = "VcnLocalPlusInternet"
   						}
-
-  						options {
-    						type = "DomainNameServer"
-							server_type = "CustomDnsServer"
-    						custom_dns_servers = ["8.8.8.8", "8.8.4.4"]
-						}
 					}`,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					CheckResourceSetContainsElementWithProperties("oci_core_dhcp_options.opt", "options", map[string]string{
 						"type":        "DomainNameServer",
 						"server_type": "VcnLocalPlusInternet",
 					}, []string{}),
-					CheckResourceSetContainsElementWithProperties("oci_core_dhcp_options.opt", "options", map[string]string{
-						"type":                 "DomainNameServer",
-						"server_type":          "CustomDnsServer",
-						"custom_dns_servers.0": "8.8.8.8",
-						"custom_dns_servers.1": "8.8.4.4",
-					}, []string{}),
 				),
 			},
 		},

oci/core_volume_attachment_resource.go

@@ -279,6 +279,10 @@ func (s *CoreVolumeAttachmentResourceCrud) SetData() error {
 			s.D.Set("is_read_only", *v.IsReadOnly)
 		}
 
+		if v.IsShareable != nil {
+			s.D.Set("is_shareable", *v.IsShareable)
+		}
+
 		s.D.Set("state", v.LifecycleState)
 
 		if v.TimeCreated != nil {
@@ -343,6 +347,10 @@ func (s *CoreVolumeAttachmentResourceCrud) SetData() error {
 			s.D.Set("is_read_only", *v.IsReadOnly)
 		}
 
+		if v.IsShareable != nil {
+			s.D.Set("is_shareable", *v.IsShareable)
+		}
+
 		s.D.Set("state", v.LifecycleState)
 
 		if v.TimeCreated != nil {
@@ -387,6 +395,10 @@ func (s *CoreVolumeAttachmentResourceCrud) SetData() error {
 			s.D.Set("is_read_only", *v.IsReadOnly)
 		}
 
+		if v.IsShareable != nil {
+			s.D.Set("is_shareable", *v.IsShareable)
+		}
+
 		s.D.Set("state", v.LifecycleState)
 
 		if v.TimeCreated != nil {