Merge pull request #1405 from terraform-providers/release_gh

Releasing version 4.34.0

Author: rashik-bhasin

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.34.0 (Unreleased)
+
+### Added
+- Support for Starter license type for OCE
+
 ## 4.33.0 (June 30, 2021)
 
 ### Added

examples/object_storage/object.tf

@@ -99,7 +99,7 @@ data "oci_objectstorage_objects" "objects1" {
 data "oci_objectstorage_object" "object" {
   namespace = data.oci_objectstorage_namespace.ns.namespace
   bucket    = oci_objectstorage_bucket.bucket1.name
-  object    = "index.html"
+  object    = oci_objectstorage_object.object1.object
 }
 
 output "object_data" {

examples/object_storage/preauthrequest.tf

@@ -16,7 +16,7 @@ resource "oci_objectstorage_preauthrequest" "bucket_par" {
 resource "oci_objectstorage_preauthrequest" "object_par" {
   namespace    = data.oci_objectstorage_namespace.ns.namespace
   bucket       = oci_objectstorage_bucket.bucket1.name
-  object       = oci_objectstorage_object.object1.object
+  object_name  = oci_objectstorage_object.object1.object
   name         = "objectPar"
   access_type  = "ObjectRead"
   time_expires = "2021-12-29T23:00:00Z"

examples/ocvp/main.tf

@@ -364,7 +364,7 @@ resource "oci_ocvp_sddc" "test_sddc" {
   provisioning_subnet_id      = oci_core_subnet.test_provisioning_subnet.id
   ssh_authorized_keys         = "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"
   vmotion_vlan_id             = oci_core_vlan.test_vmotion_net_vlan.id
-  vmware_software_version     = "${lookup(data.oci_ocvp_supported_vmware_software_versions.test_supported_vmware_software_versions.items[2], "version")}"
+  vmware_software_version     = "7.0 update 2"
   vsan_vlan_id                = oci_core_vlan.test_vsan_net_vlan.id
   vsphere_vlan_id             = oci_core_vlan.test_vsphere_net_vlan.id
   // Optional

examples/opsi/enterprise_manager_bridge/enterprise_manager_bridge.tf

@@ -72,10 +72,12 @@ variable "enterprise_manager_bridge_state" {
 resource "oci_opsi_enterprise_manager_bridge" "test_enterprise_manager_bridge" {
   #Required
   compartment_id             = var.compartment_ocid
-  defined_tags               = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.enterprise_manager_bridge_defined_tags_value}")}"
   display_name               = var.enterprise_manager_bridge_display_name
-  freeform_tags              = var.enterprise_manager_bridge_freeform_tags
   object_storage_bucket_name = oci_objectstorage_bucket.test_bucket.name
+
+  #Optional
+  defined_tags               = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.enterprise_manager_bridge_defined_tags_value}")}"
+  freeform_tags              = var.enterprise_manager_bridge_freeform_tags
   description 		     = var.enterprise_manager_bridge_description
 }
 

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
 	github.com/hashicorp/terraform-exec v0.13.3
 	github.com/hashicorp/terraform-plugin-sdk v1.17.2
-	github.com/oracle/oci-go-sdk/v43 v43.0.0
+	github.com/oracle/oci-go-sdk/v43 v43.1.0
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/mod v0.3.0
 	gopkg.in/yaml.v2 v2.3.0

go.sum

@@ -302,8 +302,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oracle/oci-go-sdk/v43 v43.0.0 h1:7QVyGwU84uKJuLrvKFUJnhoUhkVewTa+oixGDSmR518=
-github.com/oracle/oci-go-sdk/v43 v43.0.0/go.mod h1:418EOI7+XCK1619VgFBYprjJO9TTR0HlQ/JX2ftTUPM=
+github.com/oracle/oci-go-sdk/v43 v43.1.0 h1:hbuZzPsgfjUSvxjGfquKpenSxFThszBc2fPr7stThWc=
+github.com/oracle/oci-go-sdk/v43 v43.1.0/go.mod h1:418EOI7+XCK1619VgFBYprjJO9TTR0HlQ/JX2ftTUPM=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

oci/artifacts_generic_artifact_resource.go

@@ -153,17 +153,29 @@ func (s *ArtifactsGenericArtifactResourceCrud) DeletedTarget() []string {
 	}
 }
 
-func (s *ArtifactsGenericArtifactResourceCrud) Get() error {
-	request := oci_artifacts.GetGenericArtifactRequest{}
+func (s *ArtifactsGenericArtifactResourceCrud) Create() error {
+	request := oci_artifacts.UpdateGenericArtifactRequest{}
 
 	if artifactId, ok := s.D.GetOkExists("artifact_id"); ok {
 		tmp := artifactId.(string)
 		request.ArtifactId = &tmp
 	}
 
+	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
+		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
+		if err != nil {
+			return err
+		}
+		request.DefinedTags = convertedDefinedTags
+	}
+
+	if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
+		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "artifacts")
 
-	response, err := s.Client.GetGenericArtifact(context.Background(), request)
+	response, err := s.Client.UpdateGenericArtifact(context.Background(), request)
 	if err != nil {
 		return err
 	}
@@ -172,29 +184,17 @@ func (s *ArtifactsGenericArtifactResourceCrud) Get() error {
 	return nil
 }
 
-func (s *ArtifactsGenericArtifactResourceCrud) Create() error {
-	request := oci_artifacts.UpdateGenericArtifactRequest{}
+func (s *ArtifactsGenericArtifactResourceCrud) Get() error {
+	request := oci_artifacts.GetGenericArtifactRequest{}
 
 	if artifactId, ok := s.D.GetOkExists("artifact_id"); ok {
 		tmp := artifactId.(string)
 		request.ArtifactId = &tmp
 	}
 
-	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
-		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
-		if err != nil {
-			return err
-		}
-		request.DefinedTags = convertedDefinedTags
-	}
-
-	if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
-		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
-	}
-
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "artifacts")
 
-	response, err := s.Client.UpdateGenericArtifact(context.Background(), request)
+	response, err := s.Client.GetGenericArtifact(context.Background(), request)
 	if err != nil {
 		return err
 	}

oci/core_dhcp_options_resource_test.go

@@ -256,7 +256,7 @@ func TestResourceCoreDHCPOptions_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("oci_core_default_dhcp_options.default", "time_created"),
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "state", string(core.DhcpOptionsLifecycleStateAvailable)),
 					resource.TestCheckNoResourceAttr("oci_core_default_dhcp_options.default", "vcn_id"),
-					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "compartment_id", compartmentIdU),
+					resource.TestCheckResourceAttrSet("oci_core_default_dhcp_options.default", "compartment_id"),
 					func(s *terraform.State) (err error) {
 						if resDefaultId, err = fromInstanceState(s, "oci_core_default_dhcp_options.default", "id"); err != nil {
 							return err

oci/crud_helpers.go

@@ -848,6 +848,7 @@ func convertResourceFieldsToDatasourceFields(resourceSchema *schema.Resource) *s
 		fieldSchema.ValidateFunc = nil
 		fieldSchema.ConflictsWith = nil
 		fieldSchema.Default = nil
+		fieldSchema.DefaultFunc = nil
 		if fieldSchema.Type == schema.TypeSet {
 			fieldSchema.Type = schema.TypeList
 			fieldSchema.Set = nil