Skip to content

Commit 40005c7

Browse files
authored
Merge pull request #2371 from oracle/release_gh
Releasing version 6.36.0
2 parents 1830674 + 0f71249 commit 40005c7

File tree

218 files changed

+4927
-152
lines changed

Some content is hidden

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

218 files changed

+4927
-152
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions

examples/database/db_systems/db_exacs/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ variable "cloud_vm_cluster_cpu_core_count" {
4747
}
4848

4949
variable "cloud_vm_cluster_ocpu_count" {
50-
default = "8.0"
50+
default = "16.0"
5151
}
5252

5353
variable "cloud_vm_cluster_gi_version" {
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (c) 2017, 2024, 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+
11+
12+
provider "oci" {
13+
tenancy_ocid = var.tenancy_ocid
14+
user_ocid = var.user_ocid
15+
fingerprint = var.fingerprint
16+
private_key_path = var.private_key_path
17+
region = var.region
18+
}
19+
20+
variable "database_release" {
21+
default = "19.0.0.0.0"
22+
}
23+
24+
data "oci_dblm_patch_management" "test_patch_management"{
25+
#Required
26+
compartment_id = var.compartment_ocid
27+
database_release = "19.0.0.0.0"
28+
time_started_greater_than_or_equal_to = "2006-01-02T15:04:05Z"
29+
time_started_less_than = "2026-01-02T15:04:05Z"
30+
}
31+
32+
data "oci_dblm_patch_management_databases" "test_dblm_patch_management_databases"{
33+
#Optional
34+
compartment_id = var.compartment_ocid
35+
database_release = var.database_release
36+
database_type = "SI"
37+
}

examples/dblm/dblm_vulnerability.tf renamed to examples/dblm/vulnerability/dblm_vulnerability.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ variable "dblm_display_name" {
2020
default = "displayName"
2121
}
2222

23+
variable "vulnerability_scan_vulnerability_scan_type" {
24+
default = "CVE"
25+
}
26+
2327

2428

2529
provider "oci" {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
resource "oci_core_volume" "test_volume_with_required_parameter_vol" {
2+
availability_domain = data.oci_identity_availability_domain.ad.name
3+
compartment_id = var.compartment_ocid
4+
display_name = "test_volume_2"
5+
size_in_gbs = "50"
6+
}
7+
8+
9+
# Example of querying volumes within a compartment (representing a potential previous query)
10+
data "oci_core_volume" "test_volume_by_compartment_old" {
11+
volume_id = oci_core_volume.test_volume_with_required_parameter_vol.id
12+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
resource "oci_core_volume" "test_volume_with_required_parameter_vg" {
2+
availability_domain = data.oci_identity_availability_domain.ad.name
3+
compartment_id = var.compartment_ocid
4+
display_name = "test_volume_1"
5+
size_in_gbs = "50"
6+
}
7+
8+
# Example of listing volumes in a compartment (representing a potential previous query)
9+
data "oci_core_volumes" "test_volumes_in_compartment_old" {
10+
compartment_id = var.compartment_ocid
11+
}
12+
13+
# Example of listing volumes with a specific display name (if your changes affected this)
14+
data "oci_core_volumes" "test_volumes_by_display_name_old" {
15+
compartment_id = var.compartment_ocid
16+
filter {
17+
name = "display_name"
18+
values = ["test_volume_1"]
19+
}
20+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
variable "tenancy_ocid" {
2+
}
3+
4+
variable "auth" {
5+
}
6+
7+
variable "config_file_profile" {
8+
9+
}
10+
11+
variable "region" {
12+
}
13+
14+
variable "compartment_ocid" {
15+
}
16+
17+
provider "oci" {
18+
auth = var.auth
19+
config_file_profile = var.config_file_profile
20+
region = var.region
21+
version = "6.35.0"
22+
}
23+
24+
data "oci_identity_availability_domain" "ad" {
25+
compartment_id = var.tenancy_ocid
26+
ad_number = 1
27+
}
28+
29+
resource "oci_core_volume" "test_volume_with_required_parameter" {
30+
availability_domain = data.oci_identity_availability_domain.ad.name
31+
compartment_id = var.compartment_ocid
32+
size_in_gbs = "50"
33+
}
34+
35+
resource "oci_core_volume" "test_volume_with_optional_parameter" {
36+
availability_domain = data.oci_identity_availability_domain.ad.name
37+
compartment_id = var.compartment_ocid
38+
size_in_gbs = "50"
39+
display_name = "test_volume"
40+
}
41+
42+
output "volume" {
43+
value = {
44+
test_volume_with_required_parameter = oci_core_volume.test_volume_with_required_parameter.id
45+
test_volume_with_optional_parameter = oci_core_volume.test_volume_with_optional_parameter.id
46+
}
47+
}
48+
49+
50+
#Path - storage/block/corevolume/block_volume

examples/visual_builder/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ resource "oci_visual_builder_vb_instance" "test_vb_instance" {
5858
freeform_tags = {
5959
"bar-key" = "value"
6060
}
61-
6261
}
6362

6463
data "oci_visual_builder_vb_instances" "test_vb_instances" {
@@ -83,4 +82,4 @@ data "oci_visual_builder_vb_instance_applications" "test_vb_instance_application
8382
#Required
8483
vb_instance_id = oci_visual_builder_vb_instance.test_vb_instance.id
8584
idcs_open_id = var.idcs_open_id
86-
}
85+
}
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
// Copyright (c) 2017, 2024, 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_id" {
20+
}
21+
22+
variable "idcs_open_id" {
23+
}
24+
25+
variable "vb_instance_consumption_model" {
26+
default = "UCM"
27+
}
28+
29+
variable "custom_endpoint_certificate_secret_id" {
30+
}
31+
32+
variable "vb_instance_network_endpoint_details_allowlisted_http_ips" {
33+
default = ["0.0.0.0/32"]
34+
}
35+
36+
variable "vb_instance_network_endpoint_details_allowlisted_http_vcns_allowlisted_ip_cidrs" {
37+
default = []
38+
}
39+
40+
variable "vb_instance_network_endpoint_details_allowlisted_http_vcns_id" {
41+
default = "id"
42+
}
43+
44+
variable "vb_instance_network_endpoint_details_network_endpoint_type" {
45+
default = "PUBLIC"
46+
}
47+
48+
provider "oci" {
49+
tenancy_ocid = var.tenancy_ocid
50+
user_ocid = var.user_ocid
51+
fingerprint = var.fingerprint
52+
private_key_path = var.private_key_path
53+
region = var.region
54+
}
55+
56+
resource "oci_visual_builder_vb_instance" "test_vb_instance_acl" {
57+
#Required
58+
compartment_id = var.compartment_id
59+
display_name = "displayName"
60+
is_visual_builder_enabled = "true"
61+
idcs_open_id = var.idcs_open_id
62+
node_count = "1"
63+
64+
#Optional
65+
consumption_model = var.vb_instance_consumption_model
66+
#Optional
67+
network_endpoint_details {
68+
#Required
69+
network_endpoint_type = var.vb_instance_network_endpoint_details_network_endpoint_type
70+
71+
#Optional
72+
allowlisted_http_ips = var.vb_instance_network_endpoint_details_allowlisted_http_ips
73+
allowlisted_http_vcns {
74+
#Required
75+
id = var.vb_instance_network_endpoint_details_allowlisted_http_vcns_id
76+
77+
#Optional
78+
allowlisted_ip_cidrs = var.vb_instance_network_endpoint_details_allowlisted_http_vcns_allowlisted_ip_cidrs
79+
}
80+
}
81+
}
82+
83+
data "oci_visual_builder_vb_instances" "test_vb_instances_acl" {
84+
#Required
85+
compartment_id = var.compartment_id
86+
87+
#Optional
88+
display_name = "displayName"
89+
state = "Active"
90+
filter {
91+
name = "id"
92+
values = [oci_visual_builder_vb_instance.test_vb_instance_acl.id]
93+
}
94+
}
95+
96+
data "oci_visual_builder_vb_instance" "test_vb_instance_acl" {
97+
#Required
98+
vb_instance_id = oci_visual_builder_vb_instance.test_vb_instance_acl.id
99+
}
100+
101+
data "oci_visual_builder_vb_instance_applications" "test_vb_instance_applications" {
102+
#Required
103+
vb_instance_id = oci_visual_builder_vb_instance.test_vb_instance_acl.id
104+
idcs_open_id = var.idcs_open_id
105+
}

examples/zips/adm.zip

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)