Skip to content

Commit 81bddc2

Browse files
dshelbyodshelbyo
authored
Candidate for release_v3.45.0
Candidate for release_v3.45.0
2 parents 6b03aab + e163031 commit 81bddc2

File tree

165 files changed

+1023
-500
lines changed

Some content is hidden

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

165 files changed

+1023
-500
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
## 3.44.1 (Unreleased)
1+
## 3.45.0 (Unreleased)
2+
3+
### Added
4+
5+
- Support for Event Notifications on `oci_objectstorage_bucket`
6+
27
## 3.44.0 (September 18, 2019)
38

49
### Added

‎GNUmakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ testacc: fmtcheck gomodenv
3535

3636
vet:
3737
@echo "go vet ."
38-
@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
38+
@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -ne 0 ]; then \
3939
echo ""; \
4040
echo "Vet found suspicious constructs. Please check the reported constructs"; \
4141
echo "and fix them if necessary before submitting the code for review."; \

‎examples/container_engine/kube_config.tf‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
variable "cluster_kube_config_expiration" {
4-
default = 2592000
5-
}
6-
73
variable "cluster_kube_config_token_version" {
8-
default = "1.0.0"
4+
default = "2.0.0"
95
}
106

117
data "oci_containerengine_cluster_kube_config" "test_cluster_kube_config" {
128
#Required
139
cluster_id = "${oci_containerengine_cluster.test_cluster.id}"
1410

1511
#Optional
16-
expiration = "${var.cluster_kube_config_expiration}"
1712
token_version = "${var.cluster_kube_config_token_version}"
1813
}
1914

