Skip to content

Commit ceb466d

Browse files
MaxrovrMaxrovr
authored
Merge pull request #2132 from oracle/release_gh
Releasing version 5.45.0
2 parents e017cca + c9afbe1 commit ceb466d

File tree

363 files changed

+12163
-306
lines changed

Some content is hidden

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

363 files changed

+12163
-306
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 5.45.0 (June 04, 2024)
2+
3+
### Added
4+
- Support for ADB-S: Cross-Tenancy Autonomous Data Guard standby
5+
examples and tests
6+
- Support for GoldenGate - Resource Locking
7+
- Support for Add DB2 deployment and additional connection types (R5)
8+
### Bug Fix
9+
- Fix function batching terraform bug
10+
- Capacity Management Breaking change fix
11+
112
## 5.44.0 (May 29, 2024)
213

314
### Added

‎examples/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ This directory contains Terraform configuration files showing how to create spec
8181
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/datasafe.zip)
8282
- datascience
8383
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/datascience.zip)
84+
- demand_signal
85+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/demand_signal.zip)
8486
- devops
8587
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/devops.zip)
8688
- disaster_recovery

‎examples/capacity_management/main.tf

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
// Copyright (c) 2017, 2023, 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_id" {}
10+
11+
variable "occ_customer_group_display_name" {
12+
default = "displayName"
13+
}
14+
15+
variable "occ_customer_group_id" {
16+
default = "id"
17+
}
18+
19+
variable "occ_customer_group_status" {
20+
default = "ENABLED"
21+
}
22+
23+
variable "occ_availability_catalog_base64encoded_catalog_details" {
24+
default = "RmluYWwgQ3VzdG9tZXIgT3JkZXIgRGF0ZSxDYXBhY2l0eSBIYW5kb3ZlciBEYXRlLFJlc291cmNlIFR5cGUsV29ya2xvYWQgVHlwZSxOYW1lLEF2YWlsYWJsZSBRdWFudGl0eSxVbml0CjIwMjUtMDItMjMsMjAyNS0wNC0wNSxDQVBBQ0lUWV9DT05TVFJBSU5ULFVTX1BST0QsVVMtQVNIQlVSTi0xLUFELTIsMTc1NSxTZXJ2ZXJzCjIwMjUtMDItMjMsMjAyNS0wNC0wNSxDQVBBQ0lUWV9DT05TVFJBSU5ULFJPVyxVUy1BU0hCVVJOLTEtQUQtMiwxNzU1LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxVU19QUk9ELEJNLlN0YW5kYXJkMy42NCwxMDgsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFJPVyxCTS5TdGFuZGFyZDMuNjQsMTA4LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxST1csQk0uU3RhbmRhcmQzLVdCLjY0LDE2MzA4LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxST1csQk0uU3RhbmRhcmQyVC5FNC1XQi4xMjgsNzM4LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxST1csQk0uU3RhbmRhcmQyVC5BMS1XQi4xNjAsNTgxNCxTZXJ2ZXJzCjIwMjUtMDItMjMsMjAyNS0wNC0wNSxTRVJWRVJfSFcsVVNfUFJPRCxCTS5TdGFuZGFyZDIuNTIsODQsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFJPVyxCTS5TdGFuZGFyZDIuNTIsODQsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFVTX1BST0QsQk0uU3RhbmRhcmQuRTVULUxNLjE5Miw4NDAsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFJPVyxCTS5TdGFuZGFyZC5FNVQtTE0uMTkyLDg0MCxTZXJ2ZXJzCjIwMjUtMDItMjMsMjAyNS0wNC0wNSxTRVJWRVJfSFcsVVNfUFJPRCxCTS5TdGFuZGFyZC5FNS4xOTIsMCxTZXJ2ZXJzCjIwMjUtMDItMjMsMjAyNS0wNC0wNSxTRVJWRVJfSFcsUk9XLEJNLlN0YW5kYXJkLkU1LjE5MiwwLFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxVU19QUk9ELEJNLlN0YW5kYXJkLkU0LjEyOCwzNTQ2LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxST1csQk0uU3RhbmRhcmQuRTQuMTI4LDM1NDYsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFVTX1BST0QsQk0uU3RhbmRhcmQuQTEuMTYwLDMyNTgsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFJPVyxCTS5TdGFuZGFyZC5BMS4xNjAsMzI1OCxTZXJ2ZXJzCjIwMjUtMDItMjMsMjAyNS0wNC0wNSxTRVJWRVJfSFcsUk9XLEJNLlN0YW5kYXJkLkExLVdCLjE2MCw2ODA0LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxVU19QUk9ELEJNLkRlbnNlSU8uRTVULjEyOCw0MzUsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFJPVyxCTS5EZW5zZUlPLkU1VC4xMjgsNDM1LFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxVU19QUk9ELEJNLkRlbnNlSU8uRTQuMTI4LDI3MDAsU2VydmVycwoyMDI1LTAyLTIzLDIwMjUtMDQtMDUsU0VSVkVSX0hXLFJPVyxCTS5EZW5zZUlPLkU0LjEyOCwyNzAwLFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxVU19QUk9ELEJNLkJpZ0RhdGEyLkU0LjEyOCAxNCBUQiwxNTAwLFNlcnZlcnMKMjAyNS0wMi0yMywyMDI1LTA0LTA1LFNFUlZFUl9IVyxST1csQk0uQmlnRGF0YTIuRTQuMTI4IDE0IFRCLDE1MDAsU2VydmVycw=="
25+
}
26+
27+
variable "occ_availability_catalog_display_name" {
28+
default = "testAvailabilityCatalog"
29+
}
30+
31+
variable "occ_availability_catalog_namespace" {
32+
default = "COMPUTE"
33+
}
34+
35+
variable "occ_availability_catalog_freeform_tags" {
36+
default = { "bar-key" = "value" }
37+
}
38+
39+
variable "occ_availability_catalog_description" {
40+
default = "This availability catalog is created via terraform provider"
41+
}
42+
43+
variable "customer_compartment_id" {
44+
default = "ocid1.tenancy.oc1..aaaaaaaa3gmchdtrnbtbdxt23e4vg6teuxdz5p533353tpo3k3jmebhzoklq"
45+
}
46+
47+
variable "occ_availability_catalog_metadata_details_format_version" {
48+
default = "V1"
49+
}
50+
51+
variable "occ_availability_catalog_catalog_state" {
52+
default = "NOT_UPLOADED"
53+
}
54+
55+
variable "occ_availability_catalog_id" {
56+
default = "id"
57+
}
58+
59+
variable "occ_capacity_request_availability_domain" {
60+
default = "US-ASHBURN-1-AD-2"
61+
}
62+
63+
variable "occ_capacity_request_date_expected_capacity_handover" {
64+
default = "2024/06/03"
65+
}
66+
67+
variable "occ_capacity_request_defined_tags_value" {
68+
default = "value"
69+
}
70+
71+
variable "occ_capacity_request_description" {
72+
default = "This is a test capacity request created via terraform provider"
73+
}
74+
75+
variable "occ_capacity_request_details_actual_handover_quantity" {
76+
default = 10
77+
}
78+
79+
variable "occ_capacity_request_details_date_actual_handover" {
80+
default = "dateActualHandover"
81+
}
82+
83+
variable "occ_capacity_request_details_date_expected_handover" {
84+
default = "dateExpectedHandover"
85+
}
86+
87+
variable "occ_capacity_request_details_demand_quantity" {
88+
default = 10
89+
}
90+
91+
variable "occ_capacity_request_details_expected_handover_quantity" {
92+
default = 10
93+
}
94+
95+
variable "occ_capacity_request_details_resource_type" {
96+
default = "SERVER_HW"
97+
}
98+
99+
variable "occ_capacity_request_details_workload_type" {
100+
default = "GENERIC"
101+
}
102+
103+
variable "occ_capacity_request_display_name" {
104+
default = "Test Request"
105+
}
106+
107+
variable "occ_capacity_request_freeform_tags" {
108+
default = { "bar-key" = "value" }
109+
}
110+
111+
variable "occ_capacity_request_id" {
112+
default = "id"
113+
}
114+
115+
variable "occ_capacity_request_lifecycle_details" {
116+
default = "lifecycleDetails"
117+
}
118+
119+
variable "occ_capacity_request_namespace" {
120+
default = "COMPUTE"
121+
}
122+
123+
variable "occ_capacity_request_region" {
124+
default = "US-ASHBURN-1"
125+
}
126+
127+
variable "occ_capacity_request_request_state" {
128+
default = "CREATED"
129+
}
130+
131+
variable "occ_availability_catalog_occ_availability_resource_type" {
132+
default = "SERVER_HW"
133+
}
134+
135+
provider "oci" {
136+
tenancy_ocid = var.tenancy_ocid
137+
user_ocid = var.user_ocid
138+
fingerprint = var.fingerprint
139+
private_key_path = var.private_key_path
140+
region = var.region
141+
}
142+
143+
data "oci_capacity_management_occ_customer_groups" "test_occ_customer_groups" {
144+
#Required
145+
compartment_id = var.compartment_id
146+
147+
#Optional
148+
# display_name = var.occ_customer_group_display_name
149+
# id = var.occ_customer_group_id
150+
# status = var.occ_customer_group_status
151+
}
152+
153+
resource "oci_capacity_management_occ_availability_catalog" "test_occ_availability_catalog" {
154+
#Required
155+
base64encoded_catalog_details = var.occ_availability_catalog_base64encoded_catalog_details
156+
compartment_id = var.compartment_id
157+
display_name = var.occ_availability_catalog_display_name
158+
namespace = var.occ_availability_catalog_namespace
159+
occ_customer_group_id = lookup(data.oci_capacity_management_occ_customer_groups.test_occ_customer_groups.occ_customer_group_collection.0.items[0], "id")
160+
161+
#Optional
162+
# defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.occ_availability_catalog_defined_tags_value)
163+
description = var.occ_availability_catalog_description
164+
freeform_tags = var.occ_availability_catalog_freeform_tags
165+
metadata_details {
166+
#Required
167+
format_version = var.occ_availability_catalog_metadata_details_format_version
168+
}
169+
}
170+
171+
172+
data "oci_capacity_management_occ_availability_catalogs" "published_catalog_collection" {
173+
compartment_id = var.customer_compartment_id
174+
}
175+
176+
data "oci_capacity_management_occ_availability_catalog_occ_availabilities" "published_occ_availability_catalog_occ_availabilities" {
177+
#Required
178+
occ_availability_catalog_id = lookup(data.oci_capacity_management_occ_availability_catalogs.published_catalog_collection.occ_availability_catalog_collection.0.items[0], "id")
179+
180+
#Optional
181+
# date_expected_capacity_handover = var.occ_availability_catalog_occ_availability_date_expected_capacity_handover
182+
# resource_name = oci_usage_proxy_resource.test_resource.name
183+
resource_type = var.occ_availability_catalog_occ_availability_resource_type
184+
# workload_type = var.occ_availability_catalog_occ_availability_workload_type
185+
}
186+
187+
resource "oci_capacity_management_occ_capacity_request" "test_occ_capacity_request" {
188+
#Required
189+
availability_domain = var.occ_capacity_request_availability_domain
190+
compartment_id = var.customer_compartment_id
191+
# date_expected_capacity_handover = lookup(data.oci_capacity_management_occ_availability_catalog_occ_availabilities.published_occ_availability_catalog_occ_availabilities.occ_availability_collection.0.items[0], "date_expected_capacity_handover")
192+
# date_expected_capacity_handover = formatdate("YYYY-MM-DDTHH:MM:SSZ",data.oci_capacity_management_occ_availability_catalog_occ_availabilities.published_occ_availability_catalog_occ_availabilities.occ_availability_collection.0.items[0].date_expected_capacity_handover)
193+
date_expected_capacity_handover = "2124-06-04T00:00:00.00Z"
194+
195+
details {
196+
#Required
197+
demand_quantity = var.occ_capacity_request_details_demand_quantity
198+
resource_name = lookup(data.oci_capacity_management_occ_availability_catalog_occ_availabilities.published_occ_availability_catalog_occ_availabilities.occ_availability_collection.0.items[0], "resource_name")
199+
resource_type = lookup(data.oci_capacity_management_occ_availability_catalog_occ_availabilities.published_occ_availability_catalog_occ_availabilities.occ_availability_collection.0.items[0], "resource_type")
200+
workload_type = lookup(data.oci_capacity_management_occ_availability_catalog_occ_availabilities.published_occ_availability_catalog_occ_availabilities.occ_availability_collection.0.items[0], "workload_type")
201+
202+
#Optional
203+
# actual_handover_quantity = var.occ_capacity_request_details_actual_handover_quantity
204+
# date_actual_handover = var.occ_capacity_request_details_date_actual_handover
205+
# date_expected_handover = var.occ_capacity_request_details_date_expected_handover
206+
# expected_handover_quantity = var.occ_capacity_request_details_expected_handover_quantity
207+
}
208+
display_name = var.occ_capacity_request_display_name
209+
namespace = var.occ_capacity_request_namespace
210+
occ_availability_catalog_id = lookup(data.oci_capacity_management_occ_availability_catalogs.published_catalog_collection.occ_availability_catalog_collection.0.items[0], "id")
211+
# occ_capacity_request_id = var.occ_capacity_request_occ_capacity_request_id
212+
region = var.occ_capacity_request_region
213+
214+
#Optional
215+
# defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.occ_capacity_request_defined_tags_value)
216+
description = var.occ_capacity_request_description
217+
freeform_tags = var.occ_capacity_request_freeform_tags
218+
lifecycle_details = var.occ_capacity_request_lifecycle_details
219+
# patch_operations {
220+
# #Required
221+
# operation = var.occ_capacity_request_patch_operations_operation
222+
# selection = var.occ_capacity_request_patch_operations_selection
223+
#
224+
# #Optional
225+
# from = var.occ_capacity_request_patch_operations_from
226+
# position = var.occ_capacity_request_patch_operations_position
227+
# selected_item = var.occ_capacity_request_patch_operations_selected_item
228+
# value = var.occ_capacity_request_patch_operations_value
229+
# values = var.occ_capacity_request_patch_operations_values
230+
# }
231+
request_state = var.occ_capacity_request_request_state
232+
}

