Skip to content

Commit 253fba1

Browse files
rashik-bhasinrashik-bhasin
authored
Releasing version 4.56.0
Releasing version 4.56.0
2 parents 013d74f + 1c92654 commit 253fba1

File tree

428 files changed

+8305
-1353
lines changed

Some content is hidden

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

428 files changed

+8305
-1353
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 4.56.0 (Unreleased)
2+
3+
### Added
4+
- Support for APP MGMT : API to Discover Ebusiness suite
5+
- Support for security baseline improvements for Java Management Service
6+
- Support for database_db_nodes_data_source to include the attribute db_node_id
7+
- Support for Logging Analytics Categories and Entity Topology
8+
- Support for KMS key version in ADB-D
9+
- Support for Golden Gate RAC databases
10+
11+
### Bug Fix
12+
- Change target resource id to optional for bastion session creation
13+
114
## 4.55.0 (December 01, 2021)
215

316
### Added

‎examples/appmgmt_control/monitor_plugin_management/main.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright (c) 2017, 2021, 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 "monitored_instance_id" {}
10+
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+
resource "oci_appmgmt_control_monitor_plugin_management" "test_monitor_plugin_management" {
22+
#Required
23+
monitored_instance_id = var.monitored_instance_id
24+
}

‎examples/appmgmt_control/monitored_instances/main.tf‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (c) 2017, 2021, 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 "monitored_instance_id" {}
11+
12+
variable "monitored_instance_display_name" {
13+
default = "displayName"
14+
}
15+
16+
17+
18+
provider "oci" {
19+
tenancy_ocid = var.tenancy_ocid
20+
user_ocid = var.user_ocid
21+
fingerprint = var.fingerprint
22+
private_key_path = var.private_key_path
23+
region = var.region
24+
}
25+
26+
data "oci_appmgmt_control_monitored_instances" "test_monitored_instances" {
27+
#Required
28+
compartment_id = var.compartment_ocid
29+
30+
#Optional
31+
display_name = var.monitored_instance_display_name
32+
}
33+
34+
data "oci_appmgmt_control_monitored_instance" "test_monitored_instance" {
35+
#Required
36+
monitored_instance_id = var.monitored_instance_id
37+
}

‎examples/bastion/session.tf‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ variable "session_target_resource_details_target_resource_port" {
3333
default = 22
3434
}
3535

36+
resource "time_sleep" "wait_3_minutes_for_bastion_plugin" {
37+
depends_on = [oci_core_instance.test_instance]
3638

39+
create_duration = "3m"
40+
}
3741

