Skip to content

Commit d592177

Browse files
parrneetparrneet
authored
Candidate for release_v3.82.0
Candidate for release_v3.82.0
2 parents b94fd75 + 3a05bc6 commit d592177

File tree

627 files changed

+60291
-425
lines changed

Some content is hidden

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

627 files changed

+60291
-425
lines changed

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
11
## 3.82.0 (Unreleased)
2+
3+
### Added
4+
- Support for MySQL service added
5+
- Support harvesting sources with Private IPs for resource `datacatalog`
6+
- Support `dataflow_archive_uri` for service `dataflow`
7+
- Support for Data Integration Service
8+
- Support for Tags in Shared DB Home resource
9+
- Support `oci_database_autonomous_vm_cluster` for service `database`
10+
- Support for `mount_type_details`, `mount_type`, `nfs_server` and `nfs_server_export` attributes in `oci_database_backup_destination` resource
11+
- Support resource discovery for `ons` resources
12+
- Support resource discovery for `analytics` resources
13+
- Support resource discovery for `dns` resources
14+
- Support datasource for `oci_dns_rrset`
15+
- Support resource discovery for `oci_dataintegration_workspace` resources
16+
17+
### Fixed
18+
- Fix issue where discovering object storage buckets without lifecycle policies, results in an error
19+
20+
### Notes
21+
- `mount_type_details` attribute needs to be set when `type` attribute is set to `NFS` in `oci_database_backup_destination` resource
22+
223
## 3.81.0 (June 17, 2020)
324

425
### Added

‎examples/database/exadata_cc/autonomous_vm_cluster.tf‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "oci_database_autonomous_vm_cluster" "test_autonomous_vm_cluster" {
4+
#Required
5+
compartment_id = "${var.compartment_id}"
6+
display_name = "autonomousVmCluster"
7+
exadata_infrastructure_id = "${oci_database_exadata_infrastructure.test_exadata_infrastructure.id}"
8+
vm_cluster_network_id = "${oci_database_vm_cluster_network.test_vm_cluster_network.id}"
9+
10+
#Optional
11+
is_local_backup_enabled = "false"
12+
license_model = "LICENSE_INCLUDED"
13+
time_zone = "US/Pacific"
14+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}"
15+
16+
freeform_tags = {
17+
"Department" = "Finance"
18+
}
19+
}
20+
21+
data "oci_database_autonomous_vm_clusters" "test_autonomous_vm_clusters" {
22+
#Required
23+
compartment_id = "${var.compartment_id}"
24+
25+
#Optional
26+
display_name = "autonomousVmCluster"
27+
exadata_infrastructure_id = "${oci_database_exadata_infrastructure.test_exadata_infrastructure.id}"
28+
state = "AVAILABLE"
29+
}

‎examples/database/exadata_cc/vm_cluster.tf‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
2828

2929
nodes {
3030
hostname = "myprefix2-cghdm1"
31-
ip = "192.169.19.1"
31+
ip = "192.169.19.18"
3232
}
3333

3434
nodes {
3535
hostname = "myprefix2-cghdm2"
36-
ip = "192.169.19.2"
36+
ip = "192.169.19.20"
3737
}
3838

3939
vlan_id = "11"
@@ -47,15 +47,15 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
4747

4848
nodes {
4949
hostname = "myprefix1-r64zc1"
50-
ip = "192.168.19.2"
51-
vip = "192.168.19.3"
50+
ip = "192.168.19.10"
51+
vip = "192.168.19.11"
5252
vip_hostname = "myprefix1-r64zc1-vip"
5353
}
5454

5555
nodes {
5656
hostname = "myprefix1-r64zc2"
57-
ip = "192.168.19.4"
58-
vip = "192.168.19.5"
57+
ip = "192.168.19.14"
58+
vip = "192.168.19.15"
5959
vip_hostname = "myprefix1-r64zc2-vip"
6060
}
6161

