Skip to content

Commit 1182cf2

Browse files
authored
Releasing version 4.18.0
Releasing version 4.18.0
2 parents 05458f3 + 4a880fb commit 1182cf2

File tree

543 files changed

+9564
-453
lines changed

Some content is hidden

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

543 files changed

+9564
-453
lines changed

.github/ISSUE_TEMPLATE/Question.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ labels: question
77
This Github template is intended for questions regarding the Terraform **Oracle Cloud Infrastructure** provider.
88

99
Before using this template, check whether your question is already answered in one of the following guides:
10-
* [Frequently Asked Questions](https://www.terraform.io/docs/providers/oci/guides/faq.html)
11-
* [Troubleshooting](https://www.terraform.io/docs/providers/oci/guides/troubleshooting.html)
10+
* [Frequently Asked Questions](https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraform.htm)
11+
* [Troubleshooting](https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformtroubleshooting.htm)
1212

1313

1414
If you have a support request related to Oracle Cloud Infrastructure services, please [contact Oracle support](https://docs.cloud.oracle.com/iaas/Content/GSG/Tasks/contactingsupport.htm)

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 4.18.0 (Unreleased)
2+
3+
### Added
4+
- Support for updating instance type in `oci_oce_oce_instance`
5+
- Support for private native vcn clusters to `container_engine`
6+
- Support for HTTP2 and Advance Rules Sets added to `load_balancer`
7+
- Support for Data Science - Model Deployment
8+
19
## 4.17.0 (March 10, 2021)
210

311
### Added

examples/container_engine/regional_subnet/cluster.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ resource "oci_containerengine_cluster" "test_cluster" {
99
vcn_id = oci_core_vcn.test_vcn.id
1010

1111
#Optional
12+
endpoint_config {
13+
subnet_id = oci_core_subnet.cluster_regional_subnet.id
14+
is_public_ip_enabled = "true"
15+
nsg_ids = [oci_core_network_security_group.test_nsg.id]
16+
}
17+
1218
options {
1319
service_lb_subnet_ids = [oci_core_subnet.clusterSubnet_1.id, oci_core_subnet.clusterSubnet_2.id]
1420

examples/container_engine/regional_subnet/networking.tf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ resource "oci_core_vcn" "test_vcn" {
77
display_name = "tfVcnForClusters"
88
}
99

10+
resource "oci_core_network_security_group" "test_nsg" {
11+
compartment_id = var.compartment_ocid
12+
display_name = "tfNsgForClusters"
13+
vcn_id = oci_core_vcn.test_vcn.id
14+
}
15+
1016
resource "oci_core_internet_gateway" "test_ig" {
1117
compartment_id = var.compartment_ocid
1218
display_name = "tfClusterInternetGateway"
@@ -51,6 +57,18 @@ resource "oci_core_subnet" "clusterSubnet_2" {
5157
route_table_id = oci_core_route_table.test_route_table.id
5258
}
5359

60+
resource "oci_core_subnet" "cluster_regional_subnet" {
61+
#Required
62+
cidr_block = "10.0.26.0/24"
63+
compartment_id = var.compartment_ocid
64+
vcn_id = oci_core_vcn.test_vcn.id
65+
66+
# Provider code tries to maintain compatibility with old versions.
67+
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
68+
display_name = "clusterRegionalSubnet"
69+
route_table_id = oci_core_route_table.test_route_table.id
70+
}
71+
5472
resource "oci_core_subnet" "node_pool_regional_subnet_1" {
5573
#Required
5674
cidr_block = "10.0.24.0/24"

examples/datascience/artifact.zip

6.79 KB
Binary file not shown.
Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
2+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
3+
// Licensed under the Mozilla Public License v2.0
4+
5+
// These variables would commonly be defined as environment variables or sourced in a .env file
6+
7+
variable "tenancy_ocid" {
8+
}
9+
10+
variable "user_ocid" {
11+
}
12+
13+
variable "fingerprint" {
14+
}
15+
16+
variable "private_key_path" {
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+
variable "compartment_ocid" {
31+
}
32+
33+
variable "project_ocid" {
34+
}
35+
36+
variable "model_display_name" {
37+
default = "terraform-testing-model"
38+
}
39+
40+
variable "model_description" {
41+
default = "Model for terraform testing"
42+
}
43+
44+
variable "artifact_content_length" {
45+
}
46+
47+
variable "model_artifact" {
48+
}
49+
50+
variable "content_disposition" {
51+
}
52+
53+
variable "shape" {
54+
}
55+
56+
variable "model_defined_tags" {
57+
}
58+
59+
variable "model_freeform_tag" {
60+
}
61+
62+
variable "model_state" {
63+
}
64+
65+
66+
# A model resource configurations for creating a new model
67+
resource "oci_datascience_model" "tf_model" {
68+
# Required
69+
artifact_content_length = var.artifact_content_length
70+
model_artifact = var.model_artifact
71+
compartment_id = var.compartment_ocid
72+
project_id = var.project_ocid
73+
# Optional
74+
artifact_content_disposition = var.content_disposition
75+
defined_tags = var.model_defined_tags
76+
description = var.model_description
77+
display_name = var.model_display_name
78+
freeform_tags = var.model_freeform_tag
79+
}
80+
81+
# A data resource for the list of models in a specified compartment
82+
data "oci_datascience_models" "tf_models" {
83+
# Required
84+
compartment_id = var.compartment_ocid
85+
# Optional
86+
created_by = var.user_ocid
87+
display_name = oci_datascience_model.tf_model.display_name
88+
id = oci_datascience_model.tf_model.id
89+
project_id = var.project_ocid
90+
state = var.model_state
91+
}
92+
93+
# The data source for a list of model deployment shapes
94+
data "oci_datascience_model_deployment_shapes" "tf_model_deployment_shapes" {
95+
# Required
96+
compartment_id = var.compartment_ocid
97+
}
98+
99+
variable "model_deployment_display_name" {
100+
default = "terraform-testing-model-deployment"
101+
}
102+
103+
variable "model_deployment_description" {
104+
default = "Model Deployment for terraform testing"
105+
}
106+
107+
variable "shape" {
108+
}
109+
110+
variable "log_group_id" {
111+
}
112+
113+
variable "model_deployment_defined_tags" {
114+
}
115+
116+
variable "model_deployment_freeform_tag" {
117+
}
118+
119+
variable "access_log_id" {
120+
}
121+
122+
variable "predict_log_id" {
123+
}
124+
125+
variable "model_deployment_model_deployment_configuration_details_deployment_type" {
126+
default = "SINGLE_MODEL"
127+
}
128+
129+
variable "model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps" {
130+
default = 10
131+
}
132+
133+
variable "model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_instance_count" {
134+
default = 1
135+
}
136+
137+
variable "model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_policy_type" {
138+
default = "FIXED_SIZE"
139+
}
140+
141+
variable "model_deployment_state" {
142+
}
143+
144+
# A model deployment resource configurations for creating a new model deployment
145+
resource "oci_datascience_model_deployment" "tf_model_deployment" {
146+
# Required
147+
compartment_id = var.compartment_ocid
148+
model_deployment_configuration_details {
149+
# Required
150+
deployment_type = var.model_deployment_model_deployment_configuration_details_deployment_type
151+
model_configuration_details {
152+
# Required
153+
instance_configuration {
154+
# Required
155+
instance_shape_name = var.shape
156+
}
157+
model_id = oci_datascience_model.tf_model.id
158+
159+
# Optional
160+
bandwidth_mbps = var.model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps
161+
scaling_policy {
162+
# Required
163+
instance_count = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_instance_count
164+
policy_type = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_policy_type
165+
}
166+
}
167+
}
168+
project_id = var.project_ocid
169+
170+
# Optional
171+
category_log_details {
172+
173+
# Optional
174+
access {
175+
# Required
176+
log_group_id = var.log_group_id
177+
log_id = var.access_log_id
178+
}
179+
predict {
180+
# Required
181+
log_group_id = var.log_group_id
182+
log_id = var.predict_log_id
183+
}
184+
}
185+
# Optional
186+
defined_tags = var.model_deployment_defined_tags
187+
description = var.model_deployment_description
188+
display_name = var.model_deployment_display_name
189+
freeform_tags = var.model_deployment_freeform_tag
190+
}
191+
192+
# The data resource for a list of model deployments in a specified compartment
193+
data "oci_datascience_model_deployments" "tf_model_deployments" {
194+
# Required
195+
compartment_id = var.compartment_ocid
196+
197+
# Optional
198+
created_by = var.user_ocid
199+
display_name = oci_datascience_model_deployment.tf_model_deployment.display_name
200+
id = oci_datascience_model_deployment.tf_model_deployment.id
201+
project_id = var.project_ocid
202+
state = var.model_deployment_state
203+
}
204+

examples/oracle_content_experience/main.tf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
4141
compartment_id = var.compartment_ocid
4242
idcs_access_token = var.idcs_access_token
4343
name = "testoceinstance"
44-
object_storage_namespace = var.tenancy_name
44+
object_storage_namespace = data.oci_objectstorage_namespace.test_namespace.namespace
4545
tenancy_id = var.tenancy_ocid
4646
tenancy_name = var.tenancy_name
4747

@@ -79,3 +79,8 @@ output "active_oce_instances" {
7979
output "output_nested_service_data" {
8080
value = jsondecode(data.oci_oce_oce_instance.test_oce_instance.service.dns).A.domain
8181
}
82+
83+
data "oci_objectstorage_namespace" "test_namespace" {
84+
#Optional
85+
compartment_id = var.compartment_ocid
86+
}

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/v36 v36.1.0
9+
github.com/oracle/oci-go-sdk/v36 v36.2.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/v36 v36.1.0 h1:xihE2lklj+hUoNLe4Tw2g20YkWDUogGE1FXVDJUa6K0=
204-
github.com/oracle/oci-go-sdk/v36 v36.1.0/go.mod h1:t8Y/M3Lh8X4BOJhtThJKe1skRTg7qom7oWyHiNjo4RM=
203+
github.com/oracle/oci-go-sdk/v36 v36.2.0 h1:oBaN/FnBDy3ohMyVZ/rKfekYxnyksG2KK0YAhT5HSnk=
204+
github.com/oracle/oci-go-sdk/v36 v36.2.0/go.mod h1:t8Y/M3Lh8X4BOJhtThJKe1skRTg7qom7oWyHiNjo4RM=
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/analytics_analytics_instance_private_access_channel_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ func TestAnalyticsAnalyticsInstancePrivateAccessChannelResource_basic(t *testing
5454
resourceName := "oci_analytics_analytics_instance_private_access_channel.test_analytics_instance_private_access_channel"
5555

5656
var resId, resId2 string
57+
// Save TF content to create resource with only required properties. This has to be exactly the same as the config part in the create step in the test.
58+
saveConfigContent(config+compartmentIdVariableStr+AnalyticsInstancePrivateAccessChannelResourceDependencies+
59+
generateResourceFromRepresentationMap("oci_analytics_analytics_instance_private_access_channel", "test_analytics_instance_private_access_channel", Required, Create, analyticsInstancePrivateAccessChannelRepresentation), "analytics", "analyticsInstancePrivateAccessChannel", t)
5760

5861
resource.Test(t, resource.TestCase{
5962
PreCheck: func() { testAccPreCheck(t) },

0 commit comments

Comments
 (0)