Skip to content

Commit a1e843a

Browse files
authored
Merge pull request #2399 from oracle/release_gh
Releasing version 7.5.0
2 parents 62583b8 + 9aff27c commit a1e843a

File tree

148 files changed

+316
-54
lines changed

Some content is hidden

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

148 files changed

+316
-54
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions

examples/container_engine/oidc_authn_token_config_multi_issuers/main.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ variable "cluster_endpoint_config_nsg_ids" {
3636
default = []
3737
}
3838

39+
variable "cluster_should_include_oidc_config_file" {
40+
default = true
41+
}
42+
3943
variable "cluster_freeform_tags" {
4044
default = { "Department" = "Finance" }
4145
}
@@ -222,6 +226,11 @@ resource "oci_containerengine_cluster" "test_cluster_multi_issuer" {
222226
type = var.cluster_type
223227
}
224228

229+
data "oci_containerengine_cluster" "test_cluster_multi_issuer" {
230+
cluster_id = oci_containerengine_cluster.test_cluster_multi_issuer.id
231+
should_include_oidc_config_file = var.cluster_should_include_oidc_config_file
232+
}
233+
225234
data "oci_containerengine_clusters" "test_clusters" {
226235
#Required
227236
compartment_id = var.compartment_ocid
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
# NAME
3+
# data.tf - Data Source file
4+
#
5+
# USAGE
6+
# Use the following path for Example Test & Backward-Compatibility-Test: database/db_systems/db_vm/patches
7+
# NOTES
8+
# Terraform Integration Test: TestDatabaseDbSystemPatchResource_basic
9+
# FILES
10+
#
11+
# DESCRIPTION
12+
#
13+
# MODIFIED MM/DD/YY
14+
# escabrer 05/23/2025 - Created
15+
16+
17+
data "oci_identity_availability_domains" "test_availability_domains" {
18+
compartment_id = var.compartment_id
19+
}
20+
21+
data "oci_database_db_system_patches" "test_db_system_patches" {
22+
#Required
23+
db_system_id = oci_database_db_system.test_db_system.id
24+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
# NAME
3+
# main.tf - Main file
4+
#
5+
# USAGE
6+
# Use the following path for Example Test & Backward-Compatibility-Test: database/db_systems/db_vm/patches
7+
# NOTES
8+
# Terraform Integration Test: TestDatabaseDbSystemPatchResource_basic
9+
# FILES
10+
#
11+
# DESCRIPTION
12+
#
13+
# MODIFIED MM/DD/YY
14+
# escabrer 06/05/2025 - Created
15+
16+
17+
resource "oci_database_db_system" "test_db_system" {
18+
display_name = "tfDbSystem"
19+
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
20+
compartment_id = var.compartment_id
21+
subnet_id = oci_core_subnet.test_subnet.id
22+
database_edition = "ENTERPRISE_EDITION"
23+
shape = "VM.Standard.E4.Flex"
24+
cpu_core_count = "4"
25+
ssh_public_keys = [var.ssh_public_key]
26+
domain = oci_core_subnet.test_subnet.subnet_domain_name
27+
hostname = "tfHost"
28+
data_storage_size_in_gb = "256"
29+
license_model = "LICENSE_INCLUDED"
30+
node_count = "1"
31+
db_system_options {
32+
storage_management = "LVM"
33+
}
34+
db_home {
35+
db_version = "19.0.0.0"
36+
display_name = "tfDbHome"
37+
database {
38+
admin_password = var.admin_password
39+
db_name = "tfDb"
40+
}
41+
}
42+
lifecycle {
43+
ignore_changes = [defined_tags["Oracle-Tags.CreatedBy"], defined_tags["Oracle-Tags.CreatedOn"]]
44+
}
45+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
# NAME
3+
# network.tf - Network Infra file
4+
#
5+
# USAGE
6+
# Use the following path for Example Test & Backward-Compatibility-Test: database/db_systems/db_vm/patches
7+
# NOTES
8+
# Terraform Integration Test: TestDatabaseDbSystemPatchResource_basic
9+
# FILES
10+
#
11+
# DESCRIPTION
12+
#
13+
# MODIFIED MM/DD/YY
14+
# escabrer 05/23/2025 - Created
15+
16+
17+
resource "oci_core_vcn" "test_vcn" {
18+
cidr_block = "10.1.0.0/16"
19+
compartment_id = var.compartment_id
20+
display_name = "tfVcn"
21+
dns_label = "tfvcn"
22+
}
23+
24+
resource "oci_core_route_table" "test_route_table" {
25+
compartment_id = var.compartment_id
26+
display_name = "tfRouteTable"
27+
route_rules {
28+
cidr_block = "0.0.0.0/0"
29+
description = "Internal traffic for OCI Services"
30+
network_entity_id = oci_core_internet_gateway.test_internet_gateway.id
31+
}
32+
vcn_id = oci_core_vcn.test_vcn.id
33+
}
34+
35+
resource "oci_core_internet_gateway" "test_internet_gateway" {
36+
compartment_id = var.compartment_id
37+
display_name = "tfInternetGateway"
38+
vcn_id = oci_core_vcn.test_vcn.id
39+
}
40+
41+
resource "oci_core_subnet" "test_subnet" {
42+
cidr_block = "10.1.20.0/24"
43+
compartment_id = var.compartment_id
44+
dhcp_options_id = oci_core_vcn.test_vcn.default_dhcp_options_id
45+
display_name = "tfSubnet"
46+
dns_label = "tfsubnet"
47+
route_table_id = oci_core_route_table.test_route_table.id
48+
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
49+
vcn_id = oci_core_vcn.test_vcn.id
50+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
# NAME
3+
# provider.tf - provider file
4+
#
5+
# USAGE
6+
# Use the following path for Example Test & Backward-Compatibility-Test: database/db_systems/db_vm/patches
7+
# NOTES
8+
# Terraform Integration Test: TestDatabaseDbSystemPatchResource_basic
9+
# FILES
10+
#
11+
# DESCRIPTION
12+
#
13+
# MODIFIED MM/DD/YY
14+
# escabrer 05/23/2025 - Created
15+
16+
17+
18+
provider "oci" {
19+
auth = "SecurityToken"
20+
config_file_profile = "terraform-federation-test"
21+
region = var.region
22+
tenancy_ocid = var.compartment_id
23+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
# NAME
3+
# variables.tf - Variables file
4+
#
5+
# USAGE
6+
# Use the following path for Example Test & Backward-Compatibility-Test: database/db_systems/db_vm/patches
7+
# NOTES
8+
# Terraform Integration Test: TestDatabaseDbSystemPatchResource_basic
9+
# FILES
10+
#
11+
# DESCRIPTION
12+
#
13+
# MODIFIED MM/DD/YY
14+
# escabrer 05/23/2025 - Created
15+
16+
17+
18+
variable "tenancy_ocid" {
19+
}
20+
21+
variable "region" {
22+
}
23+
24+
variable "compartment_id" {
25+
}
26+
27+
variable "ssh_public_key" {
28+
}
29+
30+
variable "admin_password" {
31+
}

examples/zips/adm.zip

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

examples/zips/aiDocument.zip

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)