Skip to content

Commit c96c125

Browse files
authored
Merge pull request #2204 from oracle/release_gh
Releasing version 6.12.0
2 parents f54b581 + 47302b6 commit c96c125

File tree

362 files changed

+18399
-658
lines changed

Some content is hidden

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

362 files changed

+18399
-658
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 6.12.0 (October 02, 2024)
2+
3+
### Added
4+
- Support for OIC Gen3 Disaster Recovery
5+
- Support for ZPR v1 - Oracle Cloud World Scope - OC1 ONLY
6+
- Support for Security Attributes
7+
- Support for change hostname label to be updatable
8+
- Support for Zero Trust Packet Routing
9+
### Bug Fix
10+
- add support for tunnel configurations in create private ipsec over fastconnect
11+
- add publish_artifact branch in ocibuild.conf file
12+
113
## 6.11.0 (September 24, 2024)
214

315
### Added

GNUmakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,6 @@ check-untagged-tests:
162162

163163
check-module-name:
164164
@sh -c "'$(CURDIR)/scripts/gomodnamecheck.sh'"
165+
166+
buildpyEnv:
167+
cd ./terraform-test-resources/dev_tools/teamcity_scripts/python_script; @echo $(SCRIPT_ARG) ; sh run_python_script.sh

examples/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ This directory contains Terraform configuration files showing how to create spec
101101
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/events.zip)
102102
- fast_connect
103103
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fast_connect.zip)
104+
- fleet_apps_management
105+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fleet_apps_management.zip)
104106
- fleetsoftwareupdate
105107
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fleetsoftwareupdate.zip)
106108
- functions
@@ -215,6 +217,8 @@ This directory contains Terraform configuration files showing how to create spec
215217
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/resourcemanager.zip)
216218
- resourcescheduler
217219
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/resourcescheduler.zip)
220+
- security_attribute
221+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/security_attribute.zip)
218222
- serviceManagerProxy
219223
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/serviceManagerProxy.zip)
220224
- service_catalog
@@ -247,3 +251,5 @@ This directory contains Terraform configuration files showing how to create spec
247251
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/web_app_firewall.zip)
248252
- web_application_acceleration_and_security
249253
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/web_application_acceleration_and_security.zip)
254+
- zpr
255+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/zpr.zip)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Overview
2+
This is a Terraform configuration that creates the Fleet Apps Management service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
5+
6+
## Magic Button
7+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/fleet_apps_management.zip)

