Skip to content

Commit ed18573

Browse files
authored
Merge pull request #2040 from oracle/release_gh
Releasing version 5.28.0
2 parents 09d7fc9 + fd61f95 commit ed18573

File tree

402 files changed

+14967
-1974
lines changed

Some content is hidden

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

402 files changed

+14967
-1974
lines changed

.gitmodules

Whitespace-only changes.

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 5.28.0 (February 07, 2024)
2+
3+
### Added
4+
Missing DatabaseManualConnectionSubTypes to oci_database_migration_connection_resource
5+
- Support for MySQL Database Service: Bring Your Own Certs (BYOC)
6+
- Support for secret rotation feature in SiV
7+
- Support for Configuration of Prometheus exporter for Management Agent
8+
- Support for Digital Media Services - Resource Locking
9+
### Bug Fix
10+
- Fix the document for how to update volumes in oci_core_volume_group
11+
112
## 5.27.0 (January 31, 2024)
213

314
### Added

examples/databasemigration/migration/migration.tf

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,16 @@ variable "tgt_database_id" {
6161
variable "bucket_id" {
6262
}
6363

64+
variable "source_connection_rds_id" {
65+
}
66+
67+
6468
provider "oci" {
6569
tenancy_ocid = var.tenancy_ocid
6670
user_ocid = var.user_ocid
6771
fingerprint = var.fingerprint
6872
private_key_path = var.private_key_path
73+
auth = "SecurityToken"
6974
region = var.region
7075

7176
}
@@ -150,7 +155,7 @@ resource "oci_database_migration_connection" "test_connection_target" {
150155
}
151156

152157
data "oci_identity_availability_domains" "test_availability_domains" {
153-
compartment_id = var.tenancy_ocid
158+
compartment_id = var.compartment_id
154159
}
155160

156161
resource "oci_database_migration_connection" "test_connection_source" {
@@ -177,6 +182,25 @@ resource "oci_database_migration_connection" "test_connection_source" {
177182
}
178183
}
179184

185+
resource "oci_database_migration_connection" "test_connection_source_rds" {
186+
admin_credentials {
187+
password = "ORcl##4567890"
188+
username = "admin"
189+
}
190+
compartment_id = var.compartment_id
191+
connect_descriptor {
192+
connect_string = "(description=(address=(port=1521)(host=10.2.2.17))(connect_data=(service_name=pdb0107svc.dbsubnet.gghubvcn.oraclevcn.com)))"
193+
}
194+
database_type = "MANUAL"
195+
manual_database_sub_type = "RDS_ORACLE"
196+
display_name = "TF_display_test_create_source_rds"
197+
vault_details {
198+
compartment_id = var.compartment_id
199+
key_id = var.kms_key_id
200+
vault_id = var.kms_vault_id
201+
}
202+
}
203+
180204
resource "oci_database_migration_connection" "test_connection_source_no_ssh" {
181205
admin_credentials {
182206
password = "ORcl##4567890"
@@ -291,6 +315,48 @@ resource "oci_database_migration_migration" "test_migration" {
291315
}
292316
}
293317

318+
resource "oci_database_migration_migration" "test_migration_rds" {
319+
compartment_id = var.compartment_id
320+
321+
golden_gate_service_details {
322+
settings {
323+
acceptable_lag = "10"
324+
extract {
325+
long_trans_duration = "10"
326+
performance_profile = "LOW"
327+
}
328+
}
329+
}
330+
data_transfer_medium_details_v2 {
331+
type = "OBJECT_STORAGE"
332+
}
333+
datapump_settings {
334+
export_directory_object {
335+
name = "test_export_dir"
336+
path = "/u01/app/oracle/product/19.0.0.0/dbhome_1/rdbms/log"
337+
}
338+
metadata_remaps {
339+
new_value = "DATA"
340+
old_value = "USERS"
341+
type = "TABLESPACE"
342+
}
343+
}
344+
exclude_objects {
345+
object = ".*"
346+
owner = "owner"
347+
is_omit_excluded_table_from_replication = "false"
348+
type = "ALL"
349+
}
350+
source_database_connection_id = var.source_connection_rds_id
351+
target_database_connection_id = var.target_connection_id
352+
type = "ONLINE"
353+
vault_details {
354+
compartment_id = var.compartment_id
355+
key_id = var.kms_key_id
356+
vault_id = var.kms_vault_id
357+
}
358+
}
359+
294360
resource "oci_database_migration_migration" "test_no_ssh_migration" {
295361
compartment_id = var.compartment_id
296362
source_database_connection_id = oci_database_migration_connection.test_connection_source_no_ssh.id

examples/management_agent/management_agent.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resource "oci_management_agent_management_agent_install_key" "test_management_ag
7272
#Optional
7373
allowed_key_install_count = "200"
7474
display_name = "terraformTest"
75-
time_expires = "2023-05-27T17:27:44.398Z"
75+
time_expires = "2024-09-27T17:27:44.398Z"
7676
}
7777

7878
resource "oci_management_agent_management_agent_install_key" "test_management_agent_install_key_unlimited" {
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_management_agent_management_agent_data_source" "add_datasource" {
5+
compartment_id = var.compartment_ocid
6+
management_agent_id = data.oci_management_agent_management_agents.find_agent.management_agents[0].id
7+
name = "PrometheusTestA"
8+
type = "PROMETHEUS_EMITTER"
9+
url = "http://localhost:1234"
10+
namespace = "namespace"
11+
allow_metrics = "*"
12+
13+
depends_on = [oci_management_agent_management_agent.test_management_agent]
14+
}
15+
data "oci_management_agent_management_agent_data_sources" "test_datasource_data" {
16+
management_agent_id = data.oci_management_agent_management_agents.find_agent.management_agents[0].id
17+
name = "PrometheusTestA"
18+
depends_on = [oci_management_agent_management_agent_data_source.add_datasource]
19+
}

examples/media_services/common.tf

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@ variable "accepted_state" {
5454
default = "ACCEPTED"
5555
}
5656

57+
variable "locks_type" {
58+
default = "FULL"
59+
}
60+
61+
variable "locks_message" {
62+
default = "message"
63+
}
64+
65+
variable "is_lock_override" {
66+
default = true
67+
}
68+
5769
resource "oci_identity_tag_namespace" "tag-namespace1" {
5870
compartment_id = var.tenancy_ocid
5971
description = "example tag namespace"
@@ -68,23 +80,3 @@ resource "oci_identity_tag" "tag1" {
6880
is_cost_tracking = false
6981
is_retired = false
7082
}
71-
72-
variable "kms_vault_id" {}
73-
74-
data "oci_kms_vault" "test_vault" {
75-
#Required
76-
vault_id = var.kms_vault_id
77-
}
78-
79-
data "oci_kms_keys" "test_keys_dependency_RSA" {
80-
#Required
81-
compartment_id = var.tenancy_ocid
82-
management_endpoint = data.oci_kms_vault.test_vault.management_endpoint
83-
algorithm = "RSA"
84-
85-
filter {
86-
name = "state"
87-
values = ["ENABLED", "UPDATING"]
88-
}
89-
}
90-

examples/media_services/media_asset.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,18 @@ resource "oci_media_services_media_asset" "test_media_asset" {
7171
segment_range_start_index = var.media_asset_segment_range_start_index
7272
source_media_workflow_id = oci_media_services_media_workflow.test_media_workflow.id
7373
source_media_workflow_version = var.media_asset_source_media_workflow_version
74+
locks {
75+
#Required
76+
compartment_id = var.compartment_id
77+
type = var.locks_type
78+
79+
#Optional
80+
message = var.locks_message
81+
}
82+
is_lock_override = var.is_lock_override
83+
lifecycle {
84+
ignore_changes = [defined_tags, locks, is_lock_override]
85+
}
7486
}
7587

7688
data "oci_media_services_media_assets" "test_media_assets" {

examples/media_services/media_workflow.tf

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ variable "media_workflow_parameters" {
1010
default = "{\"inputs\":{\"namespace\":\"namespace\"}}"
1111
}
1212

13-
variable "media_workflow_tasks_enable_parameter_reference" {}
14-
1513
variable "media_workflow_tasks_key" {
1614
default = "move"
1715
}
@@ -50,9 +48,20 @@ resource "oci_media_services_media_workflow" "test_media_workflow" {
5048
version = var.media_workflow_tasks_version
5149

5250
#Optional
53-
enable_parameter_reference = var.media_workflow_tasks_enable_parameter_reference
5451
prerequisites = var.media_workflow_tasks_prerequisites
5552
}
53+
locks {
54+
#Required
55+
compartment_id = var.compartment_id
56+
type = var.locks_type
57+
58+
#Optional
59+
message = var.locks_message
60+
}
61+
is_lock_override = var.is_lock_override
62+
lifecycle {
63+
ignore_changes = [defined_tags, locks, is_lock_override]
64+
}
5665
}
5766

5867
data "oci_media_services_media_workflows" "test_media_workflows" {

examples/media_services/media_workflow_configuration.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ resource "oci_media_services_media_workflow_configuration" "test_media_workflow_
1515
#Optional
1616
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.defined_tags_value}")
1717
freeform_tags = var.freeform_tags
18+
locks {
19+
#Required
20+
compartment_id = var.compartment_id
21+
type = var.locks_type
22+
23+
#Optional
24+
message = var.locks_message
25+
}
26+
is_lock_override = var.is_lock_override
27+
lifecycle {
28+
ignore_changes = [defined_tags, locks, is_lock_override]
29+
}
1830
}
1931

2032
data "oci_media_services_media_workflow_configurations" "test_media_workflow_configurations" {

examples/media_services/media_workflow_job.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ resource "oci_media_services_media_workflow_job" "test_media_workflow_job" {
2727
media_workflow_id = oci_media_services_media_workflow.test_media_workflow.id
2828
media_workflow_name = oci_media_services_media_workflow.test_media_workflow.display_name
2929
parameters = var.media_workflow_job_parameters
30+
locks {
31+
#Required
32+
compartment_id = var.compartment_id
33+
type = var.locks_type
34+
35+
#Optional
36+
message = var.locks_message
37+
}
38+
is_lock_override = var.is_lock_override
39+
lifecycle {
40+
ignore_changes = [defined_tags, locks, is_lock_override]
41+
}
3042
}
3143

3244
data "oci_media_services_media_workflow_jobs" "test_media_workflow_jobs" {

0 commit comments

Comments
 (0)