Skip to content

Commit 809164b

Browse files
authored
Merge pull request #1403 from terraform-providers/release_gh
Releasing version 4.33.0
2 parents 9631b80 + da66615 commit 809164b

File tree

9,312 files changed

+120446
-76780
lines changed

Some content is hidden

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

9,312 files changed

+120446
-76780
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 4.33.0 (Unreleased)
2+
3+
### Added
4+
- Support for OKE Network Security Group (NSG)
5+
- Support for Metastore in Data Catalog
6+
- Support for ATP-D: Fractional OCPUs
7+
- Support for Developer Lifecycle CD Service
8+
19
## 4.32.0 (June 23, 2021)
210

311
### Added

examples/database/adb/autonomous_database.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ output "autonomous_database_admin_password" {
129129

130130
output "autonomous_database_high_connection_string" {
131131
value = lookup(
132-
oci_database_autonomous_database.autonomous_database.connection_strings[0].all_connection_strings,
132+
oci_database_autonomous_database.autonomous_database.connection_strings[0],
133133
"high",
134134
"unavailable",
135135
)

examples/datacatalog/main.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ data "oci_datacatalog_catalog_types" "test_catalog_types_dataAsset" {
9191
data "oci_datacatalog_catalog_types" "test_catalog_types_connection" {
9292
catalog_id = oci_datacatalog_catalog.test_oci_datacatalog_catalog.id
9393
type_category = "connection"
94-
name = "Jdbc"
94+
name = "JDBC"
9595
state = "ACTIVE"
96-
}
97-
96+
}

examples/datacatalog/metastore.tf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
variable "metastore_default_external_table_location" {
2+
}
3+
4+
variable "metastore_default_managed_table_location" {
5+
}
6+
7+
resource "oci_datacatalog_metastore" "test_metastore" {
8+
#Required
9+
compartment_id = var.compartment_id
10+
default_external_table_location = var.metastore_default_external_table_location
11+
default_managed_table_location = var.metastore_default_managed_table_location
12+
13+
}
14+
15+
data "oci_datacatalog_metastores" "test_metastores" {
16+
#Required
17+
compartment_id = var.compartment_id
18+
}

examples/devops/log.tf

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_logging_log_group" "test_log_group" {
5+
#Required
6+
compartment_id = var.compartment_ocid
7+
display_name = "exampleLogGroup"
8+
9+
10+
description = "description"
11+
12+
}
13+
14+
resource "oci_logging_log" "test_log" {
15+
#Required
16+
display_name = "displayName"
17+
log_group_id = oci_logging_log_group.test_log_group.id
18+
log_type = "SERVICE"
19+
20+
#Optional
21+
configuration {
22+
#Required
23+
source {
24+
#Required
25+
category = "all"
26+
resource = oci_devops_project.test_project.id
27+
service = "devops"
28+
source_type = "OCISERVICE"
29+
}
30+
}
31+
is_enabled = "true"
32+
retention_duration = "30"
33+
}

examples/devops/main.tf

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
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+
}
6+
7+
variable "user_ocid" {
8+
}
9+
10+
variable "fingerprint" {
11+
}
12+
13+
variable "private_key_path" {
14+
}
15+
16+
variable "compartment_ocid" {
17+
}
18+
19+
variable "region" {
20+
}
21+
22+
provider "oci" {
23+
region = var.region
24+
tenancy_ocid = var.tenancy_ocid
25+
user_ocid = var.user_ocid
26+
fingerprint = var.fingerprint
27+
private_key_path = var.private_key_path
28+
}
29+
30+
resource "random_string" "topicname" {
31+
length = 10
32+
special = false
33+
}
34+
35+
resource "random_string" "projectname" {
36+
length = 10
37+
special = false
38+
}
39+
40+
resource "oci_ons_notification_topic" "test_notification_topic" {
41+
#Required
42+
compartment_id = var.compartment_ocid
43+
name = random_string.topicname.result
44+
}
45+
46+
resource "oci_devops_project" "test_project" {
47+
#Required
48+
compartment_id = var.compartment_ocid
49+
name = random_string.projectname.result
50+
notification_config {
51+
#Required
52+
topic_id = oci_ons_notification_topic.test_notification_topic.id
53+
}
54+
}
55+
56+
resource "oci_devops_deploy_pipeline" "test_deploy_pipeline" {
57+
#Required
58+
project_id = oci_devops_project.test_project.id
59+
60+
description = "description"
61+
display_name = "displayName"
62+
}
63+
64+
resource "oci_devops_deploy_artifact" "test_deploy_ocir_artifact" {
65+
project_id = oci_devops_project.test_project.id
66+
display_name = "Display_name"
67+
deploy_artifact_type = "DOCKER_IMAGE"
68+
argument_substitution_mode = "NONE"
69+
deploy_artifact_source {
70+
deploy_artifact_source_type = "OCIR"
71+
image_uri = "iad.ocir.io/ax022wvgmjpq/fake/hello-java:0.0.2"
72+
image_digest = "38598585.fakedigest1"
73+
}
74+
}
75+
76+
resource "oci_devops_deploy_artifact" "test_deploy_generic_artifact" {
77+
argument_substitution_mode = "NONE"
78+
deploy_artifact_source {
79+
deploy_artifact_path = "helloworld-oke.yaml"
80+
deploy_artifact_source_type = "GENERIC_ARTIFACT"
81+
deploy_artifact_version = "v1"
82+
repository_id = "ocid1.artifactrepository.oc1.iad.0.amaaaaaansx72maa7nbce5ebmsqkan3msgyosvxe5d5a6jghn5su6ykgw7vq"
83+
}
84+
deploy_artifact_type = "KUBERNETES_MANIFEST"
85+
project_id = "${oci_devops_project.test_project.id}"
86+
}
87+
88+
resource "oci_devops_deploy_environment" "test_deploy_environment" {
89+
#Required
90+
deploy_environment_type = "OKE_CLUSTER"
91+
project_id = oci_devops_project.test_project.id
92+
cluster_id = "ocid1.cluster.oc1.us-ashburn-1.aaaaaaaaafqtkm3fg4zwgnlggmywkzdemi2dcyzymfrdqojygcstocluster1"
93+
display_name = "Display_name"
94+
}
95+
96+
resource "oci_devops_deploy_environment" "test_deploy_function_environment" {
97+
#Required
98+
deploy_environment_type = "FUNCTION"
99+
project_id = oci_devops_project.test_project.id
100+
function_id = "ocid1.fnfunc.oc1.us-ashburn-1.aaaaaaaaafqtkm3fg4zwgnlggmywkzdemi2dcyzymfrdqojygcstofunction1"
101+
display_name = "Display_name"
102+
}
103+
104+
resource "oci_devops_deploy_environment" "test_deploy_instance_group_environment" {
105+
compute_instance_group_selectors {
106+
items {
107+
compute_instance_ids = ["ocid1.instance.oc1.iad.anuwcljtnsx72macffe5fbkzbj4eerle5ot56g2cexj3jvfsr242pye44ghq"]
108+
selector_type = "INSTANCE_IDS"
109+
}
110+
}
111+
deploy_environment_type = "COMPUTE_INSTANCE_GROUP"
112+
project_id = "${oci_devops_project.test_project.id}"
113+
}
114+
115+
resource "oci_devops_deploy_stage" "test_deploy_stage" {
116+
#Required
117+
deploy_pipeline_id = oci_devops_deploy_pipeline.test_deploy_pipeline.id
118+
deploy_stage_predecessor_collection {
119+
#Required
120+
items {
121+
#Required
122+
id = oci_devops_deploy_pipeline.test_deploy_pipeline.id
123+
}
124+
}
125+
deploy_stage_type = "WAIT"
126+
127+
description = "description"
128+
display_name = "displayName"
129+
wait_criteria {
130+
#Required
131+
wait_duration = "PT5S"
132+
wait_type = "ABSOLUTE_WAIT"
133+
}
134+
}
135+
136+
resource "oci_devops_deploy_stage" "test_deploy_stage" {
137+
compute_instance_group_deploy_environment_id = "${oci_devops_deploy_environment.test_deploy_instance_group_environment.id}"
138+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}"
139+
deploy_pipeline_id = "${oci_devops_deploy_pipeline.test_deploy_pipeline.id}"
140+
deploy_stage_predecessor_collection {
141+
items {
142+
id = "${oci_devops_deploy_pipeline.test_deploy_pipeline.id}"
143+
}
144+
}
145+
deploy_stage_type = "COMPUTE_INSTANCE_GROUP_ROLLING_DEPLOYMENT"
146+
deployment_spec_deploy_artifact_id = "${oci_devops_deploy_artifact.test_deploy_generic_artifact.id}"
147+
description = "description"
148+
display_name = "displayName"
149+
failure_policy {
150+
failure_count = "1"
151+
policy_type = "COMPUTE_INSTANCE_GROUP_FAILURE_POLICY_BY_COUNT"
152+
}
153+
freeform_tags = {
154+
"bar-key" = "value"
155+
}
156+
load_balancer_config {
157+
backend_port = "8080"
158+
listener_name = "LoadBalancerListener"
159+
load_balancer_id = "ocid1.loadbalancer.oc1.phx.aaaaaaaaafqtkm3fg4zwgnlggmywkzdemi2dcyzymfrdqojygcstofake1"
160+
}
161+
rollback_policy {
162+
policy_type = "AUTOMATED_STAGE_ROLLBACK_POLICY"
163+
}
164+
rollout_policy {
165+
batch_count = "5"
166+
batch_delay_in_seconds = "10"
167+
policy_type = "COMPUTE_INSTANCE_GROUP_LINEAR_ROLLOUT_POLICY_BY_COUNT"
168+
}
169+
}
170+
171+
172+
resource "oci_devops_deployment" "test_deployment" {
173+
#Required
174+
deploy_pipeline_id = oci_devops_deploy_pipeline.test_deploy_pipeline.id
175+
deployment_type = "PIPELINE_DEPLOYMENT"
176+
177+
#Optional
178+
display_name = "test_deployment"
179+
180+
}

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.13.3
88
github.com/hashicorp/terraform-plugin-sdk v1.17.2
9-
github.com/oracle/oci-go-sdk/v42 v42.1.0
9+
github.com/oracle/oci-go-sdk/v43 v43.0.0
1010
github.com/stretchr/testify v1.7.0
1111
golang.org/x/mod v0.3.0
1212
gopkg.in/yaml.v2 v2.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
302302
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
303303
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
304304
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
305-
github.com/oracle/oci-go-sdk/v42 v42.1.0 h1:7nXs1kgJ6AH1NZnXeTgcCmQbxRyJZlFYvEhj5bm181o=
306-
github.com/oracle/oci-go-sdk/v42 v42.1.0/go.mod h1:PSCps9JJgMAHCXywUoK5uctMWZ8ns8zfJjkPnCDCMM0=
305+
github.com/oracle/oci-go-sdk/v43 v43.0.0 h1:7QVyGwU84uKJuLrvKFUJnhoUhkVewTa+oixGDSmR518=
306+
github.com/oracle/oci-go-sdk/v43 v43.0.0/go.mod h1:418EOI7+XCK1619VgFBYprjJO9TTR0HlQ/JX2ftTUPM=
307307
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
308308
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
309309
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

oci/analytics_analytics_instance_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10-
oci_analytics "github.com/oracle/oci-go-sdk/v42/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v43/analytics"
1111
)
1212

1313
func init() {

oci/analytics_analytics_instance_private_access_channel_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10-
oci_analytics "github.com/oracle/oci-go-sdk/v42/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v43/analytics"
1111
)
1212

1313
func init() {

0 commit comments

Comments
 (0)