Skip to content

Commit 88e82d4

Browse files
rashik-bhasinvsin12
rashik-bhasin
authored and
vsin12
committed
Exempted - Finalize oci.erb and release for version v4.121.0
1 parent f792619 commit 88e82d4

20 files changed

+499
-15
lines changed

‎internal/integrationtest/database_backup_test.go‎

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,62 @@ var (
4141
"display_name": acctest.Representation{RepType: acctest.Required, Create: `Monthly Backup`},
4242
}
4343

44-
DatabaseDatabaseBackupResourceDependencies = DbSystemResourceConfig + `
44+
CoreInternetGatewayDatabaseBackupRepresentation = map[string]interface{}{
45+
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
46+
"vcn_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_vcn.test_vcn.id}`},
47+
"defined_tags": acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
48+
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `MyInternetGateway`, Update: `displayName2`},
49+
"enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
50+
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
51+
"lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsChangesRep},
52+
}
53+
54+
DbSystemDatabaseBackupResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Optional, acctest.Create, acctest.RepresentationCopyWithNewProperties(CoreSubnetRepresentation, map[string]interface{}{
55+
"route_table_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_route_table.test_route_table.id}`}})) +
56+
acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Optional, acctest.Create, CoreVcnRepresentation) +
57+
acctest.GenerateResourceFromRepresentationMap("oci_core_route_table", "test_route_table", acctest.Optional, acctest.Create, CoreRouteTableRepresentation) +
58+
acctest.GenerateResourceFromRepresentationMap("oci_core_internet_gateway", "test_internet_gateway", acctest.Optional, acctest.Create, CoreInternetGatewayDatabaseBackupRepresentation)
59+
60+
DbSystemResourceConfigDependencies = DbSystemDatabaseBackupResourceDependencies + AvailabilityDomainConfig + DefinedTagsDependencies + `
61+
62+
resource "oci_database_db_system" "test_db_system" {
63+
availability_domain = "${"${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"}"
64+
compartment_id = "${var.compartment_id}"
65+
subnet_id = "${oci_core_subnet.test_subnet.id}"
66+
database_edition = "ENTERPRISE_EDITION"
67+
disk_redundancy = "NORMAL"
68+
shape = "VM.Standard2.16"
69+
cpu_core_count = "16"
70+
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
71+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
72+
hostname = "myoracledb"
73+
data_storage_size_in_gb = "256"
74+
license_model = "LICENSE_INCLUDED"
75+
node_count = "1"
76+
display_name = "tfDbSystemTest"
77+
db_home {
78+
db_version = "19.0.0.0"
79+
display_name = "dbHome1"
80+
database {
81+
admin_password = "BEstrO0ng_#11"
82+
kms_key_id = "${var.kms_key_id}"
83+
vault_id = "${var.vault_id}"
84+
kms_key_version_id = "${var.kms_key_version_id}"
85+
db_name = "tfDbName"
86+
}
87+
}
88+
}
89+
90+
data "oci_database_db_homes" "t" {
91+
compartment_id = "${var.compartment_id}"
92+
db_system_id = "${oci_database_db_system.test_db_system.id}"
93+
filter {
94+
name = "display_name"
95+
values = ["dbHome1"]
96+
}
97+
}`
98+
99+
DatabaseDatabaseBackupResourceDependencies = DbSystemResourceConfigDependencies + `
45100
data "oci_database_databases" "db" {
46101
compartment_id = "${var.compartment_id}"
47102
db_home_id = "${data.oci_database_db_homes.t.db_homes.0.db_home_id}"
@@ -70,7 +125,7 @@ func TestDatabaseBackupResource_basic(t *testing.T) {
70125
resourceName := "oci_database_backup.test_backup"
71126
datasourceName := "data.oci_database_backups.test_backups"
72127

73-
var resId string
128+
var resId, compId string
74129
// Save TF content to Create resource with only required properties. This has to be exactly the same as the config part in the Create step in the test.
75130
acctest.SaveConfigContent(config+compartmentIdVariableStr+DatabaseDatabaseBackupResourceDependencies+
76131
acctest.GenerateResourceFromRepresentationMap("oci_database_backup", "test_backup", acctest.Required, acctest.Create, DatabaseBackupRepresentation), "database", "backup", t)
@@ -86,8 +141,9 @@ func TestDatabaseBackupResource_basic(t *testing.T) {
86141

87142
func(s *terraform.State) (err error) {
88143
resId, err = acctest.FromInstanceState(s, resourceName, "id")
144+
compId = "oci_database_backup:" + resId
89145
if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
90-
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
146+
if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&compId, &compartmentId, resourceName); errExport != nil {
91147
return errExport
92148
}
93149
}

‎internal/integrationtest/database_database_resource_test.go‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
package integrationtest
2+
3+
import (
4+
"fmt"
5+
"testing"
6+
7+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
8+
"github.com/oracle/terraform-provider-oci/httpreplay"
9+
"github.com/oracle/terraform-provider-oci/internal/acctest"
10+
"github.com/oracle/terraform-provider-oci/internal/utils"
11+
)
12+
13+
var (
14+
DatabaseExaccRequiredOnlyResource = DatabaseExaccDatabaseResourceDependencies +
15+
acctest.GenerateResourceFromRepresentationMap("oci_database_database", "test_database", acctest.Required, acctest.Create, DatabaseExaccDatabaseRepresentation)
16+
17+
DatabaseExaccDatabaseResourceConfig = DatabaseExaccDatabaseResourceDependencies +
18+
acctest.GenerateResourceFromRepresentationMap("oci_database_database", "test_database", acctest.Optional, acctest.Update, DatabaseExaccDatabaseRepresentation)
19+
20+
DatabaseExaccDatabaseRepresentation = map[string]interface{}{
21+
"database": acctest.RepresentationGroup{RepType: acctest.Required, Group: databaseDatabaseRepresentation},
22+
"db_home_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_db_home.test_db_home_vm_cluster.id}`},
23+
"source": acctest.Representation{RepType: acctest.Required, Create: `NONE`},
24+
"db_version": acctest.Representation{RepType: acctest.Optional, Create: `12.1.0.2`},
25+
}
26+
27+
databaseExaccRepresentationMigration = map[string]interface{}{
28+
"database": acctest.RepresentationGroup{RepType: acctest.Required, Group: databaseDatabaseRepresentation},
29+
"db_home_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_db_home.test_db_home_vm_cluster.id}`},
30+
"source": acctest.Representation{RepType: acctest.Required, Create: `NONE`},
31+
"key_store_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_key_store.test_key_store.id}`},
32+
}
33+
34+
databaseExaccRepresentationRotation = map[string]interface{}{
35+
"database": acctest.RepresentationGroup{RepType: acctest.Required, Group: databaseDatabaseRepresentation},
36+
"db_home_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_db_home.test_db_home_vm_cluster.id}`},
37+
"source": acctest.Representation{RepType: acctest.Required, Create: `NONE`},
38+
"kms_key_rotation": acctest.Representation{RepType: acctest.Required, Update: `1`},
39+
"key_store_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_key_store.test_key_store.id}`},
40+
}
41+
42+
DatabaseExaccDbHomeRepresentationBase = map[string]interface{}{
43+
"vm_cluster_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_vm_cluster.test_vm_cluster.id}`},
44+
}
45+
46+
dbHomeExaccRepresentationSourceNone = acctest.RepresentationCopyWithNewProperties(DatabaseExaccDbHomeRepresentationBase, map[string]interface{}{
47+
"database": acctest.RepresentationGroup{RepType: acctest.Required, Group: dbHomeDatabaseRepresentationSourceNone},
48+
"db_system_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_vm_cluster.test_vm_cluster.id}`},
49+
"vm_cluster_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_vm_cluster.test_vm_cluster.id}`},
50+
"db_version": acctest.Representation{RepType: acctest.Required, Create: `12.1.0.2`},
51+
"source": acctest.Representation{RepType: acctest.Optional, Create: `NONE`},
52+
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `createdDbHomeNone`},
53+
"key_store_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_database_key_store.test_key_store.id}`},
54+
})
55+
56+
DatabaseExaccDatabaseResourceDependencies = DatabaseVmClusterResourceDependencies +
57+
acctest.GenerateResourceFromRepresentationMap("oci_database_vm_cluster", "test_vm_cluster", acctest.Required, acctest.Create, DatabaseVmClusterRepresentation) +
58+
acctest.GenerateResourceFromRepresentationMap("oci_database_key_store", "test_key_store", acctest.Optional, acctest.Create, DatabaseKeyStoreRepresentation) + KmsVaultIdVariableStr + OkvSecretVariableStr +
59+
acctest.GenerateResourceFromRepresentationMap("oci_database_db_home", "test_db_home_vm_cluster", acctest.Required, acctest.Create, dbHomeExaccRepresentationSourceNone)
60+
)
61+
62+
func TestDatabaseExaccDatabaseResource(t *testing.T) {
63+
httpreplay.SetScenario("TestDatabaseExaccDatabaseResource")
64+
defer httpreplay.SaveScenario()
65+
66+
config := acctest.ProviderTestConfig()
67+
68+
compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
69+
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
70+
71+
resourceName := "oci_database_database.test_database"
72+
73+
acctest.SaveConfigContent(config+compartmentIdVariableStr+DatabaseExaccDatabaseResourceDependencies+
74+
acctest.GenerateResourceFromRepresentationMap("oci_database_database", "test_database", acctest.Optional, acctest.Create, DatabaseExaccDatabaseRepresentation), "database", "database", t)
75+
76+
acctest.ResourceTest(t, testAccCheckDatabaseDatabaseDestroy, []resource.TestStep{
77+
// verify create
78+
{
79+
Config: config + compartmentIdVariableStr + DatabaseExaccDatabaseResourceDependencies +
80+
acctest.GenerateResourceFromRepresentationMap("oci_database_database", "test_database", acctest.Required, acctest.Create, DatabaseExaccDatabaseRepresentation),
81+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
82+
resource.TestCheckResourceAttr(resourceName, "database.#", "1"),
83+
resource.TestCheckResourceAttr(resourceName, "database.0.admin_password", "BEstrO0ng_#11"),
84+
resource.TestCheckResourceAttr(resourceName, "database.0.db_name", "myTestDb"),
85+
resource.TestCheckResourceAttrSet(resourceName, "db_home_id"),
86+
resource.TestCheckResourceAttr(resourceName, "source", "NONE"),
87+
),
88+
},
89+
// verify change key store type
90+
{
91+
Config: config + compartmentIdVariableStr + DatabaseExaccDatabaseResourceDependencies +
92+
acctest.GenerateResourceFromRepresentationMap("oci_database_database", "test_database", acctest.Required, acctest.Update, databaseExaccRepresentationMigration),
93+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
94+
resource.TestCheckResourceAttr(resourceName, "database.#", "1"),
95+
resource.TestCheckResourceAttr(resourceName, "database.0.admin_password", "BEstrO0ng_#11"),
96+
resource.TestCheckResourceAttr(resourceName, "database.0.db_name", "myTestDb"),
97+
resource.TestCheckResourceAttrSet(resourceName, "db_home_id"),
98+
resource.TestCheckResourceAttrSet(resourceName, "key_store_id"),
99+
resource.TestCheckResourceAttr(resourceName, "source", "NONE"),
100+
),
101+
},
102+
// verify database key rotation
103+
{
104+
Config: config + compartmentIdVariableStr + DatabaseExaccDatabaseResourceDependencies +
105+
acctest.GenerateResourceFromRepresentationMap("oci_database_database", "test_database", acctest.Required, acctest.Update, databaseExaccRepresentationRotation),
106+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
107+
resource.TestCheckResourceAttr(resourceName, "database.#", "1"),
108+
resource.TestCheckResourceAttr(resourceName, "database.0.admin_password", "BEstrO0ng_#11"),
109+
resource.TestCheckResourceAttr(resourceName, "database.0.db_name", "myTestDb"),
110+
resource.TestCheckResourceAttrSet(resourceName, "db_home_id"),
111+
resource.TestCheckResourceAttrSet(resourceName, "key_store_id"),
112+
resource.TestCheckResourceAttr(resourceName, "source", "NONE"),
113+
),
114+
},
115+
// verify resource import
116+
{
117+
Config: config + DatabaseExaccRequiredOnlyResource,
118+
ImportState: true,
119+
ImportStateVerify: true,
120+
ImportStateVerifyIgnore: []string{
121+
"database",
122+
"db_version",
123+
"kms_key_rotation",
124+
"source",
125+
},
126+
ResourceName: resourceName,
127+
},
128+
})
129+
}

