Skip to content

Commit 0120bea

Browse files
jotruonjotruon
authored
Releasing version v4.97.0
Releasing version v4.97.0
2 parents 29d7f7c + 30aa90c commit 0120bea

File tree

392 files changed

+31100
-509
lines changed

Some content is hidden

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

392 files changed

+31100
-509
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## 4.97.0 (October 28, 2022)
2+
3+
### Added
4+
- Resource discovery find resources for individual step in parallel
5+
- FoundResource variable declaration
6+
- Concurrecy control for discovery
7+
- maxparallel variables based on number of available cores
8+
- Support for OCI Digital Media Services
9+
- Support for Data Flow Studio support
10+
11+
### Bug Fix
12+
- Document Category Fix
13+
- removed unused/duplicate resource files
14+
- Deprecate resource file for discoveryJobResults resource as it should not have been there
15+
- Documentaion fix for datascience modeldeployment
16+
- oci_mysql_mysql_configuration is missing resource discovery
17+
118
## 4.96.0 (October 05, 2022)
219

320
### Added

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Contributing to the Terraform provider for Oracle Cloud Infrastructure
22

3-
*Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.*
3+
*Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.*
44

55
Pull requests can be made under
6-
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)
6+
[The Oracle Contributor Agreement](https://oca.opensource.oracle.com/)
77
(OCA).
88

99
For pull requests to be accepted, the bottom of

‎examples/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ This directory contains Terraform configuration files showing how to create spec
119119
[![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/management_dashboard.zip)
120120
- marketplace
121121
[![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/marketplace.zip)
122+
- media_services
123+
[![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/media_services.zip)
122124
- metering_computation
123125
[![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/metering_computation.zip)
124126
- monitoring

‎examples/dataflow/main.tf‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ variable "invoke_run_display_name" {
7272
default = "tf_run"
7373
}
7474

75+
variable "statement_code" {
76+
}
77+
7578
resource "oci_dataflow_application" "tf_application" {
7679
#Required
7780
compartment_id = var.compartment_id
@@ -226,6 +229,39 @@ resource "oci_dataflow_application" "test_flex_application" {
226229
warehouse_bucket_uri = var.dataflow_warehouse_bucket_uri
227230
}
228231

232+
resource "oci_dataflow_application" "test_session_application" {
233+
compartment_id = var.compartment_id
234+
description = "description"
235+
display_name = "test_session_app"
236+
driver_shape = "VM.Standard2.1"
237+
executor_shape = "VM.Standard2.1"
238+
type = "SESSION"
239+
language = "PYTHON"
240+
logs_bucket_uri = var.dataflow_logs_bucket_uri
241+
num_executors = "1"
242+
spark_version = "3.2.1"
243+
max_duration_in_minutes = 60
244+
idle_timeout_in_minutes = 30
245+
}
246+
247+
resource "oci_dataflow_invoke_run" "test_invoke_session_run" {
248+
application_id = oci_dataflow_application.test_session_application.id
249+
compartment_id = var.compartment_id
250+
display_name = "test_session_run"
251+
}
252+
253+
# Statement can only be created once the Session Run (test_invoke_session_run) is in "IN_PROGRESS" state.
254+
resource "oci_dataflow_run_statement" "test_run_statement" {
255+
depends_on = [time_sleep.wait_session_run_active_state]
256+
code = var.statement_code
257+
run_id = oci_dataflow_invoke_run.test_invoke_session_run.id
258+
}
259+
260+
resource "time_sleep" "wait_session_run_active_state" {
261+
depends_on = [oci_dataflow_invoke_run.test_invoke_session_run]
262+
create_duration = "10m"
263+
}
264+
229265
resource "oci_dataflow_application" "test_application_logging" {
230266
archive_uri = var.application_archive_uri
231267
arguments = ["arguments"]

‎examples/datasafe/discovery_job_result/discovery_job_result.tf‎

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -8,101 +8,36 @@ variable "private_key_path" {}
88
variable "region" {}
99
variable "compartment_ocid" {}
1010
variable "data_safe_target_ocid" {}
11+
variable "data_safe_discovery_job_ocid" {}
12+
variable "data_safe_discovery_job_result_key" {}
1113

1214
variable "discovery_jobs_result_column_name" {
1315
default = []
1416
}
1517

1618
variable "discovery_jobs_result_discovery_type" {
17-
default = "ALL"
19+
default = "NEW"
1820
}
1921

2022
variable "discovery_jobs_result_is_result_applied" {
2123
default = false
2224
}
2325

24-
variable "discovery_jobs_result_object" {
25-
default = []
26-
}
27-
2826
variable "discovery_jobs_result_planned_action" {
2927
default = "NONE"
3028
}
3129

32-
variable "discovery_jobs_result_schema_name" {
33-
default = []
34-
}
35-
36-
37-
3830
provider "oci" {
3931
tenancy_ocid = var.tenancy_ocid
4032
user_ocid = var.user_ocid
4133
fingerprint = var.fingerprint
4234
private_key_path = var.private_key_path
4335
region = var.region
4436
}
45-
# sensitive data model
46-
variable "sensitive_data_model_display_name" {
47-
default = "displayName"
48-
}
49-
50-
variable "sensitive_data_model_schemas_for_discovery" {
51-
default = []
52-
}
53-
54-
variable "sensitive_data_model_sensitive_type_ids_for_discovery" {
55-
default = []
56-
}
57-
58-
resource "oci_data_safe_sensitive_data_model" "test_sensitive_data_model" {
59-
#Required
60-
compartment_id = var.compartment_ocid
61-
target_id = var.data_safe_target_ocid
62-
63-
#Optional
64-
display_name = var.sensitive_data_model_display_name
65-
schemas_for_discovery = var.sensitive_data_model_schemas_for_discovery
66-
sensitive_type_ids_for_discovery = var.sensitive_data_model_sensitive_type_ids_for_discovery
67-
}
68-
# ---------
69-
70-
# discovery job
71-
variable "discovery_job_discovery_type" {
72-
default = "ALL"
73-
}
74-
75-
variable "discovery_job_is_include_all_schemas" {
76-
default = true
77-
}
78-
79-
variable "discovery_job_is_include_all_sensitive_types" {
80-
default = true
81-
}
82-
83-
resource "oci_data_safe_discovery_job" "test_discovery_job" {
84-
#Required
85-
compartment_id = var.compartment_ocid
86-
sensitive_data_model_id = oci_data_safe_sensitive_data_model.test_sensitive_data_model.id
87-
88-
#Optional
89-
discovery_type = var.discovery_job_discovery_type
90-
is_include_all_schemas = var.discovery_job_is_include_all_schemas
91-
is_include_all_sensitive_types = var.discovery_job_is_include_all_sensitive_types
92-
}
93-
94-
# -------------
95-
96-
97-
98-
resource "oci_data_safe_discovery_jobs_result" "test_discovery_jobs_result" {
99-
#Required
100-
discovery_job_id = oci_data_safe_discovery_job.test_discovery_job.id
101-
}
10237

10338
data "oci_data_safe_discovery_jobs_results" "test_discovery_jobs_results" {
10439
#Required
105-
discovery_job_id = oci_data_safe_discovery_job.test_discovery_job.id
40+
discovery_job_id = var.data_safe_discovery_job_ocid
10641

10742
#Optional
10843
discovery_type = var.discovery_jobs_result_discovery_type

‎examples/media_services/README.md‎

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 Media 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/media_services.zip)

‎examples/media_services/common.tf‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
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 "tenancy_ocid" {}
6+
7+
variable "user_ocid" {}
8+
9+
variable "fingerprint" {}
10+
11+
variable "private_key_path" {}
12+
13+
variable "region" {}
14+
15+
variable "compartment_id" {}
16+
17+
provider "oci" {
18+
tenancy_ocid = var.tenancy_ocid
19+
user_ocid = var.user_ocid
20+
fingerprint = var.fingerprint
21+
private_key_path = var.private_key_path
22+
region = var.region
23+
}
24+
25+
variable "media_asset_state" {
26+
default = "ACTIVE"
27+
}
28+
29+
variable "media_asset_type" {
30+
default = "AUDIO"
31+
}
32+
33+
variable "defined_tags_value" {
34+
default = "value"
35+
}
36+
37+
variable "display_name" {
38+
default = "displayName"
39+
}
40+
41+
variable "freeform_tags" {
42+
default = { "bar-key" = "value" }
43+
}
44+
45+
variable "id" {
46+
default = "id"
47+
}
48+
49+
variable "active_state" {
50+
default = "ACTIVE"
51+
}
52+
53+
variable "accepted_state" {
54+
default = "ACCEPTED"
55+
}
56+
57+
resource "oci_identity_tag_namespace" "tag-namespace1" {
58+
compartment_id = var.tenancy_ocid
59+
description = "example tag namespace"
60+
name = "examples-tag-namespace-all"
61+
is_retired = false
62+
}
63+
64+
resource "oci_identity_tag" "tag1" {
65+
description = "example tag"
66+
name = "example-tag"
67+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
68+
is_cost_tracking = false
69+
is_retired = false
70+
}
71+
72+
variable "kms_vault_id" {}
73+
74+
data "oci_kms_vault" "test_vault" {
75+
#Required
76+
vault_id = var.kms_vault_id
77+
}
78+
79+
data "oci_kms_keys" "test_keys_dependency_RSA" {
80+
#Required
81+
compartment_id = var.tenancy_ocid
82+
management_endpoint = data.oci_kms_vault.test_vault.management_endpoint
83+
algorithm = "RSA"
84+
85+
filter {
86+
name = "state"
87+
values = ["ENABLED", "UPDATING"]
88+
}
89+
}
90+

‎examples/media_services/description.md‎

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 Media 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.

‎examples/media_services/media_asset.tf‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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 "media_asset_bucket" {
6+
default = "bucket"
7+
}
8+
9+
variable "media_asset_media_asset_tags_type" {
10+
default = "USER"
11+
}
12+
13+
variable "media_asset_media_asset_tags_value" {
14+
default = "value"
15+
}
16+
17+
variable "media_asset_metadata_metadata" {
18+
default = "{\"some\":\"json\"}"
19+
}
20+
21+
variable "media_asset_namespace" {
22+
default = "namespace"
23+
}
24+
25+
variable "media_asset_object" {
26+
default = "object"
27+
}
28+
29+
variable "media_asset_object_etag" {
30+
default = "objectEtag"
31+
}
32+
33+
variable "media_asset_segment_range_end_index" {
34+
default = 10
35+
}
36+
37+
variable "media_asset_segment_range_start_index" {
38+
default = 10
39+
}
40+
41+
variable "media_asset_source_media_workflow_version" {
42+
default = 10
43+
}
44+
45+
resource "oci_media_services_media_asset" "test_media_asset" {
46+
#Required
47+
compartment_id = var.compartment_id
48+
type = var.media_asset_type
49+
50+
#Optional
51+
bucket = var.media_asset_bucket
52+
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.defined_tags_value}")
53+
display_name = var.display_name
54+
freeform_tags = var.freeform_tags
55+
media_asset_tags {
56+
#Required
57+
value = var.media_asset_media_asset_tags_value
58+
59+
#Optional
60+
type = var.media_asset_media_asset_tags_type
61+
}
62+
media_workflow_job_id = oci_media_services_media_workflow_job.test_media_workflow_job.id
63+
metadata {
64+
#Required
65+
metadata = var.media_asset_metadata_metadata
66+
}
67+
namespace = var.media_asset_namespace
68+
object = var.media_asset_object
69+
object_etag = var.media_asset_object_etag
70+
segment_range_end_index = var.media_asset_segment_range_end_index
71+
segment_range_start_index = var.media_asset_segment_range_start_index
72+
source_media_workflow_id = oci_media_services_media_workflow.test_media_workflow.id
73+
source_media_workflow_version = var.media_asset_source_media_workflow_version
74+
}
75+
76+
data "oci_media_services_media_assets" "test_media_assets" {
77+
78+
#Optional
79+
bucket = var.media_asset_bucket
80+
compartment_id = var.compartment_id
81+
display_name = var.display_name
82+
media_workflow_job_id = oci_media_services_media_workflow_job.test_media_workflow_job.id
83+
object = var.media_asset_object
84+
source_media_workflow_id = oci_media_services_media_workflow.test_media_workflow.id
85+
source_media_workflow_version = var.media_asset_source_media_workflow_version
86+
state = var.media_asset_state
87+
type = var.media_asset_type
88+
}
89+

0 commit comments

Comments
 (0)