Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Empty file removed .gitmodules
Empty file.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 5.28.0 (February 07, 2024)

### Added
Missing DatabaseManualConnectionSubTypes to oci_database_migration_connection_resource
- Support for MySQL Database Service: Bring Your Own Certs (BYOC)
- Support for secret rotation feature in SiV
- Support for Configuration of Prometheus exporter for Management Agent
- Support for Digital Media Services - Resource Locking
### Bug Fix
- Fix the document for how to update volumes in oci_core_volume_group

## 5.27.0 (January 31, 2024)

### Added
Expand Down
68 changes: 67 additions & 1 deletion examples/databasemigration/migration/migration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,16 @@ variable "tgt_database_id" {
variable "bucket_id" {
}

variable "source_connection_rds_id" {
}


provider "oci" {
tenancy_ocid = var.tenancy_ocid
user_ocid = var.user_ocid
fingerprint = var.fingerprint
private_key_path = var.private_key_path
auth = "SecurityToken"
region = var.region

}
Expand Down Expand Up @@ -150,7 +155,7 @@ resource "oci_database_migration_connection" "test_connection_target" {
}

data "oci_identity_availability_domains" "test_availability_domains" {
compartment_id = var.tenancy_ocid
compartment_id = var.compartment_id
}

resource "oci_database_migration_connection" "test_connection_source" {
Expand All @@ -177,6 +182,25 @@ resource "oci_database_migration_connection" "test_connection_source" {
}
}

resource "oci_database_migration_connection" "test_connection_source_rds" {
admin_credentials {
password = "ORcl##4567890"
username = "admin"
}
compartment_id = var.compartment_id
connect_descriptor {
connect_string = "(description=(address=(port=1521)(host=10.2.2.17))(connect_data=(service_name=pdb0107svc.dbsubnet.gghubvcn.oraclevcn.com)))"
}
database_type = "MANUAL"
manual_database_sub_type = "RDS_ORACLE"
display_name = "TF_display_test_create_source_rds"
vault_details {
compartment_id = var.compartment_id
key_id = var.kms_key_id
vault_id = var.kms_vault_id
}
}

resource "oci_database_migration_connection" "test_connection_source_no_ssh" {
admin_credentials {
password = "ORcl##4567890"
Expand Down Expand Up @@ -291,6 +315,48 @@ resource "oci_database_migration_migration" "test_migration" {
}
}

resource "oci_database_migration_migration" "test_migration_rds" {
compartment_id = var.compartment_id

golden_gate_service_details {
settings {
acceptable_lag = "10"
extract {
long_trans_duration = "10"
performance_profile = "LOW"
}
}
}
data_transfer_medium_details_v2 {
type = "OBJECT_STORAGE"
}
datapump_settings {
export_directory_object {
name = "test_export_dir"
path = "/u01/app/oracle/product/19.0.0.0/dbhome_1/rdbms/log"
}
metadata_remaps {
new_value = "DATA"
old_value = "USERS"
type = "TABLESPACE"
}
}
exclude_objects {
object = ".*"
owner = "owner"
is_omit_excluded_table_from_replication = "false"
type = "ALL"
}
source_database_connection_id = var.source_connection_rds_id
target_database_connection_id = var.target_connection_id
type = "ONLINE"
vault_details {
compartment_id = var.compartment_id
key_id = var.kms_key_id
vault_id = var.kms_vault_id
}
}

resource "oci_database_migration_migration" "test_no_ssh_migration" {
compartment_id = var.compartment_id
source_database_connection_id = oci_database_migration_connection.test_connection_source_no_ssh.id
Expand Down
2 changes: 1 addition & 1 deletion examples/management_agent/management_agent.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ resource "oci_management_agent_management_agent_install_key" "test_management_ag
#Optional
allowed_key_install_count = "200"
display_name = "terraformTest"
time_expires = "2023-05-27T17:27:44.398Z"
time_expires = "2024-09-27T17:27:44.398Z"
}

resource "oci_management_agent_management_agent_install_key" "test_management_agent_install_key_unlimited" {
Expand Down
19 changes: 19 additions & 0 deletions examples/management_agent/management_agent_data_source.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0

resource "oci_management_agent_management_agent_data_source" "add_datasource" {
compartment_id = var.compartment_ocid
management_agent_id = data.oci_management_agent_management_agents.find_agent.management_agents[0].id
name = "PrometheusTestA"
type = "PROMETHEUS_EMITTER"
url = "http://localhost:1234"
namespace = "namespace"
allow_metrics = "*"

depends_on = [oci_management_agent_management_agent.test_management_agent]
}
data "oci_management_agent_management_agent_data_sources" "test_datasource_data" {
management_agent_id = data.oci_management_agent_management_agents.find_agent.management_agents[0].id
name = "PrometheusTestA"
depends_on = [oci_management_agent_management_agent_data_source.add_datasource]
}
32 changes: 12 additions & 20 deletions examples/media_services/common.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ variable "accepted_state" {
default = "ACCEPTED"
}

variable "locks_type" {
default = "FULL"
}

variable "locks_message" {
default = "message"
}

variable "is_lock_override" {
default = true
}

resource "oci_identity_tag_namespace" "tag-namespace1" {
compartment_id = var.tenancy_ocid
description = "example tag namespace"
Expand All @@ -68,23 +80,3 @@ resource "oci_identity_tag" "tag1" {
is_cost_tracking = false
is_retired = false
}

variable "kms_vault_id" {}

data "oci_kms_vault" "test_vault" {
#Required
vault_id = var.kms_vault_id
}

data "oci_kms_keys" "test_keys_dependency_RSA" {
#Required
compartment_id = var.tenancy_ocid
management_endpoint = data.oci_kms_vault.test_vault.management_endpoint
algorithm = "RSA"

filter {
name = "state"
values = ["ENABLED", "UPDATING"]
}
}

12 changes: 12 additions & 0 deletions examples/media_services/media_asset.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ resource "oci_media_services_media_asset" "test_media_asset" {
segment_range_start_index = var.media_asset_segment_range_start_index
source_media_workflow_id = oci_media_services_media_workflow.test_media_workflow.id
source_media_workflow_version = var.media_asset_source_media_workflow_version
locks {
#Required
compartment_id = var.compartment_id
type = var.locks_type

#Optional
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, is_lock_override]
}
}

data "oci_media_services_media_assets" "test_media_assets" {
Expand Down
15 changes: 12 additions & 3 deletions examples/media_services/media_workflow.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ variable "media_workflow_parameters" {
default = "{\"inputs\":{\"namespace\":\"namespace\"}}"
}

variable "media_workflow_tasks_enable_parameter_reference" {}

variable "media_workflow_tasks_key" {
default = "move"
}
Expand Down Expand Up @@ -50,9 +48,20 @@ resource "oci_media_services_media_workflow" "test_media_workflow" {
version = var.media_workflow_tasks_version

#Optional
enable_parameter_reference = var.media_workflow_tasks_enable_parameter_reference
prerequisites = var.media_workflow_tasks_prerequisites
}
locks {
#Required
compartment_id = var.compartment_id
type = var.locks_type

#Optional
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, is_lock_override]
}
}

data "oci_media_services_media_workflows" "test_media_workflows" {
Expand Down
12 changes: 12 additions & 0 deletions examples/media_services/media_workflow_configuration.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ resource "oci_media_services_media_workflow_configuration" "test_media_workflow_
#Optional
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.defined_tags_value}")
freeform_tags = var.freeform_tags
locks {
#Required
compartment_id = var.compartment_id
type = var.locks_type

#Optional
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, is_lock_override]
}
}

