Skip to content

Commit 223156b

Browse files
govindrao55govindrao55
authored
Releasing version 4.27.0
Releasing version 4.27.0
2 parents 44ce669 + e4d1eb6 commit 223156b

File tree

287 files changed

+26488
-232
lines changed

Some content is hidden

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

287 files changed

+26488
-232
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 4.27.0 (Unreleased)
2+
3+
### Added
4+
- Support for `OPSI` service
5+
- Support for Spark Submit added in Data Flow
6+
17
## 4.26.0 (May 12, 2021)
28

39
### Added

‎examples/dataflow/main.tf‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,34 @@ resource "oci_dataflow_invoke_run" "test_invoke_run" {
200200
display_name = "test_run_name"
201201
}
202202

203+
resource "oci_dataflow_application" "test_application_submit" {
204+
#Required
205+
compartment_id = var.compartment_id
206+
execute = "--conf spark.shuffle.io.maxRetries=10 ${var.application_file_uri} arguments"
207+
display_name = "test_wordcount_app_submit"
208+
driver_shape = "VM.Standard2.1"
209+
executor_shape = "VM.Standard2.1"
210+
file_uri = var.application_file_uri
211+
language = "PYTHON"
212+
num_executors = "1"
213+
spark_version = "2.4"
214+
#Optional
215+
archive_uri = var.application_archive_uri
216+
private_endpoint_id = oci_dataflow_private_endpoint.test_private_endpoint.id
217+
218+
}
219+
220+
resource "oci_dataflow_invoke_run" "test_invokey_run_submit" {
221+
#Required
222+
compartment_id = var.compartment_id
223+
execute = "--conf spark.shuffle.io.maxRetries=10 ${var.application_file_uri} arguments"
224+
#Optional
225+
application_id = oci_dataflow_application.test_application_submit.id
226+
archive_uri = var.application_archive_uri
227+
display_name = "test_wordcount_run_submit"
228+
spark_version = "2.4"
229+
}
230+
203231
data "oci_dataflow_private_endpoints" "test_private_endpoints" {
204232
compartment_id = var.compartment_id
205233

‎examples/opsi/database_insight/database_insight.tf‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
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 "enterprise_manager_bridge_ocid" {}
11+
variable "enterprise_manager_entity_id" {}
12+
variable "enterprise_manager_id" {}
13+
14+
provider "oci" {
15+
tenancy_ocid = var.tenancy_ocid
16+
user_ocid = var.user_ocid
17+
fingerprint = var.fingerprint
18+
private_key_path = var.private_key_path
19+
region = var.region
20+
}
21+
22+
resource "oci_identity_tag_namespace" "tag-namespace1" {
23+
compartment_id = var.tenancy_ocid
24+
description = "example tag namespace"
25+
name = "examples-tag-namespace-all"
26+
is_retired = false
27+
}
28+
29+
30+
resource "oci_identity_tag" "tag1" {
31+
description = "example tag"
32+
name = "example-tag"
33+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
34+
is_cost_tracking = false
35+
is_retired = false
36+
}
37+
38+
variable "database_insight_database_type" {
39+
default = ["EXTERNAL-NONCDB"]
40+
}
41+
42+
variable "database_insight_defined_tags_value" {
43+
default = "value"
44+
}
45+
46+
variable "database_insight_entity_source" {
47+
default = "EM_MANAGED_EXTERNAL_DATABASE"
48+
}
49+
50+
variable "database_insight_fields" {
51+
default = ["databaseName", "databaseType", "compartmentId", "databaseDisplayName", "freeformTags", "definedTags", "systemTags"]
52+
}
53+
54+
variable "database_insight_freeform_tags" {
55+
default = { "bar-key" = "value" }
56+
}
57+
58+
variable "resource_status" {
59+
default = "ENABLED"
60+
}
61+
62+
// Create Database insight for EM managed External Database
63+
resource "oci_opsi_database_insight" "test_database_insight" {
64+
compartment_id = var.compartment_ocid
65+
enterprise_manager_bridge_id = var.enterprise_manager_bridge_ocid
66+
enterprise_manager_entity_identifier = var.enterprise_manager_entity_id
67+
enterprise_manager_identifier = var.enterprise_manager_id
68+
entity_source = var.database_insight_entity_source
69+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.database_insight_defined_tags_value}")}"
70+
freeform_tags = var.database_insight_freeform_tags
71+
status = var.resource_status
72+
}
73+
74+
variable "database_insight_state" {
75+
default = ["ACTIVE"]
76+
}
77+
78+
variable "database_insight_status" {
79+
default = ["ENABLED"]
80+
}
81+
82+
// List EM managed database insights
83+
data "oci_opsi_database_insights" "test_database_insights" {
84+
85+
#Optional
86+
compartment_id = var.compartment_ocid
87+
database_type = var.database_insight_database_type
88+
enterprise_manager_bridge_id = var.enterprise_manager_bridge_ocid
89+
fields = var.database_insight_fields
90+
state = var.database_insight_state
91+
status = var.database_insight_status
92+
}
93+
94+
// Get an EM managed database insight
95+
data "oci_opsi_database_insight" "test_database_insight" {
96+
database_insight_id = oci_opsi_database_insight.test_database_insight.id
97+
}
98+

