Skip to content

Commit 243b450

Browse files
committed
Merge branch 'master' into release_gh
# Conflicts: # CHANGELOG.md
2 parents 53abb1f + 7902aa2 commit 243b450

30 files changed

+1295
-110
lines changed

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1+
## 5.47.0 (Unreleased)
2+
3+
### Added
4+
- Support for ADB-S: Allow Public Access to Databases on Private Endpoint
5+
- management resource for masking policy health report in Data Safe
6+
- Upgrade golang.org/x/net to v0.23.0
7+
- Support for Dynamic Notification for Alarms
8+
### Bug Fix
9+
- Terraform for fix autostart and autostop removal of scheduled operations
10+
- Need to Set db_node_id int Set db_node function
11+
- allow update native pod networking, only update placement config when there is a change
12+
- oci_log_analytics_namespace source doc fix
13+
114
## 5.46.0 (June 11, 2024)
215

316
### Added
417
- Support for Dynamic Notification for Alarms
518
### Bug Fix
619
- oci_log_analytics_namespace source doc fix
7-
- Allow update native pod networking, only update placement config when there is a change
820

921
## 5.45.0 (June 04, 2024)
1022

examples/database/adb/autonomous_database.tf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,31 @@ resource "oci_database_autonomous_database" "test_autonomous_database_bck_ret_da
129129
is_free_tier = "false"
130130
}
131131

132+
resource "oci_database_autonomous_database" "autonomous_database_private_ip_with_acls" {
133+
#Required
134+
admin_password = random_string.autonomous_database_admin_password.result
135+
compartment_id = var.compartment_ocid
136+
compute_count = "2.0"
137+
compute_model = "ECPU"
138+
data_storage_size_in_tbs = "1"
139+
db_name = "adbdbpeacl"
140+
141+
#Optional
142+
db_version = data.oci_database_autonomous_db_versions.test_autonomous_db_versions.autonomous_db_versions[0].version
143+
db_workload = var.autonomous_database_db_workload
144+
display_name = "example_autonomous_database"
145+
freeform_tags = var.autonomous_database_freeform_tags
146+
is_auto_scaling_enabled = "true"
147+
is_auto_scaling_for_storage_enabled = "true"
148+
license_model = var.autonomous_database_license_model
149+
is_preview_version_with_service_terms_accepted = "false"
150+
character_set = "AL32UTF8"
151+
ncharacter_set = "AL16UTF16"
152+
subnet_id = oci_core_subnet.test_subnet.id
153+
nsg_ids = ["test-bn-nsg-id-1"]
154+
whitelisted_ips = ["1.1.1.28"]
155+
}
156+
132157
resource "oci_database_autonomous_database" "test_autonomous_database_db_tools" {
133158
admin_password = random_string.autonomous_database_admin_password.result
134159
compartment_id = var.compartment_ocid
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) 2017, 2024, 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 "data_safe_target_ocid" {}
10+
variable "data_safe_masking_policy_id" {}
11+
12+
provider "oci" {
13+
tenancy_ocid = var.tenancy_ocid
14+
user_ocid = var.user_ocid
15+
fingerprint = var.fingerprint
16+
private_key_path = var.private_key_path
17+
region = var.region
18+
}
19+
20+
21+
resource "oci_data_safe_masking_policy_health_report_management" "test_health_report" {
22+
#Required
23+
target_id = var.data_safe_target_ocid
24+
masking_policy_id = var.data_safe_masking_policy_id
25+
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/mitchellh/mapstructure v1.5.0 // indirect
5353
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5454
github.com/oklog/run v1.0.0 // indirect
55-
github.com/oracle/oci-go-sdk/v65 v65.67.1
55+
github.com/oracle/oci-go-sdk/v65 v65.67.2
5656
github.com/pmezard/go-difflib v1.0.0 // indirect
5757
github.com/sony/gobreaker v0.5.0 // indirect
5858
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
140140
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
141141
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
142142
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
143-
github.com/oracle/oci-go-sdk/v65 v65.67.1 h1:gNmvMT61SgLMmKfWOkzLdXN1NwYRFUWIxEXgJogQFGc=
144-
github.com/oracle/oci-go-sdk/v65 v65.67.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
143+
github.com/oracle/oci-go-sdk/v65 v65.67.2 h1:ieNt3Gm9MSGNuPXEBUg6MoSRE3ByWlxj0GBKlvD/Cls=
144+
github.com/oracle/oci-go-sdk/v65 v65.67.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
145145
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
146146
github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
147147
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

internal/globalvar/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"log"
88
)
99

