Skip to content

Commit 1a35e72

Browse files
authored
Merge pull request #1238 from terraform-providers/release_gh
Releasing version 4.4.0
2 parents 8f8ec19 + fc1a420 commit 1a35e72

File tree

6,515 files changed

+87214
-48146
lines changed

Some content is hidden

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

6,515 files changed

+87214
-48146
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 4.4.0 (Unreleased)
2+
3+
### Added
4+
- Support for Autonomous DG on ExaCC
5+
- Support for UX Enhancements to Backup,restore,clone
6+
- Support for returning email verification and login time information for identity users
7+
- Support for Flexible memory in `oci_containerengine_node_pool`
8+
9+
### Deprecated
10+
- The `mysql_version` attribute in `oci_mysql_mysql_db_system` is now deprecated
11+
112
## 4.3.0 (November 12, 2020)
213

314
### Added

examples/container_engine/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
195195

196196
node_shape_config {
197197
ocpus = 2
198+
memory_in_gbs = 40
198199
}
199200

200201
quantity_per_subnet = 2

examples/database/db_systems/variables.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,6 @@ variable "data_storage_percentage" {
9999
default = "40"
100100
}
101101

102+
variable "db_tde_wallet_password" {
103+
default = "BEstrO0ng_#12"
104+
}

examples/log_analytics/main.tf

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example onboards a namespace with Log Analytics
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
data "oci_log_analytics_namespaces" "test_namespaces" {
24+
compartment_id = var.tenancy_ocid
25+
}
26+
27+
// will return NotAuthorizedOrNotFound 404 Error if tenancy not onboarded with log analytics
28+
//data "oci_log_analytics_namespace" "test_namespace" {
29+
// namespace = data.oci_log_analytics_namespaces.test_namespaces.namespace_collection.0.items.0.namespace
30+
//}
31+
32+
resource "oci_log_analytics_namespace" "test_namespace" {
33+
namespace = data.oci_log_analytics_namespaces.test_namespaces.namespace_collection.0.items.0.namespace
34+
is_onboarded = false
35+
compartment_id = var.tenancy_ocid
36+
}
37+

examples/storage/fss/env-vars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ export TF_VAR_region="<region in which to operate, example: us-ashburn-1, us-pho
1010
### Compartment
1111
export TF_VAR_compartment_ocid="<compartment OCID>"
1212

13-
### Public/private keys used on the instance
13+
### Public/private keys used on the compute instance
1414
export TF_VAR_ssh_public_key=$(cat <path to public key>)
1515
export TF_VAR_ssh_private_key=$(cat <path to private key>)

examples/storage/fss/file_system.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ resource "oci_file_storage_file_system" "my_fs_1" {
88

99
#Optional
1010
display_name = var.file_system_1_display_name
11-
defined_tags = {
12-
"example-tag-namespace-all.example-tag" = "value"
13-
}
11+
# defined_tags = {
12+
# "example-tag-namespace-all.example-tag" = "value"
13+
# }
1414

1515
freeform_tags = {
1616
"Department" = "Finance"
@@ -24,9 +24,9 @@ resource "oci_file_storage_file_system" "my_fs_2" {
2424

2525
#Optional
2626
display_name = var.file_system_2_display_name
27-
defined_tags = {
28-
"example-tag-namespace-all.example-tag" = "value"
29-
}
27+
# defined_tags = {
28+
# "example-tag-namespace-all.example-tag" = "value"
29+
# }
3030

3131
freeform_tags = {
3232
"Department" = "Accounting"

examples/storage/fss/mount_target.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ resource "oci_file_storage_mount_target" "my_mount_target_1" {
99

1010
#Optional
1111
display_name = var.mount_target_1_display_name
12-
defined_tags = {
13-
"example-tag-namespace-all.example-tag" = "value"
14-
}
12+
# defined_tags = {
13+
# "example-tag-namespace-all.example-tag" = "value"
14+
# }
1515

1616
freeform_tags = {
1717
"Department" = "Finance"
@@ -28,9 +28,9 @@ resource "oci_file_storage_mount_target" "my_mount_target_2" {
2828

2929
#Optional
3030
display_name = var.mount_target_2_display_name
31-
defined_tags = {
32-
"example-tag-namespace-all.example-tag" = "value"
33-
}
31+
# defined_tags = {
32+
# "example-tag-namespace-all.example-tag" = "value"
33+
# }
3434

3535
freeform_tags = {
3636
"Department" = "Accounting"

examples/storage/fss/snapshot.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ resource "oci_file_storage_snapshot" "my_snapshot" {
55
#Required
66
file_system_id = oci_file_storage_file_system.my_fs_1.id
77
name = var.snapshot_name
8-
defined_tags = {
9-
"example-tag-namespace-all.example-tag" = "value"
10-
}
8+
# defined_tags = {
9+
# "example-tag-namespace-all.example-tag" = "value"
10+
# }
1111

1212
freeform_tags = {
1313
"Department" = "Finance"

examples/storage/fss/variables.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ variable "ssh_public_key" {
2626
variable "ssh_private_key" {
2727
}
2828

29-
variable "api_public_key" {
30-
}
31-
3229
variable "my_vcn-cidr" {
3330
default = "10.0.0.0/16"
3431
}

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/v28 v28.0.0
9+
github.com/oracle/oci-go-sdk/v29 v29.0.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

0 commit comments

Comments
 (0)