‎examples/database/adb/adb_cross_tenancy/adb_cross_tenancy_dataguard.tf

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "random_string" "autonomous_database_admin_password" {
5+
length = 16
6+
min_numeric = 1
7+
min_lower = 1
8+
min_upper = 1
9+
min_special = 1
10+
}
11+
resource "time_sleep" "wait_300_seconds" {
12+
destroy_duration = "5m"
13+
depends_on = [oci_database_autonomous_database.autonomous_database_cross_tenancy_dataguard_primary]
14+
}
15+
16+
resource "oci_database_autonomous_database" "autonomous_database_cross_tenancy_dataguard_primary" {
17+
admin_password = random_string.autonomous_database_admin_password.result
18+
compartment_id = var.compartment_id
19+
cpu_core_count = "1"
20+
data_storage_size_in_tbs = "1"
21+
db_name = "adbdb11ff6510"
22+
db_version = "19c"
23+
license_model = "LICENSE_INCLUDED"
24+
is_free_tier = "false"
25+
}
26+
27+
resource "oci_database_autonomous_database" "autonomous_database_cross_tenancy_dataguard_standby" {
28+
provider = oci.standby_tenancy
29+
compartment_id = var.standby_compartment_id
30+
source = "CROSS_TENANCY_DISASTER_RECOVERY"
31+
disaster_recovery_type = "ADG"
32+
source_id = oci_database_autonomous_database.autonomous_database_cross_tenancy_dataguard_primary.id
33+
db_name = oci_database_autonomous_database.autonomous_database_cross_tenancy_dataguard_primary.db_name
34+
}
35+
36+
data "oci_database_autonomous_databases" "autonomous_databases" {
37+
filter {
38+
name = "id"
39+
values = [oci_database_autonomous_database.autonomous_database_cross_tenancy_dataguard_standby.id]
40+
}
41+
42+
filter {
43+
name = "role"
44+
values = ["STANDBY"]
45+
}
46+
47+
#Required
48+
compartment_id = var.standby_compartment_id
49+
50+
}
51+
52+
output "autonomous_databases" {
53+
value = data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases
54+
}
55+
56+
data "oci_database_autonomous_database_peers" "autonomous_database_peers" {
57+
autonomous_database_id = oci_database_autonomous_database.autonomous_database_cross_tenancy_dataguard_primary.id
58+
}
59+
60+
output "autonomous_database_peers" {
61+
value = data.oci_database_autonomous_database_peers.autonomous_database_peers.autonomous_database_peer_collection
62+
}
63+
64+
65+

