Merge pull request #1894 from oracle/release_gh

Releasing OCI Terraform Provider v5.2.0
oracle · Jun 21, 2023 · 99c3933 · 99c3933
2 parents cc07929 + 423e759
commit 99c3933
Show file tree

Hide file tree

Showing 431 changed files with 6,947 additions and 475 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.2.0 (June 21, 2023)
+
+### Added
+- Support for ADB-S: Storage Allocation Enhancements
+- validate function for pool state
+- NSG Support for private Database Registrations/Private Endpoints.
+- import dataset feature support
+- Support for ARM Support for Runner Component
+### Bug Fix
+- Corrected outdated documentation for db_name field of the oci_database_autonomous_database resource.
+- Fixed network-source/Domains/Polices resource discovery issue.
+
 ## 5.1.0 (June 14, 2023)
 
 ### Added

diff --git a/examples/dataflow/main.tf b/examples/dataflow/main.tf
@@ -75,6 +75,18 @@ variable "invoke_run_display_name" {
 variable "statement_code" {
 }
 
+
+resource "oci_dataflow_pool" "test_pool" {
+  compartment_id = var.compartment_id
+  description    = "description"
+  display_name   = "pool_name"
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+  configurations = [{shape: "VM.Standard2.1", shapeConfig: {ocpus: 1, memoryInGBs: 15}, min: 0, max: 1}]
+  schedules = [{dayOfWeek: "SUNDAY", startTime: 3}]
+}
+
 resource "oci_dataflow_application" "tf_application" {
   #Required
   compartment_id = var.compartment_id

diff --git a/examples/functions/main.tf b/examples/functions/main.tf
@@ -76,6 +76,7 @@ resource "oci_functions_application" "test_application" {
     domain_id  = var.application_trace_config.domain_id
     is_enabled = var.application_trace_config.is_enabled
   }
+  shape = var.application_shape
 }
 
 data "oci_functions_applications" "test_applications" {

diff --git a/examples/functions/variables.tf b/examples/functions/variables.tf
@@ -99,4 +99,8 @@ variable "pbf_listing_version_id" {
 }
 
 variable "pbf_trigger_name" {
+}
+
+variable "application_shape" {
+  default = "GENERIC_X86"
 }
diff --git a/examples/zips/adm.zip b/examples/zips/adm.zip
diff --git a/examples/zips/aiAnomalyDetection.zip b/examples/zips/aiAnomalyDetection.zip
diff --git a/examples/zips/aiDocument.zip b/examples/zips/aiDocument.zip
diff --git a/examples/zips/aiVision.zip b/examples/zips/aiVision.zip
diff --git a/examples/zips/always_free.zip b/examples/zips/always_free.zip
diff --git a/examples/zips/analytics.zip b/examples/zips/analytics.zip
diff --git a/examples/zips/announcements_service.zip b/examples/zips/announcements_service.zip
diff --git a/examples/zips/api_gateway.zip b/examples/zips/api_gateway.zip
diff --git a/examples/zips/apm.zip b/examples/zips/apm.zip
diff --git a/examples/zips/appmgmt_control.zip b/examples/zips/appmgmt_control.zip
diff --git a/examples/zips/artifacts.zip b/examples/zips/artifacts.zip
diff --git a/examples/zips/audit.zip b/examples/zips/audit.zip
diff --git a/examples/zips/autoscaling.zip b/examples/zips/autoscaling.zip
diff --git a/examples/zips/bastion.zip b/examples/zips/bastion.zip
diff --git a/examples/zips/big_data_service.zip b/examples/zips/big_data_service.zip
diff --git a/examples/zips/blockchain.zip b/examples/zips/blockchain.zip
diff --git a/examples/zips/budget.zip b/examples/zips/budget.zip
diff --git a/examples/zips/certificatesManagement.zip b/examples/zips/certificatesManagement.zip
diff --git a/examples/zips/cloudBridge.zip b/examples/zips/cloudBridge.zip
diff --git a/examples/zips/cloudMigrations.zip b/examples/zips/cloudMigrations.zip
diff --git a/examples/zips/cloudguard.zip b/examples/zips/cloudguard.zip
diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip
diff --git a/examples/zips/computeinstanceagent.zip b/examples/zips/computeinstanceagent.zip
diff --git a/examples/zips/concepts.zip b/examples/zips/concepts.zip
diff --git a/examples/zips/container_engine.zip b/examples/zips/container_engine.zip
diff --git a/examples/zips/container_instances.zip b/examples/zips/container_instances.zip
diff --git a/examples/zips/database.zip b/examples/zips/database.zip
diff --git a/examples/zips/databaseTools.zip b/examples/zips/databaseTools.zip
diff --git a/examples/zips/databasemanagement.zip b/examples/zips/databasemanagement.zip
diff --git a/examples/zips/databasemigration.zip b/examples/zips/databasemigration.zip
diff --git a/examples/zips/datacatalog.zip b/examples/zips/datacatalog.zip
diff --git a/examples/zips/dataflow.zip b/examples/zips/dataflow.zip
diff --git a/examples/zips/dataintegration.zip b/examples/zips/dataintegration.zip
diff --git a/examples/zips/datalabeling.zip b/examples/zips/datalabeling.zip
diff --git a/examples/zips/datasafe.zip b/examples/zips/datasafe.zip
diff --git a/examples/zips/datascience.zip b/examples/zips/datascience.zip
diff --git a/examples/zips/devops.zip b/examples/zips/devops.zip
diff --git a/examples/zips/disaster_recovery.zip b/examples/zips/disaster_recovery.zip
diff --git a/examples/zips/dns.zip b/examples/zips/dns.zip
diff --git a/examples/zips/em_warehouse.zip b/examples/zips/em_warehouse.zip
diff --git a/examples/zips/email.zip b/examples/zips/email.zip
diff --git a/examples/zips/events.zip b/examples/zips/events.zip
diff --git a/examples/zips/fast_connect.zip b/examples/zips/fast_connect.zip
diff --git a/examples/zips/functions.zip b/examples/zips/functions.zip
diff --git a/examples/zips/fusionapps.zip b/examples/zips/fusionapps.zip
diff --git a/examples/zips/goldengate.zip b/examples/zips/goldengate.zip
diff --git a/examples/zips/health_checks.zip b/examples/zips/health_checks.zip
diff --git a/examples/zips/id6.zip b/examples/zips/id6.zip
diff --git a/examples/zips/identity.zip b/examples/zips/identity.zip
diff --git a/examples/zips/identity_data_plane.zip b/examples/zips/identity_data_plane.zip
diff --git a/examples/zips/identity_domains.zip b/examples/zips/identity_domains.zip
diff --git a/examples/zips/integration.zip b/examples/zips/integration.zip
diff --git a/examples/zips/jms.zip b/examples/zips/jms.zip
diff --git a/examples/zips/kms.zip b/examples/zips/kms.zip
diff --git a/examples/zips/license_manager.zip b/examples/zips/license_manager.zip
diff --git a/examples/zips/limits.zip b/examples/zips/limits.zip
diff --git a/examples/zips/load_balancer.zip b/examples/zips/load_balancer.zip
diff --git a/examples/zips/log_analytics.zip b/examples/zips/log_analytics.zip
diff --git a/examples/zips/logging.zip b/examples/zips/logging.zip
diff --git a/examples/zips/management_agent.zip b/examples/zips/management_agent.zip
diff --git a/examples/zips/management_dashboard.zip b/examples/zips/management_dashboard.zip
diff --git a/examples/zips/marketplace.zip b/examples/zips/marketplace.zip
diff --git a/examples/zips/media_services.zip b/examples/zips/media_services.zip
diff --git a/examples/zips/metering_computation.zip b/examples/zips/metering_computation.zip
diff --git a/examples/zips/monitoring.zip b/examples/zips/monitoring.zip
diff --git a/examples/zips/mysql.zip b/examples/zips/mysql.zip
diff --git a/examples/zips/network_firewall.zip b/examples/zips/network_firewall.zip
diff --git a/examples/zips/network_load_balancer.zip b/examples/zips/network_load_balancer.zip
diff --git a/examples/zips/networking.zip b/examples/zips/networking.zip
diff --git a/examples/zips/nosql.zip b/examples/zips/nosql.zip
diff --git a/examples/zips/notifications.zip b/examples/zips/notifications.zip
diff --git a/examples/zips/object_storage.zip b/examples/zips/object_storage.zip
diff --git a/examples/zips/ocvp.zip b/examples/zips/ocvp.zip
diff --git a/examples/zips/onesubscription.zip b/examples/zips/onesubscription.zip
diff --git a/examples/zips/opa.zip b/examples/zips/opa.zip
diff --git a/examples/zips/opensearch.zip b/examples/zips/opensearch.zip
diff --git a/examples/zips/operator_access_control.zip b/examples/zips/operator_access_control.zip
diff --git a/examples/zips/opsi.zip b/examples/zips/opsi.zip
diff --git a/examples/zips/optimizer.zip b/examples/zips/optimizer.zip
diff --git a/examples/zips/oracle_cloud_vmware_solution.zip b/examples/zips/oracle_cloud_vmware_solution.zip
diff --git a/examples/zips/oracle_content_experience.zip b/examples/zips/oracle_content_experience.zip
diff --git a/examples/zips/oracle_digital_assistant.zip b/examples/zips/oracle_digital_assistant.zip
diff --git a/examples/zips/osmanagement.zip b/examples/zips/osmanagement.zip
diff --git a/examples/zips/osp_gateway.zip b/examples/zips/osp_gateway.zip
diff --git a/examples/zips/osub_billing_schedule.zip b/examples/zips/osub_billing_schedule.zip
diff --git a/examples/zips/osub_organization_subscription.zip b/examples/zips/osub_organization_subscription.zip
diff --git a/examples/zips/osub_subscription.zip b/examples/zips/osub_subscription.zip
diff --git a/examples/zips/osub_usage.zip b/examples/zips/osub_usage.zip
diff --git a/examples/zips/pic.zip b/examples/zips/pic.zip
diff --git a/examples/zips/queue.zip b/examples/zips/queue.zip
diff --git a/examples/zips/recovery.zip b/examples/zips/recovery.zip
diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip
diff --git a/examples/zips/serviceManagerProxy.zip b/examples/zips/serviceManagerProxy.zip
diff --git a/examples/zips/service_catalog.zip b/examples/zips/service_catalog.zip
diff --git a/examples/zips/service_connector_hub.zip b/examples/zips/service_connector_hub.zip
diff --git a/examples/zips/service_mesh.zip b/examples/zips/service_mesh.zip
diff --git a/examples/zips/stack_monitoring.zip b/examples/zips/stack_monitoring.zip
diff --git a/examples/zips/storage.zip b/examples/zips/storage.zip
diff --git a/examples/zips/streaming.zip b/examples/zips/streaming.zip
diff --git a/examples/zips/usage_proxy.zip b/examples/zips/usage_proxy.zip
diff --git a/examples/zips/vault_secret.zip b/examples/zips/vault_secret.zip
diff --git a/examples/zips/vbs_inst.zip b/examples/zips/vbs_inst.zip
diff --git a/examples/zips/visual_builder.zip b/examples/zips/visual_builder.zip
diff --git a/examples/zips/vn_monitoring.zip b/examples/zips/vn_monitoring.zip
diff --git a/examples/zips/vulnerability_scanning_service.zip b/examples/zips/vulnerability_scanning_service.zip
diff --git a/examples/zips/web_app_acceleration.zip b/examples/zips/web_app_acceleration.zip
diff --git a/examples/zips/web_app_firewall.zip b/examples/zips/web_app_firewall.zip
diff --git a/examples/zips/web_application_acceleration_and_security.zip b/examples/zips/web_application_acceleration_and_security.zip
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.41.0
+	github.com/oracle/oci-go-sdk/v65 v65.41.1
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect

diff --git a/go.sum b/go.sum
@@ -289,8 +289,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/v65 v65.41.0 h1:BTGVqeTo7gCp3ebVYxlm6ezhSLKl58E9hm3eTGN6M8M=
-github.com/oracle/oci-go-sdk/v65 v65.41.0/go.mod h1:MXMLMzHnnd9wlpgadPkdlkZ9YrwQmCOmbX5kjVEJodw=
+github.com/oracle/oci-go-sdk/v65 v65.41.1 h1:+lbosOyNiib3TGJDvLq1HwEAuFqkOjPJDIkyxM15WdQ=
+github.com/oracle/oci-go-sdk/v65 v65.41.1/go.mod h1:MXMLMzHnnd9wlpgadPkdlkZ9YrwQmCOmbX5kjVEJodw=
 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/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/internal/acctest/test_helpers.go b/internal/acctest/test_helpers.go
@@ -641,6 +641,8 @@ func PreCheck(t *testing.T) {
 	copy(envVarChecklist, requiredTestEnvVars)
 	if getEnvSettingWithDefaultVar("use_obo_token", "false") != "false" {
 		envVarChecklist = append(envVarChecklist, requiredOboTokenAuthEnvVars...)
+	} else if getEnvSettingWithBlankDefaultVar("auth") == "SecurityToken" {
+		envVarChecklist = append(envVarChecklist, requiredSecurityTokenAuthEnvVars...)
 	} else {
 		envVarChecklist = append(envVarChecklist, requiredKeyAuthEnvVars...)
 	}
@@ -656,6 +658,9 @@ func PreCheck(t *testing.T) {
 var requiredTestEnvVars = []string{"compartment_ocid", "compartment_id_for_create", "compartment_id_for_update", "tags_import_if_exists"}
 var requiredKeyAuthEnvVars = []string{"tenancy_ocid", "user_ocid", "fingerprint"}
 var requiredOboTokenAuthEnvVars = []string{"tenancy_ocid", "obo_token"}
+
+var requiredSecurityTokenAuthEnvVars = []string{"config_file_profile"}
+
 var TestAccProvider *schema.Provider
 var TestAccProviders map[string]*schema.Provider
 
@@ -719,6 +724,9 @@ func GetTestClients(data *schema.ResourceData) *tf_client.OracleClients {
 		d.Set("private_key_path", getEnvSettingWithBlankDefaultVar("private_key_path"))
 		d.Set("private_key_password", getEnvSettingWithBlankDefaultVar("private_key_password"))
 		d.Set("private_key", getEnvSettingWithBlankDefaultVar("private_key"))
+	} else if auth = getEnvSettingWithBlankDefaultVar("auth"); auth == globalvar.AuthSecurityToken {
+		d.Set("auth", globalvar.AuthSecurityToken)
+		d.Set("config_file_profile", getEnvSettingWithDefaultVar("config_file_profile", globalvar.SecurityTokenProfileForTest))
 	} else {
 		d.Set("auth", getEnvSettingWithDefaultVar("auth", auth))
 	}

diff --git a/internal/acctest/test_helpers_test.go b/internal/acctest/test_helpers_test.go
@@ -820,6 +820,45 @@ func TestUnitGetTestClients(t *testing.T) {
 	}
 }
 
+func TestUnitGetTestClientsSecurityToken(t *testing.T) {
+	r := &schema.Resource{
+		Schema: provider.SchemaMap(),
+	}
+	d := r.Data(nil)
+	os.Setenv("auth", globalvar.AuthSecurityToken)
+	getEnvSettingWithDefaultVar = func(key string, value string) string {
+		return value
+	}
+	getEnvSettingWithBlankDefaultVar = func(key string) string {
+		return "dummy_value"
+	}
+	tfProviderConfigVar = func(d *schema.ResourceData) (interface{}, error) {
+		return &tf_client.OracleClients{
+			Configuration: map[string]string{"auth": "SecurityToken"},
+		}, nil
+	}
+	type args struct {
+		data *schema.ResourceData
+	}
+	tests := []struct {
+		name string
+		args args
+	}{
+		{
+			name: "Test positive case",
+			args: args{
+				data: d,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client := GetTestClients(tt.args.data)
+			assert.NotEmpty(t, client)
+		})
+	}
+}
+
 func TestUnitGetUpdatedRepresentationCopy(t *testing.T) {
 	auditEventResourceRepresentation := map[string]interface{}{
 		"end_time": Representation{RepType: Required, Create: `create`},

diff --git a/internal/globalvar/constants.go b/internal/globalvar/constants.go
@@ -81,5 +81,6 @@ const (
 const (
 	DebugTestSteps               = "DEBUG_TEST_STEPS"
 	DebugTestStepsShowConfigOnly = "DEBUG_TEST_STEPS_SHOW_CONFIG_ONLY"
+	SecurityTokenProfileForTest  = "terraform-federation-test"
 )
 const TerraformDocumentLink = "https://registry.terraform.io/providers/oracle/oci/latest/docs/"
diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go
@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "5.1.0"
-const ReleaseDate = "2023-06-13"
+const Version = "5.2.0"
+const ReleaseDate = "2023-06-21"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

diff --git a/internal/integrationtest/data_labeling_service_dataset_test.go b/internal/integrationtest/data_labeling_service_dataset_test.go
@@ -79,6 +79,12 @@ var (
 	datasetLabelSetRepresentation = map[string]interface{}{
 		"items": acctest.RepresentationGroup{RepType: acctest.Required, Group: datasetLabelSetItemsRepresentation},
 	}
+
+	datasetInitialImportDatasetConfigurationRepresentation = map[string]interface{}{
+		"import_format":        acctest.RepresentationGroup{RepType: acctest.Required, Group: datasetInitialImportDatasetConfigurationImportFormatRepresentation},
+		"import_metadata_path": acctest.RepresentationGroup{RepType: acctest.Required, Group: datasetInitialImportDatasetConfigurationImportMetadataPathRepresentation},
+	}
+
 	//datasetInitialRecordGenerationConfigurationRepresentation = map[string]interface{}{}
 	datasetLabelSetItemsRepresentation = map[string]interface{}{
 		"name": acctest.Representation{RepType: acctest.Required, Create: `name`, Update: `name2`},
@@ -90,6 +96,15 @@ var (
 		"name":           acctest.Representation{RepType: acctest.Required, Create: objectstorageBucket},
 		"namespace":      acctest.Representation{RepType: acctest.Required, Create: objectstorageNamespace},
 	}
+	datasetInitialImportDatasetConfigurationImportFormatRepresentation = map[string]interface{}{
+		"name": acctest.Representation{RepType: acctest.Required, Create: `JSONL_CONSOLIDATED`},
+	}
+	datasetInitialImportDatasetConfigurationImportMetadataPathRepresentation = map[string]interface{}{
+		"bucket":      acctest.Representation{RepType: acctest.Required, Create: `bucket`},
+		"namespace":   acctest.Representation{RepType: acctest.Required, Create: `namespace`},
+		"path":        acctest.Representation{RepType: acctest.Required, Create: `path`},
+		"source_type": acctest.Representation{RepType: acctest.Required, Create: `OBJECT_STORAGE`},
+	}
 
 	objectstorageNamespace = "${data.oci_objectstorage_namespace.test_namespace.namespace}"
 	objectstorageBucket    = "tf_dataset_objectstoragebucket"