Skip to content

Commit d9c297b

Browse files
authored
Merge pull request #1553 from oracle/release_gh
update changelog
2 parents ed4dcc4 + 6a07072 commit d9c297b

File tree

13,185 files changed

+186986
-179160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,185 files changed

+186986
-179160
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
## 4.68.0 (Unreleased)
1+
## 4.69.0 (Unreleased)
2+
3+
### Added
4+
- Support for MySQL Database Service Deletion Policy on Db Systems
5+
- Support for GGS Storage Utilization properties
6+
- Support for Resource Principle Auth
7+
- Support for shielded instance SDDC
8+
- Support for OPSI service supporting DBCS featuer
9+
- Support for Multi Autonomous VM Clusters in ExaCC
10+
- Support for Data Safe Discovery and Masking
11+
### Bug Fix
12+
- Update kmskey and vault id separately.
13+
14+
## 4.68.0 (March 16, 2022)
215

316
### Added
417
- Support for Multi Autonomous VM Clusters in ExaCC

examples/mysql/main.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,15 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
9494
source_type = "BACKUP"
9595
}
9696

97+
#Optional
9798
crash_recovery = "ENABLED"
99+
100+
#Optional
101+
deletion_policy {
102+
automatic_backup_retention = "DELETE"
103+
final_backup = "SKIP_FINAL_BACKUP"
104+
is_delete_protected = "false"
105+
}
98106
}
99107

