Merge branch 'master' of ssh://bitbucket.oci.oraclecorp.com:7999/orc/terraform-provider into release_gh

Author: vsin12

.go-version

@@ -1,2 +1 @@
-1.18.8
-
+1.20.7

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 5.13.0 (Unreleased)
+
+### Added
+- Support for DBM Service: Database Management SQL Tuning Sets
+- Support for ADB-S: ADB Service Name Change to Serverless
+- Support for Stack Monitoring: Auto-Promotion of Hosts
+- Support for LifecycleDetails in Data catalog Data assets resources
+- Support for Terraform for Serial Console Phase 1 ExaDB-C@C (EXACC) Serial Console Access to VM
+- Support for refreshing security token auth
+### Bug Fix 
+- Fixed documentation errors for VCNCP
+
 ## 5.12.0 (September 06, 2023)
 
 ### Added

README.md

@@ -15,7 +15,7 @@
 ## Requirements
 
 - [Terraform](https://www.terraform.io/downloads.html) v0.12.31 or greater
-- [Go](https://golang.org/doc/install) 1.18.8 (recommended)
+- [Go](https://golang.org/doc/install) 1.20.7 (recommended)
 
 
 ## Building the Provider

examples/database/adb/autonomous_database.tf

@@ -229,6 +229,13 @@ resource "oci_database_autonomous_database" "autonomous_database_private_ip" {
   nsg_ids = ["test-bn-nsg-id-1"]
 }
 
+data "oci_database_autonomous_database_character_sets" "autonomous_databases_character_sets" {
+  #Optional
+  character_set_type = var.autonomous_database_character_set_character_set_type
+  is_shared = var.autonomous_database_character_set_is_shared
+  is_dedicated =  var.autonomous_database_character_set_is_dedicated
+}
+
 data "oci_database_autonomous_databases" "autonomous_databases" {
   #Required
   compartment_id = var.compartment_ocid

examples/database/adb/variables.tf

@@ -59,4 +59,18 @@ variable "autonomous_database_character_set" {
 
 variable "autonomous_database_ncharacter_set" {
   default = "AL16UTF16"
-}
+}
+
+variable "autonomous_database_character_set_character_set_type" {
+  default = "DATABASE"
+}
+
+variable "autonomous_database_character_set_is_shared" {
+  default = true
+
+}
+
+variable "autonomous_database_character_set_is_dedicated" {
+  default = false
+}
+

examples/databasemanagement/main.tf

@@ -212,6 +212,15 @@ resource "oci_database_management_managed_database_group" "test_managed_database
   }
 }
 
+data "oci_database_management_managed_database_sql_tuning_sets" "test_managed_database_sql_tuning_sets" {
+	#Required
+	managed_database_id = oci_database_management_managed_database.test_managed_database.id
+
+	#Optional
+	name_contains = var.managed_database_sql_tuning_set_name_contains
+	owner = var.managed_database_sql_tuning_set_owner
+}
+
 data "oci_database_management_managed_database_groups" "test_managed_database_groups_with_id" {
   #Required
   compartment_id = var.compartment_id

examples/stack_monitoring/config/config.tf

@@ -0,0 +1,24 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_ocid" {}
+
+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_stack_monitoring_config" "test_config_autopromote" {
+	compartment_id = var.compartment_ocid
+	config_type = "AUTO_PROMOTE"
+	resource_type = "HOST"
+	is_enabled = true
+}

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.49.0
+	github.com/oracle/oci-go-sdk/v65 v65.49.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
@@ -78,4 +78,4 @@ require (
 // Uncomment this line to get OCI Go SDK from local source instead of github
 //replace github.com/oracle/oci-go-sdk => ../../oracle/oci-go-sdk
 
-go 1.18
+go 1.20

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.49.0 h1:A/G4SuzLixNy43DsXj9Vok9TygRZRX15I62ebGTHj2Y=
-github.com/oracle/oci-go-sdk/v65 v65.49.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.49.1 h1:2c2txRWdeNNCVWO+4vJao4cq0MOCIZoRGVw5u6rcvlk=
+github.com/oracle/oci-go-sdk/v65 v65.49.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 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=

internal/globalvar/constants.go

@@ -20,6 +20,8 @@ const (
 	TestTerraformCLIVersion               = "test"
 	UserAgentFormatter                    = "Oracle-GoSDK/%s (go/%s; %s/%s; terraform/%s; terraform-cli/%s) %s/%s"
 	UserAgentProviderNameEnv              = "USER_AGENT_PROVIDER_NAME"
+	UserAgentTerraformNameEnv             = "TF_APPEND_USER_AGENT"
+	UserAgentSDKNameEnv                   = "OCI_SDK_APPEND_USER_AGENT"
 	DomainNameOverrideEnv                 = "domain_name_override"
 	HasCorrectDomainNameEnv               = "has_correct_domain_name"
 	ClientHostOverridesEnv                = "CLIENT_HOST_OVERRIDES"