3842
resource "oci_bastion_session" "test_session_managed_ssh" {
3943
#Required
@@ -45,6 +49,7 @@ resource "oci_bastion_session" "test_session_managed_ssh" {
4549
target_resource_details {
4650
#Required
4751
session_type = var.session_target_resource_details_session_type_managed_ssh
52+
// target_resource_id is required for managed ssh session
4853
target_resource_id = oci_core_instance.test_instance.id
4954

5055
#Optional
@@ -56,6 +61,8 @@ resource "oci_bastion_session" "test_session_managed_ssh" {
5661
display_name = var.session_display_name
5762
key_type = var.session_key_type
5863
session_ttl_in_seconds = var.session_session_ttl_in_seconds
64+
65+
depends_on = [time_sleep.wait_3_minutes_for_bastion_plugin]
5966
}
6067

6168
resource "oci_bastion_session" "test_session_port_forwarding" {
@@ -68,11 +75,12 @@ resource "oci_bastion_session" "test_session_port_forwarding" {
6875
target_resource_details {
6976
#Required
7077
session_type = var.session_target_resource_details_session_type_port_forwarding
71-
target_resource_id = oci_core_instance.test_instance.id
7278

7379
#Optional
74-
target_resource_port = var.session_target_resource_details_target_resource_port
80+
// You should either use target_resource_id or target_resource_private_ip_address in port forwarding session
81+
target_resource_id = oci_core_instance.test_instance.id
7582
target_resource_private_ip_address = oci_core_instance.test_instance.private_ip
83+
target_resource_port = var.session_target_resource_details_target_resource_port
7684
}
7785

7886
display_name = var.session_display_name

‎examples/database/atp-d/exadata.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exada
8888
}
8989

9090
nsg_ids = [oci_core_network_security_group.test_network_security_group.id]
91-
shape = "Exadata.Quarter2.92"
91+
shape = "Exadata.X8M"
9292
subnet_id = oci_core_subnet.exadata_subnet.id
9393
}
9494

‎examples/goldengate/DatabaseRegistration/main.tf‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ variable "database_registration_alias_name" {
1313
}
1414

1515
variable "database_registration_connection_string" {
16-
default = "username@password:1521/orcl.us.oracle.com"
16+
default = "fqdndb.ggs.com:1521/orcl.us.oracle.com"
17+
}
18+
19+
variable "database_registration_session_mode" {
20+
default = "DIRECT"
1721
}
1822

1923
variable "database_registration_defined_tags_value" {
@@ -37,7 +41,7 @@ variable "database_registration_freeform_tags" {
3741
}
3842

3943
variable "database_registration_ip_address" {
40-
default = "10.102.10.20"
44+
default = "10.0.0.10"
4145
}
4246

4347

@@ -90,11 +94,12 @@ resource "oci_golden_gate_database_registration" "test_database_registration" {
9094

9195
#Optional
9296
connection_string = var.database_registration_connection_string
97+
session_mode = var.database_registration_session_mode
9398
database_id = data.oci_database_databases.t.databases.0.id
9499
#defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.database_registration_defined_tags_value)
95100
description = var.database_registration_description
96101
freeform_tags = var.database_registration_freeform_tags
97-
#ip_address = data.oci_core_vnic.t.0.private_ip_address //vnic_id is null because of using FAKEHOSTSERIAL header as per db_system_resource_allvm_test.go
102+
ip_address = var.database_registration_ip_address
98103
key_id = var.kms_key_ocid
99104
secret_compartment_id = var.compartment_ocid
100105
subnet_id = oci_core_subnet.test_subnet.id
@@ -125,12 +130,12 @@ data "oci_database_databases" "t" {
125130
db_home_id = data.oci_database_db_homes.t.db_homes.0.id
126131
}
127132

128-
data "oci_database_db_nodes" "t" {
129-
#Required
130-
compartment_id = var.compartment_ocid
131-
#Optional
132-
db_system_id = data.oci_database_db_systems.t.db_systems.0.id
133-
}
133+
#data "oci_database_db_nodes" "t" {
134+
# #Required
135+
# compartment_id = var.compartment_ocid
136+
# #Optional
137+
# db_system_id = data.oci_database_db_systems.t.db_systems.0.id
138+
#}
134139

135140
#data "oci_core_vnic" "t" {
136141
#Required

‎examples/jms/fleet.tf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ variable "fingerprint" {}
77
variable "private_key_path" {}
88
variable "region" {}
99
variable "compartment_ocid" {}
10+
variable "host_ocid" {}
1011

1112
variable "fleet_description" {
1213
default = "Example Fleet created by Terraform"
@@ -61,4 +62,13 @@ data "oci_jms_fleets" "example_fleets" {
6162
display_name = var.fleet_display_name
6263
id = var.fleet_id
6364
state = var.fleet_state
65+
}
66+
67+
data "oci_jms_list_jre_usage" "example_jms_list_jre_usage" {
68+
compartment_id = var.compartment_ocid
69+
host_id = var.host_ocid
70+
}
71+
72+
data "oci_jms_summarize_resource_inventory" "example_oci_jms_summarize_resource_inventory" {
73+
compartment_id = var.compartment_ocid
6474
}

‎examples/log_analytics/categories/catgories.tf‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
* This example shows how to fetch categories info
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
28+
# Fetch all categories
29+
data "oci_log_analytics_log_analytics_categories_list" "all_categories" {
30+
namespace = data.oci_objectstorage_namespace.ns.namespace
31+
}
32+
33+
# Fetch categories of type VENDOR
34+
data "oci_log_analytics_log_analytics_categories_list" "vendor_categories" {
35+
namespace = data.oci_objectstorage_namespace.ns.namespace
36+
category_type = "VENDOR"
37+
}
38+
39+
# Fetch categories that have Oracle in their display text
40+
data "oci_log_analytics_log_analytics_categories_list" "Oracle_displaytext_categories" {
41+
namespace = data.oci_objectstorage_namespace.ns.namespace
42+
category_display_text = "Oracle"
43+
}
44+
45+
# Fetch category named oracle
46+
data "oci_log_analytics_log_analytics_category" "oracle_category" {
47+
namespace = data.oci_objectstorage_namespace.ns.namespace
48+
name = "oracle"
49+
}
50+
51+
# Manage category assignments of dashboard named VCN_DB1
52+
resource "oci_log_analytics_log_analytics_resource_categories_management" "VCN_DB1_categories" {
53+
namespace = data.oci_objectstorage_namespace.ns.namespace
54+
resource_id = "VCN_DB1"
55+
resource_type = "DASHBOARD"
56+
resource_categories = ["oracle", "oci", "network"]
57+
}
58+
59+
# Fetch all category assignments of dashboard named VCN_DB1
60+
data "oci_log_analytics_log_analytics_resource_categories_list" "VCN_DB1_categories_list" {
61+
depends_on = [oci_log_analytics_log_analytics_resource_categories_management.VCN_DB1_categories]
62+
namespace = data.oci_objectstorage_namespace.ns.namespace
63+
resource_ids = "VCN_DB1"
64+
resource_types = "DASHBOARD"
65+
}

‎examples/log_analytics/entity_topology/entity_topology.tf‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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+
* This example shows how to get a log analytics entity topology details
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
28+
# Sample create entity with required parameters.
29+
resource "oci_log_analytics_log_analytics_entity" "entityRequired" {
30+
compartment_id = var.compartment_ocid
31+
namespace = data.oci_objectstorage_namespace.ns.namespace
32+
name = "tf-entity-example-topo-req"
33+
entity_type_name = "Host (Linux)"
34+
}
35+
36+
# Get entity topo details of above created entity with required parameters
37+
data "oci_log_analytics_log_analytics_entity_topology" "entityTopoRequiredDetails" {
38+
namespace = data.oci_objectstorage_namespace.ns.namespace
39+
log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityRequired.id
40+
}
41+
42+
# Get entity topo details of above created entity with required parameters
43+
data "oci_log_analytics_log_analytics_entity_topology" "entityTopoOptionalDetails" {
44+
namespace = data.oci_objectstorage_namespace.ns.namespace
45+
log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityRequired.id
46+
state = "ACTIVE"
47+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
88
github.com/hashicorp/terraform-exec v0.13.3
99
github.com/hashicorp/terraform-plugin-sdk v1.17.2
10-
github.com/oracle/oci-go-sdk/v53 v53.0.0
10+
github.com/oracle/oci-go-sdk/v53 v53.1.0
1111
github.com/stretchr/testify v1.7.0
1212
golang.org/x/mod v0.4.2
1313
gopkg.in/yaml.v2 v2.3.0

0 commit comments

Comments
 (0)