Skip to content

Commit efb2260

Browse files
govindrao55govindrao55
authored
Releasing version 4.41.0
Releasing version 4.41.0
2 parents 9e1231b + 76cc8a5 commit efb2260

23 files changed

+307
-75
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 4.41.0 (Unreleased)
2+
3+
### Added
4+
- Support for Custom Listener Port added to `database`
5+
- Support ignore API key when using InstancePrincipal authentication
6+
17
## 4.40.0 (August 18, 2021)
28

39
### Added

‎GNUmakefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,7 @@ ifdef version
150150
sed -i -e 's/\("github.com\/oracle\/oci-go-sdk\/v\)[0-9]*/\1$(version)/g' oci/*.go && rm -f oci/*.go-e
151151
else
152152
@echo Error! replace_sdk_version requires a version argument
153-
endif
153+
endif
154+
155+
check-untagged-tests:
156+
@sh -c "'$(CURDIR)/scripts/check-untagged-tests.sh' -s ''$(SERVICE)"

‎examples/database/exadata_cc/vm_cluster.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
1818
]
1919

2020
port = 1521
21+
scan_listener_port_tcp = 1521
22+
scan_listener_port_tcp_ssl = 2484
2123
}
2224

2325
vm_networks {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
88
github.com/hashicorp/terraform-exec v0.13.3
99
github.com/hashicorp/terraform-plugin-sdk v1.17.2
10-
github.com/oracle/oci-go-sdk/v46 v46.0.0
10+
github.com/oracle/oci-go-sdk/v46 v46.1.0
1111
github.com/stretchr/testify v1.7.0
1212
golang.org/x/mod v0.4.2
1313
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/v46 v46.0.0 h1:6XrQIV10+8WjqfyWUa3gwyPApGanNY/shmp8vcWAWYU=
306-
github.com/oracle/oci-go-sdk/v46 v46.0.0/go.mod h1:DwFVvDNhpY+iZ2bD2ITEqENhO6/iBRttbJky49HRH6A=
305+
github.com/oracle/oci-go-sdk/v46 v46.1.0 h1:8hU0uwBRdMErjB6b1aJO+taT5sURpEpnvawkzMXuT68=
306+
github.com/oracle/oci-go-sdk/v46 v46.1.0/go.mod h1:DwFVvDNhpY+iZ2bD2ITEqENhO6/iBRttbJky49HRH6A=
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/database_vm_cluster_network_resource.go‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,16 @@ func DatabaseVmClusterNetworkResource() *schema.Resource {
7373
},
7474

7575
// Optional
76+
"scan_listener_port_tcp": {
77+
Type: schema.TypeInt,
78+
Optional: true,
79+
Computed: true,
80+
},
81+
"scan_listener_port_tcp_ssl": {
82+
Type: schema.TypeInt,
83+
Optional: true,
84+
Computed: true,
85+
},
7686

7787
// Computed
7888
},
@@ -739,6 +749,16 @@ func (s *DatabaseVmClusterNetworkResourceCrud) mapToScanDetails(fieldKeyFormat s
739749
result.Port = &tmp
740750
}
741751

752+
if scanListenerPortTcp, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "scan_listener_port_tcp")); ok {
753+
tmp := scanListenerPortTcp.(int)
754+
result.ScanListenerPortTcp = &tmp
755+
}
756+
757+
if scanListenerPortTcpSsl, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "scan_listener_port_tcp_ssl")); ok {
758+
tmp := scanListenerPortTcpSsl.(int)
759+
result.ScanListenerPortTcpSsl = &tmp
760+
}
761+
742762
return result, nil
743763
}
744764

@@ -755,6 +775,14 @@ func ScanDetailsToMap(obj oci_database.ScanDetails) map[string]interface{} {
755775
result["port"] = int(*obj.Port)
756776
}
757777

778+
if obj.ScanListenerPortTcp != nil {
779+
result["scan_listener_port_tcp"] = int(*obj.ScanListenerPortTcp)
780+
}
781+
782+
if obj.ScanListenerPortTcpSsl != nil {
783+
result["scan_listener_port_tcp_ssl"] = int(*obj.ScanListenerPortTcpSsl)
784+
}
785+
758786
return result
759787
}
760788

@@ -869,6 +897,12 @@ func scansHashCodeForSets(v interface{}) int {
869897
if port, ok := m["port"]; ok {
870898
buf.WriteString(fmt.Sprintf("%v-", port))
871899
}
900+
if scanListenerPortTcp, ok := m["scan_listener_port_tcp"]; ok {
901+
buf.WriteString(fmt.Sprintf("%v-", scanListenerPortTcp))
902+
}
903+
if scanListenerPortTcpSsl, ok := m["scan_listener_port_tcp_ssl"]; ok {
904+
buf.WriteString(fmt.Sprintf("%v-", scanListenerPortTcpSsl))
905+
}
872906
return hashcode.String(buf.String())
873907
}
874908

‎oci/database_vm_cluster_network_test.go‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ var (
5454
"ntp": Representation{repType: Optional, create: []string{`192.168.10.20`}, update: []string{`192.168.10.22`}},
5555
}
5656
vmClusterNetworkScansRepresentation = map[string]interface{}{
57-
"hostname": Representation{repType: Required, create: `myprefix1-ivmmj-scan`, update: `myprefix2-ivmmj-scan`},
58-
"ips": Representation{repType: Required, create: []string{`192.168.19.7`, `192.168.19.6`, `192.168.19.8`}, update: []string{`192.168.19.7`, `192.168.19.8`, `192.168.19.9`}},
59-
"port": Representation{repType: Required, create: `1521`, update: `1522`},
57+
"hostname": Representation{repType: Required, create: `myprefix1-ivmmj-scan`, update: `myprefix2-ivmmj-scan`},
58+
"ips": Representation{repType: Required, create: []string{`192.168.19.7`, `192.168.19.6`, `192.168.19.8`}, update: []string{`192.168.19.7`, `192.168.19.8`, `192.168.19.9`}},
59+
"port": Representation{repType: Required, create: `1521`, update: `1522`},
60+
"scan_listener_port_tcp": Representation{repType: Optional, create: `1521`, update: `1522`},
61+
"scan_listener_port_tcp_ssl": Representation{repType: Optional, create: `2484`, update: `2484`},
6062
}
6163
vmClusterNetworkBackupVmNetworkRepresentation = map[string]interface{}{
6264
"domain_name": Representation{repType: Required, create: `oracle.com`, update: `oracle.com`},
@@ -185,9 +187,11 @@ func TestDatabaseVmClusterNetworkResource_basic(t *testing.T) {
185187
resource.TestCheckResourceAttr(resourceName, "ntp.#", "1"),
186188
resource.TestCheckResourceAttr(resourceName, "scans.#", "1"),
187189
CheckResourceSetContainsElementWithProperties(resourceName, "scans", map[string]string{
188-
"hostname": "myprefix1-ivmmj-scan",
189-
"ips.#": "3",
190-
"port": "1521",
190+
"hostname": "myprefix1-ivmmj-scan",
191+
"ips.#": "3",
192+
"port": "1521",
193+
"scan_listener_port_tcp": "1521",
194+
"scan_listener_port_tcp_ssl": "2484",
191195
},
192196
[]string{}),
193197
resource.TestCheckResourceAttr(resourceName, "vm_networks.#", "2"),
@@ -230,9 +234,11 @@ func TestDatabaseVmClusterNetworkResource_basic(t *testing.T) {
230234
resource.TestCheckResourceAttr(resourceName, "ntp.#", "1"),
231235
resource.TestCheckResourceAttr(resourceName, "scans.#", "1"),
232236
CheckResourceSetContainsElementWithProperties(resourceName, "scans", map[string]string{
233-
"hostname": "myprefix2-ivmmj-scan",
234-
"ips.#": "3",
235-
"port": "1522",
237+
"hostname": "myprefix2-ivmmj-scan",
238+
"ips.#": "3",
239+
"port": "1522",
240+
"scan_listener_port_tcp": "1522",
241+
"scan_listener_port_tcp_ssl": "2484",
236242
},
237243
[]string{}),
238244
resource.TestCheckResourceAttr(resourceName, "vm_networks.#", "2"),
@@ -279,9 +285,11 @@ func TestDatabaseVmClusterNetworkResource_basic(t *testing.T) {
279285
resource.TestCheckResourceAttr(datasourceName, "vm_cluster_networks.0.ntp.#", "1"),
280286
resource.TestCheckResourceAttr(datasourceName, "vm_cluster_networks.0.scans.#", "1"),
281287
CheckResourceSetContainsElementWithProperties(datasourceName, "vm_cluster_networks.0.scans", map[string]string{
282-
"hostname": "myprefix2-ivmmj-scan",
283-
"ips.#": "3",
284-
"port": "1522",
288+
"hostname": "myprefix2-ivmmj-scan",
289+
"ips.#": "3",
290+
"port": "1522",
291+
"scan_listener_port_tcp": "1522",
292+
"scan_listener_port_tcp_ssl": "2484",
285293
},
286294
[]string{}),
287295
resource.TestCheckResourceAttrSet(datasourceName, "vm_cluster_networks.0.state"),
@@ -317,9 +325,11 @@ func TestDatabaseVmClusterNetworkResource_basic(t *testing.T) {
317325
resource.TestCheckResourceAttr(singularDatasourceName, "ntp.#", "1"),
318326
resource.TestCheckResourceAttr(singularDatasourceName, "scans.#", "1"),
319327
CheckResourceSetContainsElementWithProperties(singularDatasourceName, "scans", map[string]string{
320-
"hostname": "myprefix2-ivmmj-scan",
321-
"ips.#": "3",
322-
"port": "1522",
328+
"hostname": "myprefix2-ivmmj-scan",
329+
"ips.#": "3",
330+
"port": "1522",
331+
"scan_listener_port_tcp": "1522",
332+
"scan_listener_port_tcp_ssl": "2484",
323333
},
324334
[]string{}),
325335
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),

‎oci/database_vm_cluster_recommended_network_data_source.go‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ func DatabaseVmClusterRecommendedNetworkDataSource() *schema.Resource {
104104
Type: schema.TypeString,
105105
},
106106
},
107+
"scan_listener_port_tcp": {
108+
Type: schema.TypeInt,
109+
Optional: true,
110+
},
111+
"scan_listener_port_tcp_ssl": {
112+
Type: schema.TypeInt,
113+
Optional: true,
114+
},
107115

108116
// Computed
109117
"scans": {
@@ -131,6 +139,14 @@ func DatabaseVmClusterRecommendedNetworkDataSource() *schema.Resource {
131139
Type: schema.TypeInt,
132140
Computed: true,
133141
},
142+
"scan_listener_port_tcp": {
143+
Type: schema.TypeInt,
144+
Computed: true,
145+
},
146+
"scan_listener_port_tcp_ssl": {
147+
Type: schema.TypeInt,
148+
Computed: true,
149+
},
134150
},
135151
},
136152
},
@@ -291,6 +307,16 @@ func (s *DatabaseVmClusterRecommendedNetworkDataSourceCrud) Get() error {
291307
}
292308
}
293309

310+
if scanListenerPortTcp, ok := s.D.GetOkExists("scan_listener_port_tcp"); ok {
311+
tmp := scanListenerPortTcp.(int)
312+
request.ScanListenerPortTcp = &tmp
313+
}
314+
315+
if scanListenerPortTcpSsl, ok := s.D.GetOkExists("scan_listener_port_tcp_ssl"); ok {
316+
tmp := scanListenerPortTcpSsl.(int)
317+
request.ScanListenerPortTcpSsl = &tmp
318+
}
319+
294320
request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "database")
295321

296322
response, err := s.Client.GenerateRecommendedVmClusterNetwork(context.Background(), request)

‎oci/database_vm_cluster_recommended_network_test.go‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ import (
1515

1616
var (
1717
vmClusterRecommendedNetworkSingularDataSourceRepresentation = map[string]interface{}{
18-
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
19-
"display_name": Representation{repType: Required, create: `testVmClusterNw`},
20-
"exadata_infrastructure_id": Representation{repType: Required, create: `${oci_database_exadata_infrastructure.test_exadata_infrastructure.id}`},
21-
"networks": []RepresentationGroup{{Required, vmClusterRecommendedNetworkClientNetworksRepresentation}, {Required, vmClusterRecommendedNetworkbackupNetworksRepresentation}},
22-
"defined_tags": Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
23-
"dns": Representation{repType: Optional, create: []string{`192.168.10.10`}},
24-
"freeform_tags": Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
25-
"ntp": Representation{repType: Optional, create: []string{`192.168.10.20`}},
18+
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
19+
"display_name": Representation{repType: Required, create: `testVmClusterNw`},
20+
"exadata_infrastructure_id": Representation{repType: Required, create: `${oci_database_exadata_infrastructure.test_exadata_infrastructure.id}`},
21+
"networks": []RepresentationGroup{{Required, vmClusterRecommendedNetworkClientNetworksRepresentation}, {Required, vmClusterRecommendedNetworkbackupNetworksRepresentation}},
22+
"defined_tags": Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
23+
"dns": Representation{repType: Optional, create: []string{`192.168.10.10`}},
24+
"freeform_tags": Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
25+
"ntp": Representation{repType: Optional, create: []string{`192.168.10.20`}},
26+
"scan_listener_port_tcp": Representation{repType: Optional, create: `1521`},
27+
"scan_listener_port_tcp_ssl": Representation{repType: Optional, create: `2484`},
2628
}
2729
vmClusterRecommendedNetworkClientNetworksRepresentation = map[string]interface{}{
2830
"cidr": Representation{repType: Required, create: `192.168.19.2/16`},
@@ -73,13 +75,31 @@ func TestDatabaseVmClusterRecommendedNetworkResource_basic(t *testing.T) {
7375
// verify singular datasource
7476
{
7577
Config: config + VmClusterRecommendedNetworkDataSourceDependencies +
76-
generateDataSourceFromRepresentationMap("oci_database_vm_cluster_recommended_network", "test_vm_cluster_recommended_network", Required, Create, vmClusterRecommendedNetworkSingularDataSourceRepresentation) +
78+
generateDataSourceFromRepresentationMap("oci_database_vm_cluster_recommended_network", "test_vm_cluster_recommended_network", Optional, Create, vmClusterRecommendedNetworkSingularDataSourceRepresentation) +
7779
compartmentIdVariableStr,
7880
Check: ComposeAggregateTestCheckFuncWrapper(
7981
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
8082
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "testVmClusterNw"),
8183
resource.TestCheckResourceAttrSet(singularDatasourceName, "exadata_infrastructure_id"),
84+
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
8285
resource.TestCheckResourceAttr(singularDatasourceName, "networks.#", "2"),
86+
resource.TestCheckResourceAttr(singularDatasourceName, "networks.0.cidr", "192.168.19.2/16"),
87+
resource.TestCheckResourceAttr(singularDatasourceName, "networks.0.domain", "oracle.com"),
88+
resource.TestCheckResourceAttr(singularDatasourceName, "networks.0.gateway", "192.168.20.1"),
89+
resource.TestCheckResourceAttr(singularDatasourceName, "networks.0.netmask", "255.255.0.0"),
90+
resource.TestCheckResourceAttr(singularDatasourceName, "networks.0.network_type", "CLIENT"),
91+
resource.TestCheckResourceAttr(singularDatasourceName, "networks.0.prefix", "myprefix1"),
92+
resource.TestCheckResourceAttrSet(singularDatasourceName, "networks.0.vlan_id"),
93+
resource.TestCheckResourceAttr(singularDatasourceName, "ntp.#", "1"),
94+
resource.TestCheckResourceAttr(singularDatasourceName, "scan_listener_port_tcp", "1521"),
95+
resource.TestCheckResourceAttr(singularDatasourceName, "scan_listener_port_tcp_ssl", "2484"),
96+
97+
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
98+
resource.TestCheckResourceAttr(singularDatasourceName, "defined_tags.%", "1"),
99+
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "testVmClusterNw"),
100+
resource.TestCheckResourceAttr(singularDatasourceName, "dns.#", "1"),
101+
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
102+
resource.TestCheckResourceAttr(singularDatasourceName, "ntp.#", "1"),
83103
resource.TestCheckResourceAttr(singularDatasourceName, "scans.#", "1"),
84104
),
85105
},

‎oci/opsi_host_insight_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var (
3434
"compartment_id": Representation{repType: Optional, create: `${var.compartment_id}`},
3535
"host_type": Representation{repType: Optional, create: []string{`EXTERNAL-HOST`}},
3636
"id": Representation{repType: Optional, create: `${oci_opsi_host_insight.test_host_insight.id}`},
37-
"state": Representation{repType: Optional, create: []string{`Active`}},
37+
"state": Representation{repType: Optional, create: []string{`ACTIVE`}},
3838
"status": Representation{repType: Optional, create: []string{`Enabled`}, update: []string{`DISABLED`}},
3939
"filter": RepresentationGroup{Required, hostInsightDataSourceFilterRepresentation},
4040
}

0 commit comments

Comments
 (0)