Skip to content

Commit 46b76f7

Browse files
karthikoracle1993Maxrovr
karthikoracle1993
authored and
Maxrovr
committed
BugFix Scheduled Operations changed to only Optional field for terraform version > 1.*.*
1 parent 322c70e commit 46b76f7

File tree

4 files changed

+152
-87
lines changed

4 files changed

+152
-87
lines changed

‎examples/database/adb/scheduled_operation/autonomous_database_scheduled_operations.tf‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
variable "tenancy_ocid" {
2+
}
3+
4+
variable "user_ocid" {
5+
}
6+
7+
variable "fingerprint" {
8+
}
9+
10+
variable "private_key_path" {
11+
}
12+
13+
variable "region" {
14+
}
15+
16+
provider "oci" {
17+
tenancy_ocid = var.tenancy_ocid
18+
user_ocid = var.user_ocid
19+
fingerprint = var.fingerprint
20+
private_key_path = var.private_key_path
21+
region = var.region
22+
}
23+
24+
resource "oci_database_autonomous_database" "autonomous_database" {
25+
#required
26+
admin_password = "Ka2P7jb1_3?*##DZ"
27+
compartment_id = "ocid1.tenancy.oc1..aaaaaaaayxnndmkzcpajuuptcojciksbdrlwofhbe3hve6lypcqfgx56ssva"
28+
cpu_core_count = "6"
29+
data_storage_size_in_tbs = "1"
30+
db_name = "testdbScheduledOperations"
31+
customer_contacts {
32+
email = "[email protected]"
33+
}
34+
customer_contacts {
35+
email = "[email protected]"
36+
}
37+
scheduled_operations {
38+
day_of_week {
39+
name = "MONDAY"
40+
}
41+
scheduled_start_time = "10:00"
42+
scheduled_stop_time = "18:00"
43+
}
44+
scheduled_operations {
45+
day_of_week {
46+
name = "TUESDAY"
47+
}
48+
scheduled_start_time = "10:00"
49+
scheduled_stop_time = "18:00"
50+
}
51+
scheduled_operations {
52+
day_of_week {
53+
name = "FRIDAY"
54+
}
55+
scheduled_start_time = "10:00"
56+
scheduled_stop_time = "18:00"
57+
}
58+
}

‎internal/integrationtest/database_autonomous_database_resource_test.go‎

