Skip to content

Commit f669016

Browse files
varmax2511varmax2511
authored
Merge pull request #842 from terraform-providers/release_merge_v3.37.0
Candidate for release_v3.37.0
2 parents 77e2f60 + 8ac2d74 commit f669016

File tree

120 files changed

+3324
-757
lines changed

Some content is hidden

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

120 files changed

+3324
-757
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
## 3.36.1 (Unreleased)
1+
## 3.37.0 (Unreleased)
2+
3+
### Added
4+
- Support for ipv6 in `oci_core_vcn`, `oci_core_subnet` and `oci_load_balancer` resources.
5+
- Support for ipv6 in `oci_core_virtual_circuit` resources.
6+
7+
### Fixed
8+
- Fixed the diff for `options` arguments order in `oci_core_dhcp_options` resource [Issue #829](https://github.com/terraform-providers/terraform-provider-oci/issues/829)
9+
- Fixed typo in docs for `source_type` in `oci_core_network_security_group_security_rule` and docs updated
10+
- Fixed `listing_id` reference in docs for App Catalog
11+
- Removing `compartment_id` from `oci_core_volume_attachment` as the service does not accept that parameter. The compartment_id of the volume is the one used by the service.
12+
- Fixed the nil pointer error for `oci_core_ipsec` on compartment update
13+
214
## 3.36.0 (July 31, 2019)
315

416
### Added

‎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 v6.1.0+incompatible
6+
github.com/oracle/oci-go-sdk v6.2.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
@@ -278,6 +278,8 @@ github.com/oracle/oci-go-sdk v6.0.0+incompatible h1:oxUPiF7KPhC0hRoAhAK3hTIZ1K0c
278278
github.com/oracle/oci-go-sdk v6.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
279279
github.com/oracle/oci-go-sdk v6.1.0+incompatible h1:sksvnP7m17+YuV9X11D39LNr7ZIraoRLba9NciVO0tw=
280280
github.com/oracle/oci-go-sdk v6.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
281+
github.com/oracle/oci-go-sdk v6.2.0+incompatible h1:XFJmDeeei0QHR93RXzatrG/XTEuteoYSmfLUuUMI0gk=
282+
github.com/oracle/oci-go-sdk v6.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
281283
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
282284
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
283285
github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

‎oci/audit_configuration_resource.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ func AuditConfigurationResource() *schema.Resource {
3131
Optional: true,
3232
Computed: true,
3333
},
34+
35+
// Computed
3436
},
3537
}
3638
}

‎oci/audit_configuration_test.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ import (
1313
)
1414

1515
var (
16+
ConfigurationRequiredOnlyResource = ConfigurationResourceDependencies +
17+
generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Required, Create, configurationRepresentation)
18+
1619
ConfigurationResourceConfig = ConfigurationResourceDependencies +
1720
generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Optional, Update, configurationRepresentation)
1821

1922
configurationSingularDataSourceRepresentation = map[string]interface{}{
2023
"compartment_id": Representation{repType: Required, create: `${var.tenancy_ocid}`},
2124
}
2225

26+
//@CODEGEN the service does not allow retention_period_days to be optional but it is optional in the spec HYD-9426. Service only supports PUT but not POST
2327
configurationRepresentation = map[string]interface{}{
2428
"compartment_id": Representation{repType: Required, create: `${var.tenancy_ocid}`},
2529
"retention_period_days": Representation{repType: Required, create: `100`, update: `91`},
@@ -55,6 +59,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
5559
generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Required, Create, configurationRepresentation),
5660
Check: resource.ComposeAggregateTestCheckFunc(
5761
resource.TestCheckResourceAttr(resourceName, "retention_period_days", "100"),
62+
5863
func(s *terraform.State) (err error) {
5964
resId, err = fromInstanceState(s, resourceName, "id")
6065
return err
@@ -68,6 +73,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
6873
generateResourceFromRepresentationMap("oci_audit_configuration", "test_configuration", Optional, Update, configurationRepresentation),
6974
Check: resource.ComposeAggregateTestCheckFunc(
7075
resource.TestCheckResourceAttr(resourceName, "retention_period_days", "91"),
76+
7177
func(s *terraform.State) (err error) {
7278
resId2, err = fromInstanceState(s, resourceName, "id")
7379
if resId != resId2 {
@@ -85,7 +91,7 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
8591
Check: resource.ComposeAggregateTestCheckFunc(
8692
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", tenancyId),
8793

88-
resource.TestCheckResourceAttrSet(singularDatasourceName, "retention_period_days"),
94+
resource.TestCheckResourceAttr(singularDatasourceName, "retention_period_days", "91"),
8995
),
9096
},
9197
},

‎oci/autoscaling_auto_scaling_configuration_resource.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ func AutoScalingAutoScalingConfigurationResource() *schema.Resource {
139139
},
140140
},
141141
},
142+
"display_name": {
143+
Type: schema.TypeString,
144+
Required: true,
145+
ForceNew: true,
146+
},
142147
"metric": {
143148
Type: schema.TypeList,
144149
Required: true,
@@ -186,12 +191,8 @@ func AutoScalingAutoScalingConfigurationResource() *schema.Resource {
186191
},
187192
},
188193
},
189-
// Modifying to Required, since we do not have a good work around for calculating hashcode for optional computed fields
190-
"display_name": {
191-
Type: schema.TypeString,
192-
Required: true,
193-
ForceNew: true,
194-
},
194+
195+
// Optional
195196