@@ -75,7 +75,7 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
7575
resource "oci_database_vm_cluster" "test_vm_cluster" {
7676
#Required
7777
compartment_id = "${var.compartment_id}"
78-
cpu_core_count = "2"
78+
cpu_core_count = "4"
7979
display_name = "testVmCluster"
8080
exadata_infrastructure_id = "${oci_database_exadata_infrastructure.test_exadata_infrastructure.id}"
8181
gi_version = "19.1.0.0"
@@ -174,7 +174,10 @@ resource "oci_database_backup_destination" "test_backup_destination_nfs" {
174174
freeform_tags = {
175175
"Department" = "Finance"
176176
}
177-
local_mount_point_path = "local_mount_point_path"
177+
mount_type_details {
178+
local_mount_point_path = "localMountPointPath"
179+
mount_type = "SELF_MOUNT"
180+
}
178181
}
179182

180183
data "oci_database_vm_cluster_network_download_config_file" "test_vm_cluster_network_download_config_file" {

‎examples/datacatalog/main.tf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@ provider "oci" {
1717
}
1818

1919
resource "oci_datacatalog_catalog" test_oci_datacatalog_catalog {
20+
compartment_id = "${var.compartment_id}"
21+
attached_catalog_private_endpoints = ["${oci_datacatalog_catalog_private_endpoint.test_catalog_private_endpoint.id}"]
22+
}
23+
24+
resource "oci_datacatalog_catalog_private_endpoint" "test_catalog_private_endpoint" {
25+
#Required
26+
compartment_id = "${var.compartment_id}"
27+
dns_zones = ["custpvtsubnet.oraclevcn.com"]
28+
subnet_id = "${oci_core_subnet.test_subnet.id}"
29+
}
30+
31+
data "oci_datacatalog_catalog_private_endpoints" "test_catalog_private_endpoints" {
32+
#Required
2033
compartment_id = "${var.compartment_id}"
2134
}
2235

‎examples/datacatalog/subnet.tf‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
data "oci_identity_availability_domain" "ad" {
5+
compartment_id = "${var.tenancy_ocid}"
6+
ad_number = 1
7+
}
8+
9+
resource "oci_core_vcn" "vcn1" {
10+
cidr_block = "10.0.0.0/16"
11+
compartment_id = "${var.compartment_ocid}"
12+
display_name = "exampleVCN"
13+
dns_label = "tfexamplevcn"
14+
}
15+
16+
resource "oci_core_subnet" "test_subnet" {
17+
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
18+
cidr_block = "10.0.2.0/24"
19+
display_name = "ADSubnet"
20+
dns_label = "adsubnet"
21+
compartment_id = "${var.compartment_ocid}"
22+
vcn_id = "${oci_core_vcn.vcn1.id}"
23+
security_list_ids = ["${oci_core_vcn.vcn1.default_security_list_id}"]
24+
route_table_id = "${oci_core_vcn.vcn1.default_route_table_id}"
25+
dhcp_options_id = "${oci_core_vcn.vcn1.default_dhcp_options_id}"
26+
}

‎examples/dataflow/main.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ variable "application_executor_shape" {
3232

3333
variable "application_file_uri" {}
3434

35+
variable "application_archive_uri" {}
36+
3537
variable "application_language" {
3638
default = "PYTHON"
3739
}
@@ -67,6 +69,7 @@ resource "oci_dataflow_application" "tf_application" {
6769
#description = "${var.application_description}"
6870
#freeform_tags = "${var.application_freeform_tags}"
6971
#logs_bucket_uri = "${var.application_logs_bucket_uri}"
72+
archive_uri = "${var.application_archive_uri}"
7073

7174
#parameters {
7275
#Required

‎examples/dataintegration/main.tf‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
// Copyright (c) 2017, 2019, 2020, Oracle and/or its affiliates. All rights reserved.
2+
3+
// These variables would commonly be defined as environment variables or sourced in a .env file
4+
5+
variable "tenancy_ocid" {}
6+
variable "user_ocid" {}
7+
variable "fingerprint" {}
8+
variable "private_key_path" {}
9+
variable "compartment_ocid" {}
10+
variable "region" {}
11+
12+
provider "oci" {
13+
region = "${var.region}"
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+
}
19+
20+
variable "workspace_defined_tags_value" {}
21+
22+
variable "workspace_description" {
23+
default = "description"
24+
}
25+
26+
variable "workspace_display_name" {
27+
default = "displayName"
28+
}
29+
30+
variable "workspace_dns_server_ip" {}
31+
32+
variable "workspace_dns_server_zone" {}
33+
34+
variable "workspace_freeform_tags" {
35+
default = {
36+
"Department" = "Finance"
37+
}
38+
}
39+
40+
variable "workspace_is_private_network_enabled" {
41+
default = false
42+
}
43+
44+
variable "workspace_state" {
45+
default = "ACTIVE"
46+
}
47+
48+
resource "oci_core_subnet" "test_subnet" {
49+
cidr_block = "10.0.0.0/24"
50+
compartment_id = "${var.compartment_id}"
51+
vcn_id = "${oci_core_vcn.test_vcn.id}"
52+
dns_label = "dnslabel"
53+
}
54+
55+
resource "oci_core_vcn" "test_vcn" {
56+
cidr_block = "10.0.0.0/16"
57+
compartment_id = "${var.compartment_id}"
58+
dns_label = "dnslabel"
59+
}
60+
61+
resource "oci_dataintegration_workspace" "test_workspace" {
62+
#Required
63+
display_name = "${var.workspace_display_name}"
64+
65+
#Optional
66+
compartment_id = "${var.compartment_id}"
67+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.workspace_defined_tags_value}")}"
68+
description = "${var.workspace_description}"
69+
dns_server_ip = "${var.workspace_dns_server_ip}"
70+
dns_server_zone = "${var.workspace_dns_server_zone}"
71+
freeform_tags = "${var.workspace_freeform_tags}"
72+
is_private_network_enabled = "${var.workspace_is_private_network_enabled}"
73+
subnet_id = "${oci_core_subnet.test_subnet.id}"
74+
vcn_id = "${oci_core_vcn.test_vcn.id}"
75+
}
76+
77+
data "oci_dataintegration_workspaces" "test_workspaces" {
78+
#Required
79+
compartment_id = "${var.compartment_id}"
80+
81+
#Optional
82+
state = "${var.workspace_state}"
83+
}
84+
85+
data "oci_dataintegration_workspace" "test_workspace" {
86+
#Required
87+
workspace_id = "${oci_dataintegration_workspace.test_workspace.id}"
88+
}

‎examples/dns/rrset.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,9 @@ resource "oci_dns_rrset" "rrset-cname" {
4343
ttl = 86400
4444
}
4545
}
46+
47+
data "oci_dns_rrset" "test_rrset" {
48+
domain = "el.${oci_dns_zone.zone3.name}"
49+
rtype = "CNAME"
50+
zone_name_or_id = "${oci_dns_zone.zone3.id}"
51+
}

‎examples/mysql/main.tf‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
variable "compartment_ocid" {}
9+
10+
provider "oci" {
11+
tenancy_ocid = "${var.tenancy_ocid}"
12+
user_ocid = "${var.user_ocid}"
13+
fingerprint = "${var.fingerprint}"
14+
private_key_path = "${var.private_key_path}"
15+
region = "${var.region}"
16+
}
17+
18+
resource "oci_core_subnet" "test_subnet" {
19+
cidr_block = "10.0.0.0/24"
20+
compartment_id = "${var.compartment_ocid}"
21+
vcn_id = "${oci_core_vcn.test_vcn.id}"
22+
}
23+
24+
resource "oci_core_vcn" "test_vcn" {
25+
cidr_block = "10.0.0.0/16"
26+
compartment_id = "${var.compartment_ocid}"
27+
}
28+
29+
resource "oci_mysql_mysql_backup" "test_mysql_backup" {
30+
db_system_id = "${oci_mysql_mysql_db_system.test_mysql_backup_db_system.id}"
31+
}
32+
33+
resource "oci_mysql_mysql_db_system" "test_mysql_backup_db_system" {
34+
#Required
35+
admin_password = "BEstrO0ng_#11"
36+
admin_username = "adminUser"
37+
availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
38+
compartment_id = "${var.compartment_ocid}"
39+
configuration_id = "${data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations.0.id}"
40+
shape_name = "VM.Standard.E2.2"
41+
subnet_id = "${oci_core_subnet.test_subnet.id}"
42+
43+
#Optional
44+
data_storage_size_in_gb = "50"
45+
}
46+
47+
resource "oci_mysql_mysql_db_system" "test_mysql_db_system" {
48+
#Required
49+
admin_password = "BEstrO0ng_#11"
50+
admin_username = "adminUser"
51+
availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
52+
compartment_id = "${var.compartment_ocid}"
53+
configuration_id = "${data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations.0.id}"
54+
shape_name = "VM.Standard.E2.2"
55+
subnet_id = "${oci_core_subnet.test_subnet.id}"
56+
57+
#Optional
58+
backup_policy {
59+
is_enabled = "false"
60+
retention_in_days = "10"
61+
window_start_time = "01:00-00:00"
62+
}
63+
64+
#defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.mysql_defined_tags_value}")}"
65+
#freeform_tags = "${var.mysql_freeform_tags}"
66+
description = "MySQL Database Service"
67+
68+
display_name = "DBSystem001"
69+
fault_domain = "FAULT-DOMAIN-1"
70+
hostname_label = "hostnameLabel"
71+
ip_address = "10.0.0.8"
72+
73+
maintenance {
74+
window_start_time = "sun 01:00"
75+
}
76+
77+
mysql_version = "${data.oci_mysql_mysql_versions.test_mysql_versions.versions.0.versions.0.version}"
78+
port = "3306"
79+
port_x = "33306"
80+
81+
# Creating DB System using a backup
82+
source {
83+
backup_id = "${oci_mysql_mysql_backup.test_mysql_backup.id}"
84+
source_type = "BACKUP"
85+
}
86+
}
87+
88+
data "oci_mysql_mysql_versions" "test_mysql_versions" {
89+
compartment_id = "${var.compartment_ocid}"
90+
}
91+
92+
data "oci_mysql_mysql_configurations" "test_mysql_configurations" {
93+
compartment_id = "${var.compartment_ocid}"
94+
95+
#Optional
96+
state = "ACTIVE"
97+
display_name = "VM.Standard.E2.2.Built-in"
98+
shape_name = "VM.Standard.E2.2"
99+
}
100+
101+
data "oci_mysql_shapes" "test_shapes" {
102+
compartment_id = "${var.compartment_ocid}"
103+
availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
104+
}
105+
106+
data "oci_identity_availability_domains" "test_availability_domains" {
107+
compartment_id = "${var.tenancy_ocid}"
108+
}
109+
110+
output "version_value" {
111+
value = "${data.oci_mysql_mysql_versions.test_mysql_versions.versions.0.versions.0.version}"
112+
}
113+
114+
output "configuration_id" {
115+
value = "${data.oci_mysql_mysql_configurations.test_mysql_configurations.configurations.0.id}"
116+
}

0 commit comments

Comments
 (0)