Lines changed: 84 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,35 +1682,35 @@ func TestResourceDatabaseAutonomousDatabaseResource_privateEndpoint(t *testing.T
16821682
compartmentIdVariableStr + AutonomousDatabasePrivateEndpointResourceDependencies +
16831683
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Update,
16841684
acctest.GetUpdatedRepresentationCopy("nsg_ids", acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group2.id}`}}, autonomousDatabasePrivateEndpointRepresentation)), Check: acctest.ComposeAggregateTestCheckFuncWrapper(
1685-
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
1686-
resource.TestCheckResourceAttr(datasourceName, "db_workload", "OLTP"),
1687-
resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
1688-
resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
1689-
1690-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.#", "1"),
1691-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.compartment_id", compartmentId),
1692-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.connection_strings.#", "1"),
1693-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.cpu_core_count", "1"),
1694-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.data_storage_size_in_tbs", "1"),
1695-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.db_name", adbName),
1696-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.db_version"),
1697-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.db_workload", "OLTP"),
1698-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.display_name", "displayName2"),
1699-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.freeform_tags.%", "1"),
1700-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.id"),
1701-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.is_auto_scaling_enabled", "false"),
1702-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.is_dedicated", "false"),
1703-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.is_preview"),
1704-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.nsg_ids.#", "1"),
1705-
//resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.private_endpoint"),
1706-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.private_endpoint_ip", "10.0.0.97"),
1707-
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.private_endpoint_label", "xlx4fc9y"),
1708-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.state"),
1709-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.subnet_id"),
1710-
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.time_created"),
1711-
resource.TestCheckResourceAttr(resourceName, "is_mtls_connection_required", "true"),
1712-
resource.TestCheckResourceAttr(resourceName, "connection_strings.0.profiles.#", "3"),
1713-
),
1685+
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
1686+
resource.TestCheckResourceAttr(datasourceName, "db_workload", "OLTP"),
1687+
resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
1688+
resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
1689+
1690+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.#", "1"),
1691+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.compartment_id", compartmentId),
1692+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.connection_strings.#", "1"),
1693+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.cpu_core_count", "1"),
1694+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.data_storage_size_in_tbs", "1"),
1695+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.db_name", adbName),
1696+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.db_version"),
1697+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.db_workload", "OLTP"),
1698+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.display_name", "displayName2"),
1699+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.freeform_tags.%", "1"),
1700+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.id"),
1701+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.is_auto_scaling_enabled", "false"),
1702+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.is_dedicated", "false"),
1703+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.is_preview"),
1704+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.nsg_ids.#", "1"),
1705+
//resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.private_endpoint"),
1706+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.private_endpoint_ip", "10.0.0.97"),
1707+
resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.private_endpoint_label", "xlx4fc9y"),
1708+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.state"),
1709+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.subnet_id"),
1710+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.time_created"),
1711+
resource.TestCheckResourceAttr(resourceName, "is_mtls_connection_required", "true"),
1712+
resource.TestCheckResourceAttr(resourceName, "connection_strings.0.profiles.#", "3"),
1713+
),
17141714
},
17151715
//4. verify singular datasource
17161716
{
@@ -1719,32 +1719,32 @@ func TestResourceDatabaseAutonomousDatabaseResource_privateEndpoint(t *testing.T
17191719
compartmentIdVariableStr + AutonomousDatabasePrivateEndpointResourceDependencies +
17201720
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Update,
17211721
acctest.GetUpdatedRepresentationCopy("nsg_ids", acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group2.id}`}}, autonomousDatabasePrivateEndpointRepresentation)), Check: acctest.ComposeAggregateTestCheckFuncWrapper(
1722-
resource.TestCheckResourceAttrSet(singularDatasourceName, "autonomous_database_id"),
1723-
1724-
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
1725-
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.#", "1"),
1726-
resource.TestCheckResourceAttrSet(singularDatasourceName, "connection_strings.0.all_connection_strings.%"),
1727-
resource.TestCheckResourceAttr(singularDatasourceName, "cpu_core_count", "1"),
1728-
resource.TestCheckResourceAttr(singularDatasourceName, "data_storage_size_in_tbs", "1"),
1729-
resource.TestCheckResourceAttr(singularDatasourceName, "db_name", adbName),
1730-
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
1731-
resource.TestCheckResourceAttr(singularDatasourceName, "db_workload", "OLTP"),
1732-
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
1733-
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
1734-
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
1735-
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
1736-
resource.TestCheckResourceAttr(singularDatasourceName, "is_auto_scaling_enabled", "false"),
1737-
resource.TestCheckResourceAttr(singularDatasourceName, "is_dedicated", "false"),
1738-
resource.TestCheckResourceAttrSet(singularDatasourceName, "is_preview"),
1739-
resource.TestCheckResourceAttr(singularDatasourceName, "nsg_ids.#", "1"),
1740-
//resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint"),
1741-
resource.TestCheckResourceAttr(singularDatasourceName, "private_endpoint_ip", "10.0.0.97"),
1742-
resource.TestCheckResourceAttr(singularDatasourceName, "private_endpoint_label", "xlx4fc9y"),
1743-
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
1744-
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
1745-
resource.TestCheckResourceAttr(resourceName, "is_mtls_connection_required", "true"),
1746-
resource.TestCheckResourceAttr(resourceName, "connection_strings.0.profiles.#", "3"),
1747-
),
1722+
resource.TestCheckResourceAttrSet(singularDatasourceName, "autonomous_database_id"),
1723+
1724+
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
1725+
resource.TestCheckResourceAttr(singularDatasourceName, "connection_strings.#", "1"),
1726+
resource.TestCheckResourceAttrSet(singularDatasourceName, "connection_strings.0.all_connection_strings.%"),
1727+
resource.TestCheckResourceAttr(singularDatasourceName, "cpu_core_count", "1"),
1728+
resource.TestCheckResourceAttr(singularDatasourceName, "data_storage_size_in_tbs", "1"),
1729+
resource.TestCheckResourceAttr(singularDatasourceName, "db_name", adbName),
1730+
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
1731+
resource.TestCheckResourceAttr(singularDatasourceName, "db_workload", "OLTP"),
1732+
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
1733+
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
1734+
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
1735+
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
1736+
resource.TestCheckResourceAttr(singularDatasourceName, "is_auto_scaling_enabled", "false"),
1737+
resource.TestCheckResourceAttr(singularDatasourceName, "is_dedicated", "false"),
1738+
resource.TestCheckResourceAttrSet(singularDatasourceName, "is_preview"),
1739+
resource.TestCheckResourceAttr(singularDatasourceName, "nsg_ids.#", "1"),
1740+
//resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint"),
1741+
resource.TestCheckResourceAttr(singularDatasourceName, "private_endpoint_ip", "10.0.0.97"),
1742+
resource.TestCheckResourceAttr(singularDatasourceName, "private_endpoint_label", "xlx4fc9y"),
1743+
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
1744+
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
1745+
resource.TestCheckResourceAttr(resourceName, "is_mtls_connection_required", "true"),
1746+
resource.TestCheckResourceAttr(resourceName, "connection_strings.0.profiles.#", "3"),
1747+
),
17481748
},
17491749