10-
const Version = "5.46.0"
11-
const ReleaseDate = "2024-06-12"
10+
const Version = "5.47.0"
11+
const ReleaseDate = "2024-06-19"
1212

1313
func PrintVersion() {
1414
log.Printf("[INFO] terraform-provider-oci %s\n", Version)
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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+
DataSafeMaskingPolicyHealthReportManagementResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_data_safe_masking_policy_health_report_management", "test_masking_policy_health_report_management", acctest.Optional, acctest.Create, DataSafeMaskingPolicyHealthReportManagementRepresentation)
15+
16+
ignoreMaskPolicyHealthReportSystemTagsChangesRep = map[string]interface{}{
17+
"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`defined_tags`}},
18+
}
19+
20+
DataSafeMaskingPolicyHealthReportManagementRepresentation = map[string]interface{}{
21+
"target_id": acctest.Representation{RepType: acctest.Required, Create: `${var.target_id}`},
22+
"masking_policy_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.masking_policy_id}`},
23+
"lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreMaskPolicyHealthReportSystemTagsChangesRep},
24+
}
25+
)
26+
27+
func TestDataSafeMaskingPolicyHealthReportManagementResource_basic(t *testing.T) {
28+
httpreplay.SetScenario("TestDataSafeMaskingPolicyHealthReportManagementResource_basic")
29+
defer httpreplay.SaveScenario()
30+
31+
config := acctest.ProviderTestConfig()
32+
33+
compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
34+
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
35+
36+
targetId := utils.GetEnvSettingWithBlankDefault("data_safe_target_ocid")
37+
targetIdVariableStr := fmt.Sprintf("variable \"target_id\" { default = \"%s\" }\n", targetId)
38+
39+
maskingPolicyId := utils.GetEnvSettingWithBlankDefault("data_safe_masking_policy_id")
40+
maskingPolicyIdVariableStr := fmt.Sprintf("variable \"masking_policy_id\" { default = \"%s\" }\n", maskingPolicyId)
41+
42+
resourceName := "oci_data_safe_masking_policy_health_report_management.test_masking_policy_health_report_management"
43+
44+
acctest.ResourceTest(t, nil, []resource.TestStep{
45+
{
46+
Config: config + compartmentIdVariableStr + maskingPolicyIdVariableStr + targetIdVariableStr +
47+
acctest.GenerateResourceFromRepresentationMap("oci_data_safe_masking_policy_health_report_management", "test_masking_policy_health_report_management", acctest.Optional, acctest.Create, DataSafeMaskingPolicyHealthReportManagementRepresentation),
48+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
49+
50+
resource.TestCheckResourceAttrSet(resourceName, "id"),
51+
resource.TestCheckResourceAttr(resourceName, "target_id", targetId),
52+
resource.TestCheckResourceAttr(resourceName, "masking_policy_id", maskingPolicyId),
53+
resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
54+
resource.TestCheckResourceAttrSet(resourceName, "display_name"),
55+
),
56+
},
57+
})
58+
}

internal/integrationtest/database_autonomous_database_peer_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ var (
3535
"is_mtls_connection_required": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
3636
"autonomous_maintenance_schedule_type": acctest.Representation{RepType: acctest.Optional, Create: `REGULAR`},
3737
"is_preview_version_with_service_terms_accepted": acctest.Representation{RepType: acctest.Optional, Create: `false`},
38-
"customer_contacts": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseCustomerContactsRepresentation},
39-
"license_model": acctest.Representation{RepType: acctest.Optional, Create: `LICENSE_INCLUDED`},
40-
"scheduled_operations": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentation},
38+
"customer_contacts": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseCustomerContactsRepresentation},
39+
"license_model": acctest.Representation{RepType: acctest.Optional, Create: `LICENSE_INCLUDED`},
40+
//"scheduled_operations": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentation},
4141
"whitelisted_ips": acctest.Representation{RepType: acctest.Optional, Create: []string{`1.1.1.1/28`}},
4242
"operations_insights_status": acctest.Representation{RepType: acctest.Optional, Create: `NOT_ENABLED`, Update: `ENABLED`},
4343
"timeouts": acctest.RepresentationGroup{RepType: acctest.Required, Group: autonomousDatabaseTimeoutsRepresentation},

0 commit comments

Comments
 (0)