data "oci_media_services_media_workflow_configurations" "test_media_workflow_configurations" {
Expand Down
12 changes: 12 additions & 0 deletions examples/media_services/media_workflow_job.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ resource "oci_media_services_media_workflow_job" "test_media_workflow_job" {
media_workflow_id = oci_media_services_media_workflow.test_media_workflow.id
media_workflow_name = oci_media_services_media_workflow.test_media_workflow.display_name
parameters = var.media_workflow_job_parameters
locks {
#Required
compartment_id = var.compartment_id
type = var.locks_type

#Optional
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, is_lock_override]
}
}

data "oci_media_services_media_workflow_jobs" "test_media_workflow_jobs" {
Expand Down
21 changes: 0 additions & 21 deletions examples/media_services/media_workflow_job_fact.tf

This file was deleted.

12 changes: 12 additions & 0 deletions examples/media_services/stream_cdn_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,18 @@ resource "oci_media_services_stream_cdn_config" "test_stream_cdn_config" {
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.defined_tags_value}")
freeform_tags = var.freeform_tags
is_enabled = var.stream_cdn_config_is_enabled
locks {
#Required
compartment_id = var.compartment_id
type = var.locks_type

#Optional
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, system_tags, lifecyle_details, config, is_lock_override]
}
}

data "oci_media_services_stream_cdn_configs" "test_stream_cdn_configs" {
Expand Down
12 changes: 12 additions & 0 deletions examples/media_services/stream_distribution_channel.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ resource "oci_media_services_stream_distribution_channel" "test_stream_distribut
#Optional
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.defined_tags_value}")
freeform_tags = var.freeform_tags
locks {
#Required
compartment_id = var.compartment_id
type = var.locks_type

#Optional
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, is_lock_override]
}
}

data "oci_media_services_stream_distribution_channels" "test_stream_distribution_channels" {
Expand Down
13 changes: 9 additions & 4 deletions examples/media_services/stream_packaging_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@ resource "oci_media_services_stream_packaging_config" "test_stream_packaging_con

#Optional
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.defined_tags_value}")
encryption {
freeform_tags = var.freeform_tags
locks {
#Required
algorithm = var.stream_packaging_config_encryption_algorithm
compartment_id = var.compartment_id
type = var.locks_type

#Optional
kms_key_id = data.oci_kms_keys.test_keys_dependency_RSA.keys[0].id
message = var.locks_message
}
is_lock_override = var.is_lock_override
lifecycle {
ignore_changes = [defined_tags, locks, system_tags, encryption, is_lock_override]
}
freeform_tags = var.freeform_tags
}

data "oci_media_services_stream_packaging_configs" "test_stream_packaging_configs" {
Expand Down
5 changes: 4 additions & 1 deletion examples/mysql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {

#Optional
crash_recovery = "ENABLED"
database_management = "ENABLED"
database_management = "DISABLED"
secure_connections {
certificate_generation_type = "SYSTEM"
}

#Optional
deletion_policy {
Expand Down
Loading