Skip to content

Commit 1dfc129

Browse files
varmax2511varmax2511
authored
Merge pull request #956 from terraform-providers/release_merge_v3.59.0
Candidate for release_v3.59.0
2 parents ff226bd + 4eb5f8f commit 1dfc129

35 files changed

+1101
-62
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
## 3.58.1 (Unreleased)
1+
## 3.59.0 (Unreleased)
2+
3+
### Added
4+
- Support for creating `oci_database_autonomous_database` resource by cloning from a backup of an existing Autonomous Database.
5+
- Support for a new field `redundancy_status` in resource `core_drg_resource`.
6+
27
## 3.58.0 (January 15, 2020)
38

49
### Added

‎examples/database/adb/autonomous_database.tf‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,39 @@ resource "oci_database_autonomous_database" "autonomous_database" {
2626
whitelisted_ips = ["1.1.1.1/28"]
2727
}
2828

29+
resource "oci_database_autonomous_database_backup" "autonomous_database_backup" {
30+
#Required
31+
autonomous_database_id = "${oci_database_autonomous_database.autonomous_database.id}"
32+
display_name = "${var.autonomous_database_backup_display_name}"
33+
}
34+
35+
resource "oci_database_autonomous_database" "autonomous_database_from_backup_id" {
36+
#Required
37+
admin_password = "${random_string.autonomous_database_admin_password.result}"
38+
compartment_id = "${var.compartment_ocid}"
39+
cpu_core_count = "1"
40+
data_storage_size_in_tbs = "1"
41+
db_name = "adbdb2"
42+
43+
clone_type = "FULL"
44+
source = "BACKUP_FROM_ID"
45+
autonomous_database_backup_id = "${oci_database_autonomous_database_backup.autonomous_database_backup.id}"
46+
}
47+
48+
resource "oci_database_autonomous_database" "autonomous_database_from_backup_timestamp" {
49+
#Required
50+
admin_password = "${random_string.autonomous_database_admin_password.result}"
51+
compartment_id = "${var.compartment_ocid}"
52+
cpu_core_count = "1"
53+
data_storage_size_in_tbs = "1"
54+
db_name = "adbdb3"
55+
56+
clone_type = "FULL"
57+
source = "BACKUP_FROM_TIMESTAMP"
58+
autonomous_database_id = "${oci_database_autonomous_database_backup.autonomous_database_backup.autonomous_database_id}"
59+
timestamp = "${oci_database_autonomous_database_backup.autonomous_database_backup.time_ended}"
60+
}
61+
2962
data "oci_database_autonomous_databases" "autonomous_databases" {
3063
#Required
3164
compartment_id = "${var.compartment_ocid}"

‎examples/database/adb/variables.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ variable "private_key_path" {}
77
variable "region" {}
88
variable "compartment_ocid" {}
99

10+
variable "autonomous_database_backup_display_name" {
11+
default = "Monthly Backup"
12+
}
13+
1014
variable "autonomous_database_db_workload" {
1115
default = "OLTP"
1216
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
77
github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
88
github.com/mitchellh/cli v1.0.0
9-
github.com/oracle/oci-go-sdk v15.1.0+incompatible
9+
github.com/oracle/oci-go-sdk v15.2.0+incompatible
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.3.0
1212
gopkg.in/yaml.v2 v2.2.2

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,8 @@ github.com/oracle/oci-go-sdk v15.0.0+incompatible h1:DN9mJZUJMm2IKY9z+lDg7Hz6e+n
344344
github.com/oracle/oci-go-sdk v15.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
345345
github.com/oracle/oci-go-sdk v15.1.0+incompatible h1:J+ZPaUim4XZqjdZK13GDsdtu/arw8NzFZGVdQzlrFZo=
346346
github.com/oracle/oci-go-sdk v15.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
347+
github.com/oracle/oci-go-sdk v15.2.0+incompatible h1:I//vgQYMUJ3M1tHJP7JaxhKD+wVuxwEX7ilENS7EFsQ=
348+
github.com/oracle/oci-go-sdk v15.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
347349
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
348350
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
349351
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

‎oci/core_drg_resource.go‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ func CoreDrgResource() *schema.Resource {
4949
},
5050

5151
// Computed
52+
"redundancy_status": {
53+
Type: schema.TypeString,
54+
Computed: true,
55+
},
5256
"state": {
5357
Type: schema.TypeString,
5458
Computed: true,
@@ -99,6 +103,7 @@ type CoreDrgResourceCrud struct {
99103
Client *oci_core.VirtualNetworkClient
100104
workRequestClient *oci_work_requests.WorkRequestClient
101105
Res *oci_core.Drg
106+
RedundancyStatus *oci_core.DrgRedundancyStatus
102107
DisableNotFoundRetries bool
103108
}
104109

@@ -180,7 +185,15 @@ func (s *CoreDrgResourceCrud) Get() error {
180185
}
181186

182187
s.Res = &response.Drg
183-
return nil
188+
189+
statusRequest := oci_core.GetDrgRedundancyStatusRequest{}
190+
statusRequest.DrgId = &tmp
191+
192+
if redundancyStatusResponse, err := s.Client.GetDrgRedundancyStatus(context.Background(), statusRequest); err == nil {
193+
s.RedundancyStatus = &redundancyStatusResponse.DrgRedundancyStatus
194+
}
195+
196+
return err
184197
}
185198

186199
func (s *CoreDrgResourceCrud) Update() error {
@@ -259,6 +272,10 @@ func (s *CoreDrgResourceCrud) SetData() error {
259272
s.D.Set("time_created", s.Res.TimeCreated.String())
260273
}
261274

275+
if s.RedundancyStatus != nil {
276+
s.D.Set("redundancy_status", s.RedundancyStatus.Status)
277+
}
278+
262279
return nil
263280
}
264281

‎oci/core_drg_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ func TestCoreDrgResource_basic(t *testing.T) {
9393
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
9494
resource.TestCheckResourceAttrSet(resourceName, "id"),
9595
resource.TestCheckResourceAttrSet(resourceName, "state"),
96+
resource.TestCheckResourceAttrSet(resourceName, "redundancy_status"),
9697

9798
func(s *terraform.State) (err error) {
9899
resId, err = fromInstanceState(s, resourceName, "id")
@@ -120,6 +121,7 @@ func TestCoreDrgResource_basic(t *testing.T) {
120121
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
121122
resource.TestCheckResourceAttrSet(resourceName, "id"),
122123
resource.TestCheckResourceAttrSet(resourceName, "state"),
124+
resource.TestCheckResourceAttrSet(resourceName, "redundancy_status"),
123125

124126
func(s *terraform.State) (err error) {
125127
resId2, err = fromInstanceState(s, resourceName, "id")
@@ -142,6 +144,7 @@ func TestCoreDrgResource_basic(t *testing.T) {
142144
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
143145
resource.TestCheckResourceAttrSet(resourceName, "id"),
144146
resource.TestCheckResourceAttrSet(resourceName, "state"),
147+
resource.TestCheckResourceAttrSet(resourceName, "redundancy_status"),
145148

146149
func(s *terraform.State) (err error) {
147150
resId2, err = fromInstanceState(s, resourceName, "id")

‎oci/core_instance_resource_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,10 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_preserveBoot
903903
},
904904
),
905905
},
906+
// to verify reattaching to the old boot volume resource should be terminated before the waiting for boot volume condition
907+
{
908+
Config: s.Config,
909+
},
906910
// ForceNew an instance by changing hostname_label and try reattach to the old boot volume,
907911
// We didn't set preserve flag in the previous step, so the boot volume should be deleted and
908912
// this should result in an error from service.

‎oci/core_instance_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
203203
resource.TestCheckResourceAttrSet(resourceName, "id"),
204204
resource.TestCheckResourceAttrSet(resourceName, "image"),
205205
resource.TestCheckResourceAttr(resourceName, "is_pv_encryption_in_transit_enabled", "true"),
206+
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "true"),
206207
resource.TestCheckResourceAttrSet(resourceName, "region"),
207208
resource.TestCheckResourceAttr(resourceName, "shape", "VM.Standard2.1"),
208209
resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -250,7 +251,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
250251
resource.TestCheckResourceAttr(resourceName, "launch_options.0.boot_volume_type", "ISCSI"),
251252
resource.TestCheckResourceAttr(resourceName, "launch_options.0.firmware", "UEFI_64"),
252253
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_consistent_volume_naming_enabled", "true"),
253-
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "true"),
254+
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "false"),
254255
resource.TestCheckResourceAttr(resourceName, "launch_options.0.network_type", "PARAVIRTUALIZED"),
255256
resource.TestCheckResourceAttr(resourceName, "launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
256257
resource.TestCheckResourceAttr(resourceName, "metadata.%", "1"),
@@ -312,7 +313,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
312313
resource.TestCheckResourceAttr(resourceName, "launch_options.0.boot_volume_type", "ISCSI"),
313314
resource.TestCheckResourceAttr(resourceName, "launch_options.0.firmware", "UEFI_64"),
314315
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_consistent_volume_naming_enabled", "true"),
315-
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "true"),
316+
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "false"),
316317
resource.TestCheckResourceAttr(resourceName, "launch_options.0.network_type", "PARAVIRTUALIZED"),
317318
resource.TestCheckResourceAttr(resourceName, "launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
318319
resource.TestCheckResourceAttr(resourceName, "metadata.%", "1"),
@@ -370,7 +371,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
370371
resource.TestCheckResourceAttr(resourceName, "launch_options.0.boot_volume_type", "ISCSI"),
371372
resource.TestCheckResourceAttr(resourceName, "launch_options.0.firmware", "UEFI_64"),
372373
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_consistent_volume_naming_enabled", "true"),
373-
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "true"),
374+
resource.TestCheckResourceAttr(resourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "false"),
374375
resource.TestCheckResourceAttr(resourceName, "launch_options.0.network_type", "PARAVIRTUALIZED"),
375376
resource.TestCheckResourceAttr(resourceName, "launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
376377
resource.TestCheckResourceAttr(resourceName, "metadata.%", "2"),
@@ -424,7 +425,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
424425
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.boot_volume_type", "ISCSI"),
425426
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.firmware", "UEFI_64"),
426427
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.is_consistent_volume_naming_enabled", "true"),
427-
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.is_pv_encryption_in_transit_enabled", "true"),
428+
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.is_pv_encryption_in_transit_enabled", "false"),
428429
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.network_type", "PARAVIRTUALIZED"),
429430
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
430431
resource.TestCheckResourceAttr(datasourceName, "instances.0.metadata.%", "2"),
@@ -463,7 +464,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
463464
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.boot_volume_type", "ISCSI"),
464465
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.firmware", "UEFI_64"),
465466
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.is_consistent_volume_naming_enabled", "true"),
466-
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "true"),
467+
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.is_pv_encryption_in_transit_enabled", "false"),
467468
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.network_type", "PARAVIRTUALIZED"),
468469
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
469470
resource.TestCheckResourceAttr(singularDatasourceName, "metadata.%", "2"),

‎oci/core_shape_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222
shapeResourceRepresentation = map[string]interface{}{
2323
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
2424
"image_id": Representation{repType: Required, create: `${oci_core_image.test_image.id}`},
25-
"shape_name": Representation{repType: Required, create: `VM.Standard.B1.1`},
25+
"shape_name": Representation{repType: Required, create: `VM.Standard.E2.1`},
2626
}
2727

2828
ShapeResourceConfig = OciImageIdsVariable +
@@ -61,7 +61,7 @@ func TestCoreShapeResource_basic(t *testing.T) {
6161
generateResourceFromRepresentationMap("oci_core_shape_management", "test_shape", Required, Create, shapeResourceRepresentation),
6262
Check: resource.ComposeAggregateTestCheckFunc(
6363
resource.TestCheckResourceAttrSet(resourceName, "image_id"),
64-
resource.TestCheckResourceAttr(resourceName, "shape_name", "VM.Standard.B1.1"),
64+
resource.TestCheckResourceAttr(resourceName, "shape_name", "VM.Standard.E2.1"),
6565
),
6666
},
6767
// verify Delete Compatible Image Shape

0 commit comments

Comments
 (0)