‎examples/database/adb/adb_cross_tenancy/provider.tf

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {
5+
}
6+
7+
variable "standby_tenancy_ocid" {
8+
}
9+
10+
variable "user_ocid" {
11+
}
12+
13+
variable "standby_user_ocid" {
14+
}
15+
16+
variable "fingerprint" {
17+
}
18+
19+
variable "standby_fingerprint" {
20+
}
21+
22+
variable "private_key_path" {
23+
}
24+
25+
variable "standby_private_key_path" {
26+
}
27+
28+
variable "compartment_id" {
29+
}
30+
31+
variable "standby_compartment_id" {
32+
}
33+
34+
variable "standby_region" {
35+
}
36+
37+
provider "oci" {
38+
region = var.region
39+
tenancy_ocid = var.tenancy_ocid
40+
user_ocid = var.user_ocid
41+
fingerprint = var.fingerprint
42+
private_key_path = var.private_key_path
43+
}
44+
45+
provider "oci" {
46+
alias = "standby_tenancy"
47+
region = var.standby_region
48+
tenancy_ocid = var.standby_tenancy_ocid
49+
user_ocid = var.user_ocid
50+
fingerprint = var.standby_fingerprint
51+
private_key_path = var.standby_private_key_path
52+
}

‎examples/demand_signal/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Overview
2+
This is a Terraform configuration that creates the `demand_signal` service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
5+
## Magic Button
6+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/demand_signal.zip)

‎examples/demand_signal/description.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Overview
2+
This is a Terraform configuration that creates the `demand_signal` service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.

0 commit comments

Comments
 (0)