‎examples/networking/vcn/vcn.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ resource "oci_core_vcn" "vcn1" {
2121
compartment_id = "${var.compartment_ocid}"
2222
display_name = "vcn1"
2323
}
24+
25+
output "vcn_id" {
26+
value = "${oci_core_vcn.vcn1.id}"
27+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-oci
33
require (
44
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
55
github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
6-
github.com/oracle/oci-go-sdk v10.0.0+incompatible
6+
github.com/oracle/oci-go-sdk v10.1.0+incompatible
77
github.com/stretchr/objx v0.1.1 // indirect
88
github.com/stretchr/testify v1.3.0
99
gopkg.in/yaml.v2 v2.2.2

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ github.com/oracle/oci-go-sdk v9.0.0+incompatible h1:jwsYSb5ba62q5vrCVmieBDPbvgRO
295295
github.com/oracle/oci-go-sdk v9.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
296296
github.com/oracle/oci-go-sdk v10.0.0+incompatible h1:uyjSzndqMFExbMf1Y+NaMJ6q6XMrQkjW5YjThSJQaeM=
297297
github.com/oracle/oci-go-sdk v10.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
298+
github.com/oracle/oci-go-sdk v10.1.0+incompatible h1:3tk5k8NpvVqwFfgPWtu5UvMZvUouciF4BhFK1zhdb7c=
299+
github.com/oracle/oci-go-sdk v10.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
298300
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
299301
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
300302
github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

‎oci/autoscaling_auto_scaling_configuration_scenario_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type ResourceAutoScalingConfigurationTestSuite struct {
2828
func (s *ResourceAutoScalingConfigurationTestSuite) SetupTest() {
2929
s.Providers = testAccProviders
3030
testAccPreCheck(s.T())
31-
s.Config = legacyTestProviderConfig() + InstanceCommonVariables + `
31+
s.Config = legacyTestProviderConfig() + OciImageIdsVariable + `
3232
data "oci_identity_availability_domains" "ADs" {
3333
compartment_id = "${var.tenancy_ocid}"
3434
}

‎oci/budget_alert_rule_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ var (
5151
"message": Representation{repType: Optional, create: `message`, update: `message2`},
5252
}
5353

54-
AlertRuleResourceDependencies = BudgetResourceConfig
54+
AlertRuleResourceDependencies = generateResourceFromRepresentationMap("oci_budget_budget", "test_budget", Required, Create, budgetRepresentationWithTargetCompartmentId) +
55+
DefinedTagsDependencies
5556
)
5657

5758
func TestBudgetAlertRuleResource_basic(t *testing.T) {

‎oci/containerengine_cluster_kube_config_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@ import (
1515
var (
1616
clusterKubeConfigSingularDataSourceRepresentation = map[string]interface{}{
1717
"cluster_id": Representation{repType: Required, create: `${oci_containerengine_cluster.test_cluster.id}`},
18-
"expiration": Representation{repType: Optional, create: `2592000`},
19-
"token_version": Representation{repType: Optional, create: `1.0.0`},
18+
"token_version": Representation{repType: Optional, create: `2.0.0`},
2019
}
2120

22-
ClusterKubeConfigResourceConfig = ClusterResourceConfig
21+
ClusterKubeConfigResourceConfig = generateResourceFromRepresentationMap("oci_containerengine_cluster", "test_cluster", Required, Create, clusterRepresentation) +
22+
generateResourceFromRepresentationMap("oci_core_subnet", "clusterSubnet_1", Required, Create, representationCopyWithNewProperties(subnetRepresentation, map[string]interface{}{"availability_domain": Representation{repType: Required, create: `${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}`}, "cidr_block": Representation{repType: Required, create: `10.0.20.0/24`}, "dns_label": Representation{repType: Required, create: `cluster1`}})) +
23+
generateResourceFromRepresentationMap("oci_core_subnet", "clusterSubnet_2", Required, Create, representationCopyWithNewProperties(subnetRepresentation, map[string]interface{}{"availability_domain": Representation{repType: Required, create: `${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}`}, "cidr_block": Representation{repType: Required, create: `10.0.21.0/24`}, "dns_label": Representation{repType: Required, create: `cluster2`}})) +
24+
AvailabilityDomainConfig +
25+
generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Required, Create, clusterOptionSingularDataSourceRepresentation) +
26+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
27+
"dns_label": Representation{repType: Required, create: `dnslabel`},
28+
}))
2329
)
2430

2531
func TestContainerengineClusterKubeConfigResource_basic(t *testing.T) {
@@ -47,8 +53,7 @@ func TestContainerengineClusterKubeConfigResource_basic(t *testing.T) {
4753
compartmentIdVariableStr + ClusterKubeConfigResourceConfig,
4854
Check: resource.ComposeAggregateTestCheckFunc(
4955
resource.TestCheckResourceAttrSet(singularDatasourceName, "cluster_id"),
50-
resource.TestCheckResourceAttr(singularDatasourceName, "expiration", "2592000"),
51-
resource.TestCheckResourceAttr(singularDatasourceName, "token_version", "1.0.0"),
56+
resource.TestCheckResourceAttr(singularDatasourceName, "token_version", "2.0.0"),
5257
resource.TestCheckResourceAttrSet(singularDatasourceName, "content"),
5358
),
5459
},

‎oci/containerengine_cluster_test.go‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,14 @@ var (
5656
"services_cidr": Representation{repType: Optional, create: `10.2.0.0/16`},
5757
}
5858

59-
// @CODEGEN: OKE does not support regional subnets
60-
ClusterResourceDependencies = AvailabilityDomainConfig + KeyResourceDependencyConfig + VcnResourceConfig + VcnResourceDependencies +
61-
generateResourceFromRepresentationMap("oci_core_subnet", "clusterSubnet_1", Optional, Create,
62-
getMultipleUpdatedRepresenationCopy(
63-
[]string{"cidr_block", "dns_label"},
64-
[]interface{}{Representation{repType: Optional, create: `10.0.20.0/24`}, Representation{repType: Optional, create: `cluster1`}},
65-
subnetRepresentation)) +
66-
generateResourceFromRepresentationMap("oci_core_subnet", "clusterSubnet_2", Optional, Create,
67-
getMultipleUpdatedRepresenationCopy(
68-
[]string{"cidr_block", "dns_label"},
69-
[]interface{}{Representation{repType: Optional, create: `10.0.21.0/24`}, Representation{repType: Optional, create: `cluster2`}},
70-
subnetRepresentation)) +
71-
generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Required, Create, clusterOptionSingularDataSourceRepresentation)
59+
ClusterResourceDependencies = generateResourceFromRepresentationMap("oci_core_subnet", "clusterSubnet_1", Required, Create, representationCopyWithNewProperties(subnetRepresentation, map[string]interface{}{"availability_domain": Representation{repType: Required, create: `${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}`}, "cidr_block": Representation{repType: Required, create: `10.0.20.0/24`}, "dns_label": Representation{repType: Required, create: `cluster1`}})) +
60+
generateResourceFromRepresentationMap("oci_core_subnet", "clusterSubnet_2", Required, Create, representationCopyWithNewProperties(subnetRepresentation, map[string]interface{}{"availability_domain": Representation{repType: Required, create: `${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}`}, "cidr_block": Representation{repType: Required, create: `10.0.21.0/24`}, "dns_label": Representation{repType: Required, create: `cluster2`}})) +
61+
AvailabilityDomainConfig +
62+
generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Required, Create, clusterOptionSingularDataSourceRepresentation) +
63+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
64+
"dns_label": Representation{repType: Required, create: `dnslabel`},
65+
})) +
66+
KeyResourceDependencyConfig
7267
)
7368

7469
func TestContainerengineClusterResource_basic(t *testing.T) {

0 commit comments

Comments
 (0)