‎examples/opsi/enterprise_manager_bridge/enterprise_manager_bridge.tf‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
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+
11+
12+
provider "oci" {
13+
tenancy_ocid = var.tenancy_ocid
14+
user_ocid = var.user_ocid
15+
fingerprint = var.fingerprint
16+
private_key_path = var.private_key_path
17+
region = var.region
18+
}
19+
20+
data "oci_objectstorage_namespace" "test_namespace" {
21+
compartment_id = var.compartment_ocid
22+
}
23+
24+
variable "bucket_name" {
25+
default = "em_data_collection_bucket"
26+
}
27+
28+
resource "oci_objectstorage_bucket" "test_bucket" {
29+
name = var.bucket_name
30+
compartment_id = var.compartment_ocid
31+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
32+
}
33+
34+
resource "oci_identity_tag_namespace" "tag-namespace1" {
35+
compartment_id = var.tenancy_ocid
36+
description = "example tag namespace"
37+
name = "example-tag-namespace-all"
38+
is_retired = false
39+
}
40+
41+
42+
resource "oci_identity_tag" "tag1" {
43+
description = "example tag"
44+
name = "example-tag"
45+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
46+
is_cost_tracking = false
47+
is_retired = false
48+
}
49+
50+
51+
variable "enterprise_manager_bridge_defined_tags_value" {
52+
default = "embridge_tag_value"
53+
}
54+
55+
variable "enterprise_manager_bridge_description" {
56+
default = "Test EM Bridge Description"
57+
}
58+
59+
variable "enterprise_manager_bridge_display_name" {
60+
default = "TestEMManagedBridgeName"
61+
}
62+
63+
variable "enterprise_manager_bridge_freeform_tags" {
64+
default = { "bar-key" = "value" }
65+
}
66+
67+
variable "enterprise_manager_bridge_state" {
68+
default = ["ACTIVE"]
69+
}
70+
71+
// To Create a Enterprise Manager Bridge
72+
resource "oci_opsi_enterprise_manager_bridge" "test_enterprise_manager_bridge" {
73+
#Required
74+
compartment_id = var.compartment_ocid
75+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.enterprise_manager_bridge_defined_tags_value}")}"
76+
display_name = var.enterprise_manager_bridge_display_name
77+
freeform_tags = var.enterprise_manager_bridge_freeform_tags
78+
object_storage_bucket_name = oci_objectstorage_bucket.test_bucket.name
79+
description = var.enterprise_manager_bridge_description
80+
}
81+
82+
output "enterprise_manager_bridge_id" {
83+
value = oci_opsi_enterprise_manager_bridge.test_enterprise_manager_bridge.id
84+
}
85+
86+
// List EM Bridge present under a compartment having state ACTIVE
87+
data "oci_opsi_enterprise_manager_bridges" "test_enterprise_manager_bridges" {
88+
compartment_id = var.compartment_ocid
89+
state = var.enterprise_manager_bridge_state
90+
}
91+
92+
// Get EM Bridge for a particular id
93+
data "oci_opsi_enterprise_manager_bridge" "test_enterprise_manager_bridge" {
94+
enterprise_manager_bridge_id = oci_opsi_enterprise_manager_bridge.test_enterprise_manager_bridge.id
95+
}
96+