17501750
//5. delete before next Create
@@ -1793,34 +1793,34 @@ func TestResourceDatabaseAutonomousDatabaseResource_privateEndpoint(t *testing.T
17931793
"private_endpoint_label": acctest.Representation{RepType: acctest.Optional, Create: `xlx4fc9y`},
17941794
"subnet_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_subnet.test_subnet.id}`},
17951795
}), []string{"whitelisted_ips"})), Check: acctest.ComposeAggregateTestCheckFuncWrapper(
1796-
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
1797-
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
1798-
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "1"),
1799-
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
1800-
resource.TestCheckResourceAttr(resourceName, "db_name", adbName),
1801-
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
1802-
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
1803-
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
1804-
resource.TestCheckResourceAttrSet(resourceName, "id"),
1805-
resource.TestCheckResourceAttr(resourceName, "is_auto_scaling_enabled", "false"),
1806-
resource.TestCheckResourceAttr(resourceName, "is_dedicated", "false"),
1807-
resource.TestCheckResourceAttr(resourceName, "is_preview_version_with_service_terms_accepted", "false"),
1808-
resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
1809-
resource.TestCheckResourceAttr(resourceName, "private_endpoint_label", "xlx4fc9y"),
1810-
resource.TestCheckResourceAttr(resourceName, "nsg_ids.#", "2"),
1811-
resource.TestCheckResourceAttrSet(resourceName, "state"),
1812-
resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
1813-
resource.TestCheckResourceAttr(resourceName, "is_mtls_connection_required", "true"),
1814-
resource.TestCheckResourceAttr(resourceName, "connection_strings.0.profiles.#", "3"),
1815-
1816-
func(s *terraform.State) (err error) {
1817-
resId2, err = acctest.FromInstanceState(s, resourceName, "id")
1818-
if resId != resId2 {
1819-
return fmt.Errorf("Resource recreated when it was supposed to be updated.")
1820-
}
1821-
return err
1822-
},
1823-
),
1796+
resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#12"),
1797+
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
1798+
resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "1"),
1799+
resource.TestCheckResourceAttr(resourceName, "data_storage_size_in_tbs", "1"),
1800+
resource.TestCheckResourceAttr(resourceName, "db_name", adbName),
1801+
resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
1802+
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
1803+
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
1804+
resource.TestCheckResourceAttrSet(resourceName, "id"),
1805+
resource.TestCheckResourceAttr(resourceName, "is_auto_scaling_enabled", "false"),
1806+
resource.TestCheckResourceAttr(resourceName, "is_dedicated", "false"),
1807+
resource.TestCheckResourceAttr(resourceName, "is_preview_version_with_service_terms_accepted", "false"),
1808+
resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
1809+
resource.TestCheckResourceAttr(resourceName, "private_endpoint_label", "xlx4fc9y"),
1810+
resource.TestCheckResourceAttr(resourceName, "nsg_ids.#", "2"),
1811+
resource.TestCheckResourceAttrSet(resourceName, "state"),
1812+
resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
1813+
resource.TestCheckResourceAttr(resourceName, "is_mtls_connection_required", "true"),
1814+
resource.TestCheckResourceAttr(resourceName, "connection_strings.0.profiles.#", "3"),
1815+
1816+
func(s *terraform.State) (err error) {
1817+
resId2, err = acctest.FromInstanceState(s, resourceName, "id")
1818+
if resId != resId2 {
1819+
return fmt.Errorf("Resource recreated when it was supposed to be updated.")
1820+
}
1821+
return err
1822+
},
1823+
),
18241824
},
18251825
//8. delete before next Create
18261826
{
@@ -4482,6 +4482,7 @@ func TestDatabaseAutonomousDatabaseResource_DeveloperDatabases(t *testing.T) {
44824482
}
44834483

44844484
func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
4485+
44854486
httpreplay.SetScenario("TestDatabaseAutonomousDatabaseResource_scheduledOperations")
44864487
defer httpreplay.SaveScenario()
44874488

‎internal/integrationtest/database_autonomous_database_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,16 @@ var (
286286
"source_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_database_autonomous_database.test_autonomous_database_source.id}`},
287287
})
288288

289-
autonomousDatabaseRepresentationForScheduledOperations = acctest.RepresentationCopyWithNewProperties(DatabaseAutonomousDatabaseRepresentation, map[string]interface{}{})
290-
289+
autonomousDatabaseRepresentationForScheduledOperations = acctest.RepresentationCopyWithNewProperties(DatabaseAutonomousDatabaseRepresentation, map[string]interface{}{
290+
"scheduled_operations": []acctest.RepresentationGroup{
291+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMonday},
292+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationTuesday},
293+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationWednesday},
294+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationThursday},
295+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
296+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSaturday},
297+
{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSunday}},
298+
})
291299
DatabaseAutonomousDatabaseRepresentationDeveloper = map[string]interface{}{
292300
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
293301
"compute_count": acctest.Representation{RepType: acctest.Required, Create: `4`},

‎internal/service/database/database_autonomous_database_resource.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,12 +442,10 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
442442
"scheduled_start_time": {
443443
Type: schema.TypeString,
444444
Optional: true,
445-
Computed: true,
446445
},
447446
"scheduled_stop_time": {
448447
Type: schema.TypeString,
449448
Optional: true,
450-
Computed: true,
451449
},
452450

453451
// Computed

0 commit comments

Comments
 (0)