100108
data "oci_mysql_mysql_configurations" "test_mysql_configurations" {

examples/ocvp/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@ resource "oci_ocvp_sddc" "test_sddc" {
370370
// Optional
371371
provisioning_vlan_id = oci_core_vlan.test_provisioning_vlan.id
372372
replication_vlan_id = oci_core_vlan.test_replication_vlan.id
373-
initial_sku = data.oci_ocvp_supported_skus.test_supported_skus.items[0].name
373+
initial_sku = "HOUR"
374+
is_shielded_instance_enabled = false
374375
hcx_action = "upgrade"
375376
refresh_hcx_license_status = true
376377
#reserving_hcx_on_premise_license_keys = var.reserving_hcx_on_premise_license_keys

examples/opsi/database_insight/database_insight.tf renamed to examples/opsi/database_insight/em_managed_database_insight/database_insight.tf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,14 @@ variable "resource_status" {
6161

6262
// Create Database insight for EM managed External Database
6363
resource "oci_opsi_database_insight" "test_database_insight" {
64+
#Required
6465
compartment_id = var.compartment_ocid
66+
entity_source = var.database_insight_entity_source
67+
68+
#Optional
6569
enterprise_manager_bridge_id = var.enterprise_manager_bridge_ocid
6670
enterprise_manager_entity_identifier = var.enterprise_manager_entity_id
6771
enterprise_manager_identifier = var.enterprise_manager_id
68-
entity_source = var.database_insight_entity_source
6972
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.database_insight_defined_tags_value}")}"
7073
freeform_tags = var.database_insight_freeform_tags
7174
status = var.resource_status
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_ocid" {}
10+
variable "opsi_private_endpoint_id" {}
11+
variable "dbsystem_database_id" {}
12+
variable "service_name" {}
13+
variable "user_name" {}
14+
variable "secret_id" {}
15+
16+
17+
provider "oci" {
18+
tenancy_ocid = var.tenancy_ocid
19+
user_ocid = var.user_ocid
20+
fingerprint = var.fingerprint
21+
private_key_path = var.private_key_path
22+
region = var.region
23+
}
24+
25+
resource "oci_identity_tag_namespace" "tag-namespace1" {
26+
compartment_id = var.tenancy_ocid
27+
description = "example tag namespace"
28+
name = "examples-tag-namespace-all"
29+
is_retired = false
30+
}
31+
32+
resource "oci_identity_tag" "tag1" {
33+
description = "example tag"
34+
name = "example-tag"
35+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
36+
is_cost_tracking = false
37+
is_retired = false
38+
}
39+
40+
variable "database_insight_database_type" {
41+
default = ["COMANAGED-VM-CDB"]
42+
}
43+
44+
variable "deployment_type" {
45+
default = "VIRTUAL_MACHINE"
46+
}
47+
48+
variable "database_insight_credential_details_credential_type" {
49+
default = "CREDENTIALS_BY_VAULT"
50+
}
51+
52+
variable "database_insight_credential_details_role" {
53+
default = "NORMAL"
54+
}
55+
56+
variable "database_insight_database_resource_type" {
57+
default = "database"
58+
}
59+
60+
variable "database_insight_defined_tags_value" {
61+
default = "value"
62+
}
63+
64+
variable "database_insight_entity_source" {
65+
default = "PE_COMANAGED_DATABASE"
66+
}
67+
68+
variable "database_insight_fields" {
69+
default = ["databaseName", "databaseType", "compartmentId", "databaseDisplayName", "freeformTags", "definedTags"]
70+
}
71+
72+
variable "database_insight_freeform_tags" {
73+
default = { "bar-key" = "value" }
74+
}
75+
76+
variable "resource_status" {
77+
default = "ENABLED"
78+
}
79+
80+
// Create Database insight for EM managed External Database
81+
resource "oci_opsi_database_insight" "test_database_insight" {
82+
#Required
83+
compartment_id = var.compartment_ocid
84+
entity_source = var.database_insight_entity_source
85+
86+
#Optional
87+
opsi_private_endpoint_id = var.opsi_private_endpoint_id
88+
service_name = var.service_name
89+
database_id = var.dbsystem_database_id
90+
deployment_type = var.deployment_type
91+
database_resource_type = var.database_insight_database_resource_type
92+
credential_details {
93+
credential_type = var.database_insight_credential_details_credential_type
94+
password_secret_id = var.secret_id
95+
role = var.database_insight_credential_details_role
96+
user_name = var.user_name
97+
}
98+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.database_insight_defined_tags_value}")}"
99+
freeform_tags = var.database_insight_freeform_tags
100+
status = var.resource_status
101+
}
102+
103+
variable "database_insight_state" {
104+
default = ["ACTIVE"]
105+
}
106+
107+
variable "database_insight_status" {
108+
default = ["ENABLED"]
109+
}
110+
111+
// List PE comanaged database insights
112+
data "oci_opsi_database_insights" "test_database_insights" {
113+
#Optional
114+
compartment_id = var.compartment_ocid
115+
database_type = var.database_insight_database_type
116+
opsi_private_endpoint_id = var.opsi_private_endpoint_id
117+
fields = var.database_insight_fields
118+
state = var.database_insight_state
119+
status = var.database_insight_status
120+
}
121+
122+
// Get an EM managed database insight
123+
data "oci_opsi_database_insight" "test_database_insight" {
124+
database_insight_id = oci_opsi_database_insight.test_database_insight.id
125+
}
126+
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_ocid" {}
10+
variable "vcn_id" {}
11+
variable "subnet_id" {}
12+
13+
variable "operations_insights_private_endpoint_compartment_id_in_subtree" {
14+
default = false
15+
}
16+
17+
variable "operations_insights_private_endpoint_defined_tags_value" {
18+
default = "value"
19+
}
20+
21+
variable "operations_insights_private_endpoint_description" {
22+
default = "TestDescription"
23+
}
24+
25+
variable "operations_insights_private_endpoint_display_name" {
26+
default = "TestPrivateEndpoint"
27+
}
28+
29+
variable "operations_insights_private_endpoint_freeform_tags" {
30+
default = { "bar-key" = "value" }
31+
}
32+
33+
variable "operations_insights_private_endpoint_is_used_for_rac_dbs" {
34+
default = false
35+
}
36+
37+
variable "operations_insights_private_endpoint_nsg_ids" {
38+
default = []
39+
}
40+
41+
variable "operations_insights_private_endpoint_state" {
42+
default = ["ACTIVE"]
43+
}
44+
45+
46+
provider "oci" {
47+
tenancy_ocid = var.tenancy_ocid
48+
user_ocid = var.user_ocid
49+
fingerprint = var.fingerprint
50+
private_key_path = var.private_key_path
51+
region = var.region
52+
}
53+
54+
resource "oci_identity_tag_namespace" "tag-namespace1" {
55+
compartment_id = var.tenancy_ocid
56+
description = "example tag namespace"
57+
name = "examples-tag-namespace-all"
58+
is_retired = false
59+
}
60+
61+
resource "oci_identity_tag" "tag1" {
62+
description = "example tag"
63+
name = "example-tag"
64+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
65+
is_cost_tracking = false
66+
is_retired = false
67+
}
68+
69+
resource "oci_opsi_operations_insights_private_endpoint" "test_operations_insights_private_endpoint" {
70+
compartment_id = var.compartment_ocid
71+
display_name = var.operations_insights_private_endpoint_display_name
72+
description = var.operations_insights_private_endpoint_description
73+
is_used_for_rac_dbs = var.operations_insights_private_endpoint_is_used_for_rac_dbs
74+
subnet_id = var.subnet_id
75+
vcn_id = var.vcn_id
76+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.operations_insights_private_endpoint_defined_tags_value}")}"
77+
freeform_tags = var.operations_insights_private_endpoint_freeform_tags
78+
nsg_ids = var.operations_insights_private_endpoint_nsg_ids
79+
}
80+
81+
data "oci_opsi_operations_insights_private_endpoints" "test_operations_insights_private_endpoints" {
82+
83+
#Optional
84+
compartment_id = var.compartment_ocid
85+
compartment_id_in_subtree = var.operations_insights_private_endpoint_compartment_id_in_subtree
86+
display_name = var.operations_insights_private_endpoint_display_name
87+
is_used_for_rac_dbs = var.operations_insights_private_endpoint_is_used_for_rac_dbs
88+
opsi_private_endpoint_id = oci_opsi_operations_insights_private_endpoint.test_operations_insights_private_endpoint.id
89+
state = var.operations_insights_private_endpoint_state
90+
vcn_id = var.vcn_id
91+
}
92+

examples/vulnerability_scanning_service/main.tf

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
11
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
22

3-
variable "tenancy_ocid" {
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
variable "compartment_ocid" {}
9+
10+
variable "container_scan_recipe_defined_tags_value" {
11+
default = "value"
412
}
513

6-
variable "user_ocid" {
14+
variable "container_scan_recipe_display_name" {
15+
default = "displayName"
716
}
817

9-
variable "fingerprint" {
18+
variable "container_scan_recipe_freeform_tags" {
19+
default = { "bar-key" = "value" }
1020
}
1121

12-
variable "private_key_path" {
22+
variable "container_scan_recipe_defined_tags" {
1323
}
1424

15-
variable "region" {
25+
variable "container_scan_recipe_image_count" {
26+
default = 4
1627
}
1728

18-
variable "compartment_ocid" {
29+
variable "container_scan_recipe_scan_settings_scan_level" {
30+
default = "NONE"
31+
}
32+
33+
variable "container_scan_recipe_state" {
34+
default = "Active"
1935
}
2036

2137
variable "host_scan_instance_ocid" {
@@ -107,11 +123,21 @@ resource "oci_vulnerability_scanning_container_scan_recipe" "test_container_scan
107123
compartment_id = var.compartment_ocid
108124
scan_settings {
109125
#Required
110-
scan_level = "NONE"
126+
scan_level = var.container_scan_recipe_scan_settings_scan_level
111127
}
112128

113129
#Optional
114-
defined_tags = {"foo-namespace.bar-key"= "value"}
115-
display_name = "TestContainerScanRecipe"
116-
freeform_tags = {"bar-key"= "value"}
130+
defined_tags = map(var.container_scan_recipe_defined_tags, var.container_scan_recipe_defined_tags_value)
131+
display_name = var.container_scan_recipe_display_name
132+
freeform_tags = var.container_scan_recipe_freeform_tags
133+
image_count = var.container_scan_recipe_image_count
134+
}
135+
136+
data "oci_vulnerability_scanning_container_scan_recipes" "test_container_scan_recipes" {
137+
#Required
138+
compartment_id = var.compartment_ocid
139+
140+
#Optional
141+
display_name = var.container_scan_recipe_display_name
142+
state = var.container_scan_recipe_state
117143
}

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ require (
5353
github.com/mitchellh/mapstructure v1.1.2 // indirect
5454
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5555
github.com/oklog/run v1.0.0 // indirect
56-
github.com/oracle/oci-go-sdk/v62 v62.0.0
56+
github.com/oracle/oci-go-sdk/v63 v63.0.0
5757
github.com/pmezard/go-difflib v1.0.0 // indirect
58-
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b // indirect
58+
github.com/sony/gobreaker v0.5.0 // indirect
5959
github.com/ulikunitz/xz v0.5.8 // indirect
6060
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
6161
github.com/zclconf/go-cty v1.8.4 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
289289
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
290290
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
291291
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
292-
github.com/oracle/oci-go-sdk/v62 v62.0.0 h1:XPIoVYOPcNexPdQVm7rnujN6b2oZAqKIEnV3pQkmxoA=
293-
github.com/oracle/oci-go-sdk/v62 v62.0.0/go.mod h1:YizV1/DlwUFdvo9HrLlUUTwJDklGzcgzeqvE2IVPluw=
292+
github.com/oracle/oci-go-sdk/v63 v63.0.0 h1:OOGCUmaDzrd5zTG8pljcnkR1ZHxg/991uEiQJi95/4E=
293+
github.com/oracle/oci-go-sdk/v63 v63.0.0/go.mod h1:n6V9PcyRW5wtHaNd2TltbV3sWvbNy3PNqLmLrcT23Fg=
294294
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
295295
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
296296
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -305,8 +305,8 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
305305
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
306306
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
307307
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
308-
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b h1:br+bPNZsJWKicw/5rALEo67QHs5weyD5tf8WST+4sJ0=
309-
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
308+
github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg=
309+
github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
310310
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
311311
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
312312
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=

internal/acctest/oci_sweeper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212

1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
14-
oci_identity "github.com/oracle/oci-go-sdk/v62/identity"
14+
oci_identity "github.com/oracle/oci-go-sdk/v63/identity"
1515

1616
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1717

0 commit comments

Comments
 (0)