-
Notifications
You must be signed in to change notification settings - Fork 692
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2287 from oracle/release_gh
Releasing version 6.24.0
- Loading branch information
Showing
410 changed files
with
19,237 additions
and
246 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| variable "tenancy_ocid" {} | ||
| variable "user_ocid" {} | ||
| variable "fingerprint" {} | ||
| variable "private_key_path" {} | ||
| variable "region" {} | ||
|
|
||
| provider "oci" { | ||
| //version = "5.36.0" | ||
| tenancy_ocid = var.tenancy_ocid | ||
| user_ocid = var.user_ocid | ||
| fingerprint = var.fingerprint | ||
| private_key_path = var.private_key_path | ||
| region = var.region | ||
| } | ||
|
|
||
| variable "compartment_id" { | ||
| default = "ocid1.test.oc1..<unique_ID>EXAMPLE-compartmentId-Value" | ||
| } | ||
|
|
||
| /*Creates an external MySQL database resource */ | ||
| resource "oci_database_management_external_my_sql_database" "test_external_my_sql_database" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
| db_name = "ExampleNameTest" | ||
| } | ||
|
|
||
| data "oci_database_management_external_my_sql_databases" "test_external_my_sql_databases" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
|
|
||
| #Optional | ||
| name = "ExampleNameTest" | ||
| } | ||
|
|
||
| /*Creates a database connecotor resource. Connector requires an external MySQL database to associate with. */ | ||
| resource "oci_database_management_external_my_sql_database_connector" "test_external_my_sql_database_connector" { | ||
| #Required | ||
| compartment_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-compartmentId-Value" | ||
| connector_details { | ||
| #Required | ||
| credential_type = "MYSQL_EXTERNAL_NON_SSL_CREDENTIALS" | ||
| display_name = "EXAMPLE-Name-Test" | ||
| external_database_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-externalDatabase-Value" | ||
| host_name = "exampleHost" | ||
| macs_agent_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-agent-Value" | ||
| network_protocol = "TCP" | ||
| port = "10" | ||
| ssl_secret_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-secret-Value" | ||
| } | ||
| is_test_connection_param = "false" | ||
| } | ||
|
|
||
| data "oci_database_management_external_my_sql_database_connectors" "test_external_my_sql_database_connectors" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
|
|
||
| #Optional | ||
| name = "ExampleTest" | ||
| } | ||
|
|
||
| /*To enable/disable database management, provide an external MySQL database OCID and connector OCID. | ||
| "true" to enable and "false" to disable. In this example database management is being enabled for the external MySQL database | ||
| using the given connector.*/ | ||
| resource "oci_database_management_external_my_sql_database_external_mysql_databases_management" "test_external_my_sql_database_external_mysql_databases_management" { | ||
| #Required | ||
|
|
||
| external_my_sql_database_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-database-Value" | ||
|
|
||
| enable_external_mysql_database = "true" | ||
|
|
||
| #Optional | ||
| connector_id ="ocid1.test.oc1..<unique_ID>EXAMPLE-connector-Value" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| variable "bucket_name" { | ||
| default = "testBucketName_1" | ||
| } | ||
|
|
||
| variable "bucket_namespace" { | ||
| default = "ansh8lvru1zp" | ||
| } | ||
|
|
||
| data "oci_identity_tenancy" "test_tenancy" { | ||
| #Required | ||
| tenancy_id = var.tenancy_ocid | ||
| } | ||
|
|
||
| data "oci_objectstorage_namespace" "test_namespace" { | ||
|
|
||
| #Optional | ||
| compartment_id = var.compartment_id | ||
| } | ||
|
|
||
| data "oci_objectstorage_bucket" "test_bucket" { | ||
| namespace = data.oci_objectstorage_namespace.test_namespace.namespace | ||
| name = var.bucket_name | ||
| } | ||
|
|
||
| data "oci_objectstorage_bucket" "test_member_bucket" { | ||
| namespace = data.oci_objectstorage_namespace.test_namespace.namespace | ||
| name = "example-bucket-source" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| // Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| // Licensed under the Mozilla Public License v2.0 | ||
|
|
||
| variable "tenancy_ocid" {} | ||
| variable "user_ocid" {} | ||
| variable "fingerprint" {} | ||
| variable "private_key_path" {} | ||
| variable "region" {} | ||
| variable "compartment_id" { | ||
| default = "ocid1.tenancy.oc1..aaaaaaaahowp4zu5z3p3to5mj7vjtlo7zqi2qmbjiij73vfulltlmvtf624a" | ||
| } | ||
| variable "disassociate_trigger" { | ||
| default = 0 | ||
| } | ||
|
|
||
| variable "dr_protection_group_association_peer_region" { | ||
| default = "us-ashburn-1" | ||
| } | ||
|
|
||
| variable "dr_protection_group_association_role" { | ||
| default = "STANDBY" | ||
| } | ||
|
|
||
| variable "dr_protection_group_defined_tags_value" { | ||
| default = "value" | ||
| } | ||
|
|
||
| variable "dr_protection_group_display_name" { | ||
| default = "displayName" | ||
| } | ||
|
|
||
| variable "dr_protection_group_freeform_tags" { | ||
| default = { "Department" = "Finance" } | ||
| } | ||
|
|
||
| variable "dr_protection_group_members_member_type_oke_cluster" { | ||
| default = "OKE_CLUSTER" | ||
| } | ||
|
|
||
| variable "dr_protection_group_state" { | ||
| default = "ACTIVE" | ||
| } | ||
|
|
||
| provider "oci" { | ||
| tenancy_ocid = var.tenancy_ocid | ||
| user_ocid = var.user_ocid | ||
| fingerprint = var.fingerprint | ||
| private_key_path = var.private_key_path | ||
| region = var.region | ||
| } | ||
|
|
||
| resource "oci_disaster_recovery_dr_protection_group" "test_peer" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
| display_name = var.dr_protection_group_display_name | ||
| log_location { | ||
| #Required | ||
| bucket = data.oci_objectstorage_bucket.test_bucket.name | ||
| namespace = data.oci_objectstorage_namespace.test_namespace.namespace | ||
| } | ||
|
|
||
| # Add OKE as a member | ||
| members { | ||
| #Required | ||
| member_id = data.oci_containerengine_clusters.test_clusters.clusters[0].id | ||
| member_type = var.dr_protection_group_members_member_type_oke_cluster | ||
| peer_cluster_id = data.oci_containerengine_clusters.peer_clusters.clusters[0].id | ||
| } | ||
| } | ||
|
|
||
| resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
| display_name = var.dr_protection_group_display_name | ||
| log_location { | ||
| #Required | ||
| bucket = data.oci_objectstorage_bucket.test_bucket.name | ||
| namespace = data.oci_objectstorage_namespace.test_namespace.namespace | ||
| } | ||
|
|
||
| lifecycle { | ||
| ignore_changes = [defined_tags] | ||
| } | ||
|
|
||
| #Optional | ||
| members { | ||
| #Required | ||
| member_id = data.oci_containerengine_clusters.peer_clusters.clusters[0].id | ||
| member_type = var.dr_protection_group_members_member_type_oke_cluster | ||
| peer_cluster_id = data.oci_containerengine_clusters.test_clusters.clusters[0].id | ||
| } | ||
|
|
||
| association { | ||
| #Required | ||
| role = var.dr_protection_group_association_role | ||
|
|
||
| #Optional | ||
| peer_id = oci_disaster_recovery_dr_protection_group.test_peer.id | ||
| peer_region = var.dr_protection_group_association_peer_region | ||
| } | ||
|
|
||
| #Optional | ||
| disassociate_trigger = var.disassociate_trigger | ||
|
|
||
| defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}") | ||
| freeform_tags = var.dr_protection_group_freeform_tags | ||
| } | ||
|
|
||
| data "oci_disaster_recovery_dr_protection_groups" "test_dr_protection_groups" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
|
|
||
| #Optional | ||
| display_name = var.dr_protection_group_display_name | ||
| dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id | ||
| state = var.dr_protection_group_state | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. | ||
| // Licensed under the Mozilla Public License v2.0 | ||
|
|
||
| variable "primary_cluster_name" { | ||
| description = "Primary OKE cluster" | ||
| type = string | ||
| default = "myCluster" | ||
| } | ||
|
|
||
| variable "peer_cluster_name" { | ||
| description = "Peer OKE cluster" | ||
| type = string | ||
| default = "peerCluster" | ||
| } | ||
|
|
||
| data "oci_containerengine_clusters" "test_clusters" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
|
|
||
| #Optional | ||
| name = var.primary_cluster_name | ||
| } | ||
|
|
||
| data "oci_containerengine_clusters" "peer_clusters" { | ||
| #Required | ||
| compartment_id = var.compartment_id | ||
|
|
||
| #Optional | ||
| name = var.peer_cluster_name | ||
| } |
Oops, something went wrong.