Skip to content

Commit d25a231

Browse files
authored
Merge pull request #1980 from oracle/release_gh
Releasing version 5.18.0
2 parents 4520709 + 48dc753 commit d25a231

File tree

517 files changed

+28054
-1264
lines changed

Some content is hidden

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

517 files changed

+28054
-1264
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
File renamed without changes.

examples/adm/remediation/main.tf

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
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_ocid" {}
10+
variable "devops_code_repository_ocid" {}
11+
variable "devops_build_pipeline_ocid" {}
12+
variable "core_subnet_ocid" {}
13+
14+
variable "remediation_recipe_freeform_tags" {
15+
default = { "bar-key" = "value" }
16+
}
17+
18+
variable "remediation_recipe_defined_tags" {
19+
default = { "example-tag-namespace-all.example-tag" = "value" }
20+
}
21+
22+
variable "remediation_recipe_id" {
23+
default = "id"
24+
}
25+
26+
provider "oci" {
27+
tenancy_ocid = var.tenancy_ocid
28+
user_ocid = var.user_ocid
29+
fingerprint = var.fingerprint
30+
private_key_path = var.private_key_path
31+
region = var.region
32+
}
33+
34+
resource "oci_adm_knowledge_base" "example_knowledge_base" {
35+
#Required
36+
compartment_id = var.compartment_ocid
37+
38+
#Optional
39+
display_name = "Example_Knowledge_Base"
40+
}
41+
42+
resource "oci_adm_remediation_recipe" "example_remediation_recipe" {
43+
compartment_id = var.compartment_ocid
44+
display_name = "example_remediation_recipe"
45+
knowledge_base_id = oci_adm_knowledge_base.example_knowledge_base.id
46+
47+
is_run_triggered_on_kb_change = false
48+
detect_configuration {
49+
exclusions = []
50+
max_permissible_cvss_v2score = 1.5
51+
max_permissible_cvss_v3score = 1.5
52+
upgrade_policy = "NEAREST"
53+
}
54+
network_configuration {
55+
subnet_id = var.core_subnet_ocid
56+
}
57+
scm_configuration {
58+
branch = "main"
59+
is_automerge_enabled = false
60+
scm_type = "OCI_CODE_REPOSITORY"
61+
build_file_location = "pom.xml"
62+
oci_code_repository_id = var.devops_code_repository_ocid
63+
}
64+
verify_configuration {
65+
build_service_type = "OCI_DEVOPS_BUILD"
66+
pipeline_id = var.devops_build_pipeline_ocid
67+
}
68+
}
69+
70+
resource "oci_adm_remediation_run" "example_remediation_run" {
71+
remediation_recipe_id = oci_adm_remediation_recipe.example_remediation_recipe.id
72+
display_name = "example_remediation_run"
73+
}
74+
75+
data "oci_adm_remediation_runs" "example_remediation_runs_data" {
76+
remediation_recipe_id = oci_adm_remediation_recipe.example_remediation_recipe.id
77+
compartment_id = var.compartment_ocid
78+
}
79+
80+
data "oci_adm_remediation_run_stages" "example_run_stages" {
81+
remediation_run_id = oci_adm_remediation_run.example_remediation_run.id
82+
}

examples/database/atp-d/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
5656
}
5757
rotate_key_trigger = "true"
5858
version_preference = "LATEST_RELEASE_UPDATE"
59+
is_dst_file_update_enabled = false
5960
}
6061

6162
variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {

examples/database/exadata_cc/adbd/acd.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ resource "oci_database_autonomous_container_database" "autonomous_container_data
2525
patch_model = "RELEASE_UPDATES"
2626
service_level_agreement_type = "STANDARD"
2727
version_preference = "LATEST_RELEASE_UPDATE"
28+
is_dst_file_update_enabled = false
2829
}
2930

3031
data "oci_database_autonomous_container_database_resource_usage" "test_autonomous_container_database_resource_usages" {
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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+
}
6+
7+
variable "user_ocid" {
8+
}
9+
10+
variable "fingerprint" {
11+
}
12+
13+
variable "private_key_path" {
14+
}
15+
16+
variable "region" {
17+
}
18+
19+
variable "compartment_ocid" {
20+
}
21+
22+
variable "table_ddl_statement" {
23+
default = "CREATE TABLE IF NOT EXISTS test_mrtable(id INTEGER, name STRING, info JSON, PRIMARY KEY(id)) with schema frozen"
24+
}
25+
26+
provider "oci" {
27+
tenancy_ocid = var.tenancy_ocid
28+
user_ocid = var.user_ocid
29+
fingerprint = var.fingerprint
30+
private_key_path = var.private_key_path
31+
region = var.region
32+
}
33+
34+
resource "oci_nosql_table" "test_mrtable" {
35+
#Required
36+
compartment_id = var.compartment_ocid
37+
ddl_statement = var.table_ddl_statement
38+
name = "test_mrtable"
39+
40+
table_limits {
41+
#Required
42+
max_read_units = "50"
43+
max_write_units = "50"
44+
max_storage_in_gbs = "1"
45+
}
46+
}
47+
48+
resource "oci_nosql_table_replica" "replica_yul" {
49+
table_name_or_id = oci_nosql_table.test_mrtable.id
50+
region = "ca-montreal-1"
51+
52+
#Optional
53+
max_read_units = "60"
54+
max_write_units = "60"
55+
}
56+
57+
data "oci_nosql_table" "get_test_mrtable" {
58+
compartment_id = var.compartment_ocid
59+
table_name_or_id = oci_nosql_table.test_mrtable.id
60+
61+
depends_on = [oci_nosql_table_replica.replica_yul]
62+
}
63+
64+
output "test_mrtable_replicas" {
65+
value = [
66+
data.oci_nosql_table.get_test_mrtable.replicas
67+
]
68+
}

examples/zips/adm.zip

1.35 KB
Binary file not shown.
0 Bytes
Binary file not shown.

examples/zips/aiDocument.zip

0 Bytes
Binary file not shown.

examples/zips/aiLanguage.zip

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)