examples/integration/main.tf

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ variable "region" {
1919
variable "compartment_id" {
2020
}
2121

22+
variable "compartment_id_for_update" {
23+
}
24+
2225
variable "instance_type" {
2326
default = "STANDARDX"
2427
}
2528

2629
variable "integration_instance_idcs_access_token" {
27-
default = "" #
30+
default = ""
2831
}
2932

3033
variable "integration_instance_consumption_model" {
@@ -72,7 +75,7 @@ resource "oci_integration_integration_instance" "test_integration_instance" {
7275
shape = "DEVELOPMENT"
7376
display_name = "instance-created-via-tf-${random_integer.seq.result}"
7477
is_byol = "false"
75-
message_packs = "10"
78+
message_packs = "1"
7679
domain_id = var.domain_id
7780

7881
lifecycle {
@@ -180,4 +183,35 @@ resource "oci_integration_private_endpoint_outbound_connection" "integration_pri
180183
depends_on = [
181184
oci_integration_oracle_managed_custom_endpoint.integretion_custom_endpoint
182185
]
186+
# resource "oci_integration_integration_instance" "test_integration_instance_idcs" {
187+
# #Required
188+
# compartment_id = var.compartment_id
189+
# display_name = "instance4643_idcs"
190+
# integration_instance_type = "STANDARDX"
191+
# shape = "DEVELOPMENT"
192+
# # shape = "PRODUCTION"
193+
# is_byol = "false"
194+
# message_packs = "10"
195+
# idcs_at = var.integration_instance_idcs_access_token
196+
# }
197+
198+
resource "oci_integration_private_endpoint_outbound_connection" "integration_private_endpoint" {
199+
integration_instance_id = oci_integration_integration_instance.test_integration_instance.id
200+
nsg_ids = [var.nsg_id]
201+
subnet_id = var.subnet_id
202+
}
203+
204+
resource "oci_integration_integration_instance" "test_integration_instance_with_dr" {
205+
#Required
206+
compartment_id = var.compartment_id
207+
integration_instance_type = "STANDARDX"
208+
shape = "DEVELOPMENT"
209+
display_name = "DR"
210+
is_byol = "false"
211+
message_packs = "1"
212+
domain_id = var.domain_id
213+
is_disaster_recovery_enabled = "true"
214+
lifecycle {
215+
ignore_changes = ["system_tags"]
216+
}
183217
}
Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_core_cpe" "test_cpe_ipsec_over_fc" {
5+
compartment_id = var.compartment_ocid
6+
display_name = "test_cpe_ipsec_over_fc"
7+
ip_address = "10.1.6.7"
8+
cpe_device_shape_id = data.oci_core_cpe_device_shape.test_cpe_device_shape.id
9+
is_private = true
10+
}
11+
12+
resource "oci_core_drg" "test_drg_ipsec_over_fc" {
13+
compartment_id = var.compartment_ocid
14+
display_name = "test_drg_ipsec_over_fc"
15+
}
16+
17+
resource "oci_core_drg_route_table" "test_drg_ipsec_over_fc_route_table" {
18+
drg_id = oci_core_drg.test_drg_ipsec_over_fc.id
19+
display_name = "DrgRtForIpsecOverFC"
20+
}
21+
22+
data "oci_core_cross_connect_locations" "cross_connect_locations" {
23+
#Required
24+
compartment_id = var.compartment_ocid
25+
}
26+
27+
data "oci_core_cross_connect_port_speed_shapes" "cross_connect_port_speed_shapes" {
28+
#Required
29+
compartment_id = var.compartment_ocid
30+
}
31+
32+
resource "oci_core_cross_connect" "test_ipsec_over_fc_cross_connect" {
33+
compartment_id = var.compartment_ocid
34+
location_name = data.oci_core_cross_connect_locations.cross_connect_locations.cross_connect_locations[0].name
35+
port_speed_shape_name = data.oci_core_cross_connect_port_speed_shapes.cross_connect_port_speed_shapes.cross_connect_port_speed_shapes[0].name
36+
display_name = "testIpsecOverFCCrossConnect"
37+
#Set Cross Connect to Active to provision (required to provision virtual circuits).
38+
#You activate it after the physical cabling is complete, and you've confirmed the cross-connect's light levels are good and your side of the interface is up
39+
is_active = true
40+
}
41+
42+
resource "oci_core_virtual_circuit" "test_ipsec_over_fc_virtual_circuit" {
43+
compartment_id = var.compartment_ocid
44+
type = "PRIVATE"
45+
bandwidth_shape_name = "100 Mbps"
46+
cross_connect_mappings {
47+
cross_connect_or_cross_connect_group_id = oci_core_cross_connect.test_ipsec_over_fc_cross_connect.id
48+
vlan = 101
49+
oracle_bgp_peering_ip = "10.0.1.21/30"
50+
customer_bgp_peering_ip = "10.0.1.22/30"
51+
}
52+
customer_asn = "64513"
53+
display_name = "testIpsecOverFCVirtualCircuit"
54+
gateway_id = oci_core_drg.test_drg_ipsec_over_fc.id
55+
}
56+
57+
resource "oci_core_ipsec" "test_ipsec_over_fc_connection" {
58+
#Required
59+
compartment_id = var.compartment_ocid
60+
cpe_id = oci_core_cpe.test_cpe_ipsec_over_fc.id
61+
drg_id = oci_core_drg.test_drg_ipsec_over_fc.id
62+
static_routes = ["10.0.0.0/16"]
63+
tunnel_configuration {
64+
oracle_tunnel_ip = "10.1.5.5"
65+
associated_virtual_circuits = [oci_core_virtual_circuit.test_ipsec_over_fc_virtual_circuit.id]
66+
drg_route_table_id = oci_core_drg_route_table.test_drg_ipsec_over_fc_route_table.id
67+
}
68+
tunnel_configuration {
69+
oracle_tunnel_ip = "10.1.7.7"
70+
associated_virtual_circuits = [oci_core_virtual_circuit.test_ipsec_over_fc_virtual_circuit.id]
71+
drg_route_table_id = oci_core_drg_route_table.test_drg_ipsec_over_fc_route_table.id
72+
}
73+
74+
#Optional
75+
cpe_local_identifier = "10.1.6.7"
76+
cpe_local_identifier_type = "IP_ADDRESS"
77+
defined_tags = {
78+
"${oci_identity_tag_namespace.tag_namespace1_fc.name}.${oci_identity_tag.tag1_fc.name}" = "value"
79+
}
80+
display_name = "MyIPSecConnectionOverFC"
81+
82+
freeform_tags = {
83+
"Department" = "Finance"
84+
}
85+
}
86+
87+
data "oci_core_ipsec_connections" "test_ip_sec_over_fc_connections" {
88+
#Required
89+
compartment_id = var.compartment_ocid
90+
91+
#Optional
92+
cpe_id = oci_core_cpe.test_cpe_ipsec_over_fc.id
93+
drg_id = oci_core_drg.test_drg_ipsec_over_fc.id
94+
}
95+
96+
data "oci_core_ipsec_connection_tunnels" "test_ip_sec_connection_tunnels_over_fc" {
97+
ipsec_id = oci_core_ipsec.test_ipsec_over_fc_connection.id
98+
}
99+
100+
data "oci_core_ipsec_connection_tunnel" "test_ipsec_connection_tunnel_over_fc" {
101+
ipsec_id = oci_core_ipsec.test_ipsec_over_fc_connection.id
102+
tunnel_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels_over_fc.ip_sec_connection_tunnels[0].id
103+
}
104+
105+
resource "oci_core_ipsec_connection_tunnel_management" "test_ipsec_connection_tunnel_management_over_fc" {
106+
ipsec_id = oci_core_ipsec.test_ipsec_over_fc_connection.id
107+
tunnel_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels_over_fc.ip_sec_connection_tunnels[0].id
108+
109+
#Optional
110+
bgp_session_info {
111+
customer_bgp_asn = "1587232876"
112+
customer_interface_ip = "10.0.0.16/31"
113+
oracle_interface_ip = "10.0.0.17/31"
114+
customer_interface_ipv6 = "2002:db2::6/64"
115+
oracle_interface_ipv6 = "2002:db2::7/64"
116+
}
117+
118+
display_name = "MyIPSecConnectionOverFCTunnelMgmt"
119+
routing = "BGP"
120+
shared_secret = "sharedSecret"
121+
ike_version = "V1"
122+
}
123+
124+
resource "oci_core_ipsec_connection_tunnel_management" "test_ipsec_connection_second_tunnel_management_over_fc" {
125+
ipsec_id = oci_core_ipsec.test_ipsec_over_fc_connection.id
126+
tunnel_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels_over_fc.ip_sec_connection_tunnels[1].id
127+
128+
#Optional
129+
display_name = "MyIPSecConnectionOverFC-Tunnel2"
130+
routing = "POLICY"
131+
shared_secret = "sharedSecret"
132+
ike_version = "V1"
133+
134+
nat_translation_enabled = "ENABLED"
135+
oracle_can_initiate = "RESPONDER_ONLY"
136+
137+
encryption_domain_config {
138+
cpe_traffic_selector = ["10.0.0.16/31", "11.0.0.16/31"]
139+
oracle_traffic_selector = ["12.0.0.16/31"]
140+
}
141+
142+
phase_one_details {
143+
is_custom_phase_one_config = false
144+
lifetime = 28600
145+
}
146+
147+
phase_two_details{
148+
dh_group = "GROUP20"
149+
is_custom_phase_two_config = false
150+
is_pfs_enabled = true
151+
lifetime = 3602
152+
}
153+
}
154+
155+
data "oci_core_ipsec_connection_tunnel_routes" "test_ipsec_connection_tunnel_routes_over_fc" {
156+
#Required
157+
ipsec_id = oci_core_ipsec.test_ipsec_over_fc_connection.id
158+
tunnel_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels_over_fc.ip_sec_connection_tunnels.0.id
159+
160+
#Optional
161+
advertiser = var.ipsec_connection_tunnel_route_advertiser
162+
}
163+
164+
resource "oci_identity_tag_namespace" "tag_namespace1_fc" {
165+
#Required
166+
compartment_id = var.tenancy_ocid
167+
description = "Just a test"
168+
name = "testexamples-tag-namespace"
169+
}
170+
171+
resource "oci_identity_tag" "tag1_fc" {
172+
#Required
173+
description = "tf example tag"
174+
name = "tf-example-tag"
175+
tag_namespace_id = oci_identity_tag_namespace.tag_namespace1_fc.id
176+
}
177+
178+
resource "oci_identity_tag" "tag2_fc" {
179+
#Required
180+
description = "tf example tag 2"
181+
name = "tf-example-tag-2"
182+
tag_namespace_id = oci_identity_tag_namespace.tag_namespace1_fc.id
183+
}
184+
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Overview
2+
This is a Terraform configuration that creates the `security_attribute` service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.
5+
## Magic Button
6+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/security_attribute.zip)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Overview
2+
This is a Terraform configuration that creates the `security_attribute` service on Oracle Cloud Infrastructure.
3+
4+
The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.

0 commit comments

Comments
 (0)