Skip to content

Commit b3814b0

Browse files
srishtipmishrasrishtipmishra
authored
Merge pull request #1156 from terraform-providers/release_merge_v3.90.1
Candidate for release_v3.90.1
2 parents 5c44ab2 + 7d52089 commit b3814b0

22 files changed

+329
-246
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
## 3.91.0 (Unreleased)
1+
## 3.90.1 (Unreleased)
2+
3+
### Fixed
4+
- Fix nil panic error in oci_database_backups data source, which results in discovery errors
5+
26
## 3.90.0 (August 19, 2020)
37

48
### Added

‎examples/database/atp-d/exadata.tf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,22 @@ resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exada
6868

6969
hours_of_day = ["4"]
7070

71+
months {
72+
name = "JANUARY"
73+
}
74+
7175
months {
7276
name = "APRIL"
7377
}
7478

79+
months {
80+
name = "JULY"
81+
}
82+
83+
months {
84+
name = "OCTOBER"
85+
}
86+
7587
weeks_of_month = ["2"]
7688
}
7789

‎examples/database/atp-d/main.tf‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,22 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
3434

3535
hours_of_day = ["4"]
3636

37+
months {
38+
name = "JANUARY"
39+
}
40+
3741
months {
3842
name = "APRIL"
3943
}
4044

45+
months {
46+
name = "JULY"
47+
}
48+
49+
months {
50+
name = "OCTOBER"
51+
}
52+
4153
weeks_of_month = ["2"]
4254
}
4355
}
@@ -61,7 +73,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
6173
#Optional
6274
autonomous_container_database_id = "${oci_database_autonomous_container_database.test_autonomous_container_database.id}"
6375
db_workload = "OLTP"
64-
display_name = "example_autonomous_database"
76+
display_name = "example_autonomous_database-007"
6577
freeform_tags = "${var.autonomous_database_freeform_tags}"
6678
is_dedicated = "true"
6779
}

‎infrastructure/resource_discovery/script/apply_job.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
# Set stack_id to run this script
3+
#export stack_id=123
4+
5+
cd ../../../oci
6+
7+
export job_operation=APPLY
8+
go test -v -run TestResourceDiscoveryApplyOrDestroyResourcesUsingStack

‎infrastructure/resource_discovery/script/destroy_job.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
# Set stack_id to run this script
3+
#export stack_id=123
4+
5+
cd ../../../oci
6+
7+
export job_operation=DESTROY
8+
go test -v -run TestResourceDiscoveryApplyOrDestroyResourcesUsingStack

‎infrastructure/resource_discovery/script/run_test.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
# This script is to run Resource Discovery test on defined compartment
3+
cd ../../../oci
4+
go test -v -run TestResourceDiscoveryOnCompartment

‎infrastructure/resource_discovery/script/update_stack.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
# Set resource_type (permanent/transient) and stack_id to run this script
3+
#export resource_type=transient
4+
#export stack_id=123
5+
6+
cd ../../../oci
7+
go test -v -run TestResourceDiscoveryUpdateStack

‎infrastructure/resource_discovery/transient/atp_d.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,22 @@ resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exada
5656

5757
hours_of_day = ["4"]
5858

59+
months {
60+
name = "JANUARY"
61+
}
62+
5963
months {
6064
name = "APRIL"
6165
}
6266

67+
months {
68+
name = "JULY"
69+
}
70+
71+
months {
72+
name = "OCTOBER"
73+
}
74+
6375
weeks_of_month = ["2"]
6476
}
6577

@@ -93,10 +105,22 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
93105

94106
hours_of_day = ["4"]
95107

108+
months {
109+
name = "JANUARY"
110+
}
111+
96112
months {
97113
name = "APRIL"
98114
}
99115

116+
months {
117+
name = "JULY"
118+
}
119+
120+
months {
121+
name = "OCTOBER"
122+
}
123+
100124
weeks_of_month = ["2"]
101125
}
102126
}

‎oci/core_instance_resource_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,11 +1433,10 @@ func TestResourceCoreInstanceTestSuite(t *testing.T) {
14331433
suite.Run(t, new(ResourceCoreInstanceTestSuite))
14341434
}
14351435

1436-
func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_launchOptions(t *testing.T) {
1436+
func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_launchOptions() {
14371437
httpreplay.SetScenario("TestAccResourceCoreInstance_launchOptions")
14381438
defer httpreplay.SaveScenario()
14391439

1440-
provider := testAccProvider
14411440
config := `
14421441
provider oci {
14431442
test_time_maintenance_reboot_due = "2030-01-01 00:00:00"
@@ -1453,11 +1452,8 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_launchOption
14531452

14541453
var resId, resId2 string
14551454

1456-
resource.Test(t, resource.TestCase{
1457-
PreCheck: func() { testAccPreCheck(t) },
1458-
Providers: map[string]terraform.ResourceProvider{
1459-
"oci": provider,
1460-
},
1455+
resource.Test(s.T(), resource.TestCase{
1456+
Providers: s.Providers,
14611457
CheckDestroy: testAccCheckCoreInstanceDestroy,
14621458
Steps: []resource.TestStep{
14631459
// verify create with optionals

‎oci/database_autonomous_container_database_resource_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ func TestDatabaseAutonomousContainerDatabase_basic(t *testing.T) {
149149
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.days_of_week.#", "1"),
150150
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.days_of_week.0.name", "TUESDAY"),
151151
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.hours_of_day.#", "1"),
152-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "1"),
153-
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "MAY"),
152+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.#", "4"),
153+
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.months.0.name", "FEBRUARY"),
154154
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
155155
resource.TestCheckResourceAttr(resourceName, "maintenance_window.0.weeks_of_month.#", "1"),
156156
resource.TestCheckResourceAttr(resourceName, "patch_model", "RELEASE_UPDATE_REVISIONS"),
@@ -194,8 +194,8 @@ func TestDatabaseAutonomousContainerDatabase_basic(t *testing.T) {
194194
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.days_of_week.#", "1"),
195195
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.days_of_week.0.name", "TUESDAY"),
196196
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.hours_of_day.#", "1"),
197-
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.months.#", "1"),
198-
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.months.0.name", "MAY"),
197+
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.months.#", "4"),
198+
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.months.0.name", "FEBRUARY"),
199199
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
200200
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.maintenance_window.0.weeks_of_month.#", "1"),
201201
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.patch_model", "RELEASE_UPDATE_REVISIONS"),
@@ -226,8 +226,8 @@ func TestDatabaseAutonomousContainerDatabase_basic(t *testing.T) {
226226
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.days_of_week.#", "1"),
227227
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.days_of_week.0.name", "TUESDAY"),
228228
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.hours_of_day.#", "1"),
229-
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.#", "1"),
230-
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.0.name", "MAY"),
229+
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.#", "4"),
230+
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.months.0.name", "FEBRUARY"),
231231
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.preference", "CUSTOM_PREFERENCE"),
232232
resource.TestCheckResourceAttr(singularDatasourceName, "maintenance_window.0.weeks_of_month.#", "1"),
233233
resource.TestCheckResourceAttr(singularDatasourceName, "patch_model", "RELEASE_UPDATE_REVISIONS"),

0 commit comments

Comments
 (0)