‎internal/integrationtest/database_database_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ var (
100100
"database_edition": acctest.Representation{RepType: acctest.Required, Create: `ENTERPRISE_EDITION_EXTREME_PERFORMANCE`},
101101
"db_home": acctest.RepresentationGroup{RepType: acctest.Required, Group: exadbSystemDbHomeRepresentation},
102102
"hostname": acctest.Representation{RepType: acctest.Required, Create: `myOracleDB`},
103-
"shape": acctest.Representation{RepType: acctest.Required, Create: `Exadata.Quarter1.84`},
103+
"shape": acctest.Representation{RepType: acctest.Required, Create: `Exadata.Quarter2.92`},
104104
"ssh_public_keys": acctest.Representation{RepType: acctest.Required, Create: []string{`ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCBDM0G21Tc6IOp6H5fwUVhVcxDxbwRwb9I53lXDdfqytw/pRAfXxDAzlw1jMEWofoVxTVDyqxcEg5yg4ImKFYHIDrZuU9eHv5SoHYJvI9r+Dqm9z52MmEyoTuC4dUyOs79V0oER5vLcjoMQIqmGSKMSlIMoFV2d+AV//RhJSpRPWGQ6lAVPYAiaVk3EzYacayetk1ZCEnMGPV0OV1UWqovm3aAGDozs7+9Isq44HEMyJwdBTYmBu3F8OA8gss2xkwaBgK3EQjCJIRBgczDwioT7RF5WG3IkwKsDTl2bV0p5f5SeX0U8SGHnni9uNoc9wPAWaleZr3Jcp1yIcRFR9YV`}},
105105
"subnet_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.exadata_subnet.id}`},
106106
"cpu_core_count": acctest.Representation{RepType: acctest.Optional, Create: `22`},
@@ -308,7 +308,7 @@ var (
308308
databaseDatabaseRepresentation = map[string]interface{}{
309309
"admin_password": acctest.Representation{RepType: acctest.Required, Create: `BEstrO0ng_#11`},
310310
"db_name": acctest.Representation{RepType: acctest.Required, Create: `myTestDb`},
311-
"character_set": acctest.Representation{RepType: acctest.Optional, Create: `AL32UTF8`},
311+
"character_set": acctest.Representation{RepType: acctest.Required, Create: `AL32UTF8`},
312312
"db_backup_config": acctest.RepresentationGroup{RepType: acctest.Optional, Group: databaseDatabaseDbBackupConfigRepresentation},
313313
"db_unique_name": acctest.Representation{RepType: acctest.Optional, Create: `myTestDb_13`},
314314
"db_workload": acctest.Representation{RepType: acctest.Optional, Create: `OLTP`},
@@ -399,7 +399,7 @@ var (
399399
DatabaseDatabaseDatabaseResourceDependencies = DatabaseDatabaseResourceDependencies2 +
400400
acctest.GenerateResourceFromRepresentationMap("oci_database_db_home", "test_db_home_dbrs", acctest.Required, acctest.Create, dbHomeDbrsRepresentation)
401401

402-
DatabaseExacsDatabaseResourceDependencies = DbHomeResourceVmClusterDependencies +
402+
DatabaseExacsDatabaseResourceDependencies = DbHomeResourceVmClusterDependencies + //DefinedTagsDependencies +
403403
acctest.GenerateResourceFromRepresentationMap("oci_database_db_home", "test_db_home_vm_cluster_no_db", acctest.Required, acctest.Create, dbHomeRepresentationSourceVmCluster)
404404

405405
DatabaseDatabaseResourceDbrsDependencies = ExaBaseDependencies + DefinedTagsDependencies + AvailabilityDomainConfig + KeyResourceDependencyConfig2 +

0 commit comments

Comments
 (0)