Skip to content

Commit 0a125cf

Browse files
authored
Merge pull request #2113 from oracle/release_gh
Release gh
2 parents a759718 + 75303ce commit 0a125cf

File tree

438 files changed

+34265
-1189
lines changed

Some content is hidden

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

438 files changed

+34265
-1189
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 5.42.0 (May 15, 2024)
2+
3+
### Added
4+
- VCNIP Provide IP Inventory view and IP Utilization alerts
5+
- Support for ExaDB-C@C Resize of Local Files Systems (non /u02)
6+
- Support for [DMS] Fixing AWS_S3 issue in the example file
7+
- Support for OCI NLB Proxy Protocol Support
8+
- Support for Email Delivery: Custom Return Path API
9+
session resumption support for LB
10+
- Support for OS Management Hub - OCI Instance Support & ALX Support
11+
- Create_management resource for Masking Report in Data Safe
12+
### Bug Fix
13+
- fix oci_log_analytics_namespace import issue
14+
115
## 5.41.0 (May 07, 2024)
216

317
### Added

examples/databasemigration/migration/migration.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,12 @@ resource "oci_database_migration_connection" "test_connection_target_usr_managed
241241
}
242242
}
243243

244+
variable "secret_access_key" {
245+
default = ""
246+
}
247+
variable "access_key_id" {
248+
default = ""
249+
}
244250
resource "oci_database_migration_migration" "test_migration" {
245251
compartment_id = var.compartment_id
246252

@@ -263,14 +269,14 @@ resource "oci_database_migration_migration" "test_migration" {
263269
}
264270
data_transfer_medium_details_v2 {
265271
type = "AWS_S3"
266-
access_key_id = "AKIA4XMMNYWWF4PYZ3EW"
272+
access_key_id = var.access_key_id
267273
object_storage_bucket {
268274
bucket = "bucket"
269275
namespace = "namespace"
270276
}
271277
name = "AWS-S3"
272278
region = "Ashburn"
273-
secret_access_key = "3xYJLMQkRDROe7/QzrZTgRDzeq2akfkn+Hb+C95D"
279+
secret_access_key = var.secret_access_key
274280
}
275281
datapump_settings {
276282
export_directory_object {
@@ -408,4 +414,4 @@ resource "oci_database_migration_migration" "test_no_ssh_migration" {
408414
output "password" {
409415
sensitive = true
410416
value = random_string.autonomous_database_admin_password.result
411-
}
417+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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 "data_safe_target_ocid" {}
10+
variable "masking_policy_id" {}
11+
12+
13+
provider "oci" {
14+
tenancy_ocid = var.tenancy_ocid
15+
user_ocid = var.user_ocid
16+
fingerprint = var.fingerprint
17+
private_key_path = var.private_key_path
18+
region = var.region
19+
}
20+
21+
22+
resource "oci_data_safe_masking_report_management" "test_masking_report_management" {
23+
#Required
24+
target_id = var.data_safe_target_ocid
25+
masking_policy_id = var.masking_policy_id
26+
}

examples/email/emailreturnpath.tf

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
5+
variable "email_return_path_state" {
6+
default = "ACTIVE"
7+
}
8+
9+
variable "domain_verification_id" {
10+
11+
}
12+
13+
variable "email_domain" {
14+
default = "objdomain.email.ap-mumbai-1.oci.oc-test.com"
15+
}
16+
17+
variable "description" {
18+
default = "description2"
19+
}
20+
21+
variable "department" {
22+
default = "Accounting"
23+
}
24+
25+
26+
data "oci_email_email_return_paths" "test_email_return_paths" {
27+
compartment_id = var.compartment_ocid
28+
filter {
29+
name = "id"
30+
values = ["${oci_email_email_return_path.test_email_return_path.id}"]
31+
}
32+
id = "${oci_email_email_return_path.test_email_return_path.id}"
33+
name = "tfrp.${oci_email_email_domain.test_email_domain_rp.name}"
34+
parent_resource_id = "${oci_email_email_domain.test_email_domain_rp.id}"
35+
state = var.email_return_path_state
36+
}
37+
38+
resource "oci_email_email_domain" "test_email_domain_rp" {
39+
compartment_id = var.compartment_ocid
40+
domain_verification_id = var.domain_verification_id
41+
name = var.email_domain
42+
}
43+
44+
resource "oci_email_email_return_path" "test_email_return_path" {
45+
description = var.description
46+
freeform_tags = {
47+
"Department" = var.department
48+
}
49+
name = "tfrp.${oci_email_email_domain.test_email_domain_rp.name}"
50+
parent_resource_id = "${oci_email_email_domain.test_email_domain_rp.id}"
51+
}

examples/email/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ variable "compartment_ocid" {
2222
}
2323

2424
variable "region" {
25-
default = "us-ashburn-1"
25+
default = "ap-mumbai-1"
2626
}
2727

2828
provider "oci" {

examples/load_balancer/lb_full/lb_full.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ resource "oci_load_balancer_listener" "lb-listener2" {
461461
protocols = ["TLSv1.1", "TLSv1.2"]
462462
server_order_preference = "ENABLED"
463463
cipher_suite_name = oci_load_balancer_ssl_cipher_suite.test_ssl_cipher_suite.name
464+
has_session_resumption = true
464465
}
465466
}
466467

@@ -492,6 +493,7 @@ resource "oci_load_balancer_listener" "lb-listener4" {
492493
protocols = ["TLSv1.1", "TLSv1.2"]
493494
server_order_preference = "ENABLED"
494495
cipher_suite_name = oci_load_balancer_ssl_cipher_suite.test_ssl_cipher_suite3.name
496+
has_session_resumption = true
495497
}
496498
}
497499

examples/network_load_balancer/network_load_balancer_full/nlb_full.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,15 +380,16 @@ resource "oci_network_load_balancer_backend_set" "nlb-bes2" {
380380
interval_in_millis = 10000
381381
retries = 3
382382
}
383-
depends_on = [oci_network_load_balancer_backend_set.nlb-bes1]
383+
384+
depends_on = [oci_network_load_balancer_backend_set.nlb-bes1]
384385
}
385386

386387
resource "oci_network_load_balancer_backend_set" "nlb-bes3" {
387388
name = "nlb-bes3"
388389
network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id
389390
policy = "THREE_TUPLE"
390391
is_fail_open = false
391-
is_instant_failover_enabled = false
392+
is_instant_failover_enabled = true
392393

393394

394395
health_checker {
@@ -414,6 +415,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener1" {
414415
default_backend_set_name = oci_network_load_balancer_backend_set.nlb-bes1.name
415416
port = 80
416417
protocol = "TCP"
418+
is_ppv2enabled = true
417419
depends_on = [oci_network_load_balancer_backend_set.nlb-bes3]
418420
}
419421

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
10+
variable "compartment_ocid" {
11+
}
12+
13+
variable "vcn_ocid" {
14+
}
15+
16+
variable "subnet_ocid" {
17+
}
18+
19+
variable "ip_inventory_vcn_overlap_compartment_list" {
20+
type = list(string)
21+
default = []
22+
}
23+
24+
variable "ip_inventory_vcn_overlap_region_list" {
25+
type = list(string)
26+
default = []
27+
}
28+
29+
provider "oci" {
30+
tenancy_ocid = var.tenancy_ocid
31+
user_ocid = var.user_ocid
32+
fingerprint = var.fingerprint
33+
private_key_path = var.private_key_path
34+
region = var.region
35+
}
36+
37+
// Get VCN Overlap
38+
data "oci_core_ip_inventory_vcn_overlaps" "test_ip_inventory_vcn_overlaps" {
39+
#Required
40+
compartment_list = var.ip_inventory_vcn_overlap_compartment_list
41+
region_list = var.ip_inventory_vcn_overlap_region_list
42+
vcn_id = var.vcn_ocid
43+
}
44+
45+
// Subnet CIDR Utilisation
46+
data "oci_core_ip_inventory_subnet_cidr" "test_ip_inventory_subnet_cidrs" {
47+
#Required
48+
subnet_id = var.subnet_ocid
49+
}
50+
51+
// Subnet Details
52+
data "oci_core_ip_inventory_subnet" "test_ip_inventory_subnets" {
53+
#Required
54+
subnet_id = var.subnet_ocid
55+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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_id" {}
10+
variable "lifecycle_stage_id" {}
11+
12+
13+
provider "oci" {
14+
tenancy_ocid = var.tenancy_ocid
15+
user_ocid = var.user_ocid
16+
fingerprint = var.fingerprint
17+
private_key_path = var.private_key_path
18+
region = var.region
19+
}
20+
21+
# List all entitlements in a compartment
22+
# --------------------------------------
23+
data "oci_os_management_hub_entitlements" "test_entitlements" {
24+
compartment_id = "${var.compartment_id}"
25+
}
26+
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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_id" {}
10+
11+
provider "oci" {
12+
tenancy_ocid = var.tenancy_ocid
13+
user_ocid = var.user_ocid
14+
fingerprint = var.fingerprint
15+
private_key_path = var.private_key_path
16+
region = var.region
17+
}
18+
19+
20+
data "oci_os_management_hub_errata" "test_errata" {
21+
#Required
22+
compartment_id = "${var.compartment_id}"
23+
24+
#Optional
25+
name = ["ELBA-2024-12244"]
26+
name_contains = "ELBA-2024-12244"
27+
}
28+
29+
data "oci_os_management_hub_errata" "test_errata_2" {
30+
#Required
31+
compartment_id = "${var.compartment_id}"
32+
33+
#Optional
34+
classification_type = ["BUGFIX"]
35+
name = ["ELBA-2024-12244"]
36+
name_contains = "ELBA-2024-12244"
37+
os_family = "ORACLE_LINUX_9"
38+
time_issue_date_end = "2024-04-01T00:00:00.000Z"
39+
time_issue_date_start = "2024-03-20T00:00:00.000Z"
40+
}
41+
42+
43+
data "oci_os_management_hub_erratum" "test_erratum" {
44+
compartment_id = "${var.compartment_id}"
45+
name = "ELBA-2024-12244"
46+
}

0 commit comments

Comments
 (0)