196197
// Computed
197198
"id": {

‎oci/autoscaling_auto_scaling_configuration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ var (
6363
}
6464
autoScalingConfigurationPoliciesScaleOutRuleRepresentation = map[string]interface{}{
6565
"action": RepresentationGroup{Required, autoScalingConfigurationPoliciesScaleOutRuleActionRepresentation},
66-
"metric": RepresentationGroup{Required, autoScalingConfigurationPoliciesScaleOutRuleMetricRepresentation},
6766
"display_name": Representation{repType: Required, create: `scale out rule`, update: `scale out rule - updated`},
67+
"metric": RepresentationGroup{Required, autoScalingConfigurationPoliciesScaleOutRuleMetricRepresentation},
6868
}
6969
autoScalingConfigurationPoliciesScaleOutRuleActionRepresentation = map[string]interface{}{
7070
"type": Representation{repType: Required, create: `CHANGE_COUNT_BY`, update: `CHANGE_COUNT_BY`},

‎oci/containerengine_node_pool_resource.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,6 @@ func ContainerengineNodePoolResource() *schema.Resource {
6161
},
6262

6363
// Optional
64-
"node_image_name": {
65-
Type: schema.TypeString,
66-
Optional: true,
67-
ForceNew: true,
68-
Computed: true,
69-
ConflictsWith: []string{"node_image_id"},
70-
},
71-
"node_image_id": {
72-
Type: schema.TypeString,
73-
Optional: true,
74-
ForceNew: true,
75-
Computed: true,
76-
ConflictsWith: []string{"node_image_name"},
77-
},
7864
"initial_node_labels": {
7965
Type: schema.TypeList,
8066
Optional: true,
@@ -99,6 +85,20 @@ func ContainerengineNodePoolResource() *schema.Resource {
9985
},
10086
},
10187
},
88+
"node_image_id": {
89+
Type: schema.TypeString,
90+
Optional: true,
91+
ForceNew: true,
92+
Computed: true,
93+
ConflictsWith: []string{"node_image_name"},
94+
},
95+
"node_image_name": {
96+
Type: schema.TypeString,
97+
Optional: true,
98+
ForceNew: true,
99+
Computed: true,
100+
ConflictsWith: []string{"node_image_id"},
101+
},
102102
"node_metadata": {
103103
Type: schema.TypeMap,
104104
Optional: true,

‎oci/containerengine_node_pool_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ var (
5656
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
5757
"kubernetes_version": Representation{repType: Required, create: `${data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions.0}`},
5858
"name": Representation{repType: Required, create: `name`, update: `name2`},
59-
"node_image_name": Representation{repType: Required, create: `Oracle-Linux-7.4`},
6059
"node_shape": Representation{repType: Required, create: `VM.Standard2.1`},
6160
"subnet_ids": Representation{repType: Required, create: []string{`${oci_core_subnet.nodePool_Subnet_1.id}`, `${oci_core_subnet.nodePool_Subnet_2.id}`}},
6261
"initial_node_labels": RepresentationGroup{Optional, nodePoolInitialNodeLabelsRepresentation},
62+
"node_image_name": Representation{repType: Required, create: `Oracle-Linux-7.4`},
6363
"node_metadata": Representation{repType: Optional, create: map[string]string{"nodeMetadata": "nodeMetadata"}, update: map[string]string{"nodeMetadata2": "nodeMetadata2"}},
6464
"quantity_per_subnet": Representation{repType: Optional, create: `1`, update: `2`},
6565
"ssh_public_key": Representation{repType: Optional, create: `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOuBJgh6lTmQvQJ4BA3RCJdSmxRtmiXAQEEIP68/G4gF3XuZdKEYTFeputacmRq9yO5ZnNXgO9akdUgePpf8+CfFtveQxmN5xo3HVCDKxu/70lbMgeu7+wJzrMOlzj+a4zNq2j0Ww2VWMsisJ6eV3bJTnO/9VLGCOC8M9noaOlcKcLgIYy4aDM724MxFX2lgn7o6rVADHRxkvLEXPVqYT4syvYw+8OVSnNgE4MJLxaw8/2K0qp19YlQyiriIXfQpci3ThxwLjymYRPj+kjU1xIxv6qbFQzHR7ds0pSWp1U06cIoKPfCazU9hGWW8yIe/vzfTbWrt2DK6pLwBn/G0x3 sample`},
@@ -133,7 +133,6 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
133133
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
134134
resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
135135
resource.TestCheckResourceAttr(resourceName, "name", "name"),
136-
resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
137136
resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
138137
resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"),
139138
//Asserting Resource created with Image Id
@@ -172,6 +171,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
172171
resource.TestCheckResourceAttr(resourceName, "initial_node_labels.0.value", "value"),
173172
resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
174173
resource.TestCheckResourceAttr(resourceName, "name", "name"),
174+
resource.TestCheckResourceAttrSet(resourceName, "node_image_id"),
175175
resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
176176
resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
177177
resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
@@ -215,6 +215,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
215215
resource.TestCheckResourceAttr(resourceName, "initial_node_labels.0.value", "value2"),
216216
resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
217217
resource.TestCheckResourceAttr(resourceName, "name", "name2"),
218+
resource.TestCheckResourceAttrSet(resourceName, "node_image_id"),
218219
resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
219220
resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
220221
resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),

‎oci/core_app_catalog_subscription_resource.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ func CoreAppCatalogSubscriptionResource() *schema.Resource {
6464
ForceNew: true,
6565
},
6666

67+
// Optional
68+
6769
// Computed
6870
"display_name": {
6971
Type: schema.TypeString,

0 commit comments

Comments
 (0)