‎examples/opsi/host_insight/host_insight.tf‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
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+
variable "user_ocid" {}
7+
variable "fingerprint" {}
8+
variable "private_key_path" {}
9+
variable "region" {}
10+
variable "managed_agent_id" {}
11+
variable "compartment_ocid" {}
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_identity_tag_namespace" "tag-namespace1" {
22+
compartment_id = var.tenancy_ocid
23+
description = "example tag namespace"
24+
name = "examples-tag-namespace-all"
25+
is_retired = false
26+
}
27+
28+
resource "oci_identity_tag" "tag1" {
29+
description = "example tag"
30+
name = "example-tag"
31+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
32+
is_cost_tracking = false
33+
is_retired = false
34+
}
35+
36+
variable "host_insight_defined_tags_value" {
37+
default = "value"
38+
}
39+
40+
variable "host_insight_entity_source" {
41+
default = "MACS_MANAGED_EXTERNAL_HOST"
42+
}
43+
44+
variable "host_insight_freeform_tags" {
45+
default = { "bar-key" = "value" }
46+
}
47+
48+
variable "resource_status" {
49+
default = "ENABLED"
50+
}
51+
52+
resource "oci_management_agent_management_agent" "test_management_agent" {
53+
managed_agent_id = var.managed_agent_id
54+
}
55+
56+
// To Create a Host insight
57+
resource "oci_opsi_host_insight" "test_host_insight" {
58+
compartment_id = var.compartment_ocid
59+
entity_source = var.host_insight_entity_source
60+
management_agent_id = oci_management_agent_management_agent.test_management_agent.id
61+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.host_insight_defined_tags_value}")}"
62+
freeform_tags = var.host_insight_freeform_tags
63+
status = var.resource_status
64+
}
65+
66+
67+
variable "host_insight_host_type" {
68+
default = ["EXTERNAL-HOST"]
69+
}
70+
71+
variable "host_insight_state" {
72+
default = ["ACTIVE"]
73+
}
74+
75+
variable "host_insight_status" {
76+
default = ["ENABLED"]
77+
}
78+
79+
// List host insight
80+
data "oci_opsi_host_insights" "test_host_insights" {
81+
compartment_id = var.compartment_ocid
82+
host_type = var.host_insight_host_type
83+
state = var.host_insight_state
84+
status = var.host_insight_status
85+
}
86+
87+
// Get an host insight
88+
data "oci_opsi_host_insight" "test_host_insight" {
89+
host_insight_id = oci_opsi_host_insight.test_host_insight.id
90+
}
91+

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
77
github.com/hashicorp/terraform-exec v0.6.0
88
github.com/hashicorp/terraform-plugin-sdk v1.15.0
9-
github.com/oracle/oci-go-sdk/v40 v40.3.0
9+
github.com/oracle/oci-go-sdk/v40 v40.4.0
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.6.1
1212
golang.org/x/mod v0.3.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
200200
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
201201
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
202202
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
203-
github.com/oracle/oci-go-sdk/v40 v40.3.0 h1:GJQsyrwkH69O2X/s6ZXsWAKcCrBfVRJKzXqMhPTJwS8=
204-
github.com/oracle/oci-go-sdk/v40 v40.3.0/go.mod h1:61MwFx5gJGmavyXFWvB2aXzhrgwU42mY1gm1EZYJJ78=
203+
github.com/oracle/oci-go-sdk/v40 v40.4.0 h1:WxLh9S0nBMZ96zkcfZZJ/+F5g7nMi8d6M8/7lO0UKPY=
204+
github.com/oracle/oci-go-sdk/v40 v40.4.0/go.mod h1:61MwFx5gJGmavyXFWvB2aXzhrgwU42mY1gm1EZYJJ78=
205205
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
206206
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
207207
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎oci/core_app_catalog_listing_resource_version_agreement_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "oci_core_app_catalog_listing_resource_version_agreement" "test_app_cat
3030
`
3131
)
3232

33-
func TestCoreAppCatalogListingResourceVersionAgreementResource_basic(t *testing.T) {
33+
func TestResourceAppCatalogListingResourceVersionAgreement_basic(t *testing.T) {
3434
httpreplay.SetScenario("TestCoreAppCatalogListingResourceVersionAgreementResource_basic")
3535
defer httpreplay.SaveScenario()
3636

‎oci/dataflow_application_data_source.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ func (s *DataflowApplicationDataSourceCrud) SetData() error {
9999
s.D.Set("driver_shape", *s.Res.DriverShape)
100100
}
101101

102+
if s.Res.Execute != nil {
103+
s.D.Set("execute", *s.Res.Execute)
104+
}
105+
102106
if s.Res.ExecutorShape != nil {
103107
s.D.Set("executor_shape", *s.Res.ExecutorShape)
104108
}

0 commit comments

Comments
 (0)