Skip to content

Commit ec5a83f

Browse files
Ram ChandrasekaranMaxrovr
Ram Chandrasekaran
authored and
Maxrovr
committed
Added - Support for ZPR v1 - Oracle Cloud World Scope - OC1 ONLY
1 parent f48292b commit ec5a83f

18 files changed

+673
-488
lines changed

‎internal/integrationtest/core_instance_configuration_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ var (
175175
"dedicated_vm_host_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_dedicated_vm_host.test_dedicated_vm_host.id}`},
176176
"launch_mode": acctest.Representation{RepType: acctest.Optional, Create: `NATIVE`},
177177
"preferred_maintenance_action": acctest.Representation{RepType: acctest.Optional, Create: `LIVE_MIGRATE`},
178+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"Oracle-DataSecurity-ZPR": map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}}},
178179
"shape_config": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceShapeConfigRepresentation},
179180
}
180181
CoreInstanceConfigurationInstanceDetailsLaunchDetailsRepresentationImageFilters = map[string]interface{}{
@@ -277,6 +278,7 @@ var (
277278
"hostname_label": acctest.Representation{RepType: acctest.Optional, Create: `hostnameLabel`},
278279
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
279280
"private_ip": acctest.Representation{RepType: acctest.Optional, Create: `privateIp`},
281+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"Oracle-DataSecurity-ZPR": map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}}},
280282
"skip_source_dest_check": acctest.Representation{RepType: acctest.Optional, Create: `false`},
281283
"subnet_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_subnet.test_subnet.id}`},
282284
}
@@ -324,6 +326,7 @@ var (
324326
"ipv6address_ipv6subnet_cidr_pair_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceConfigurationIpv6AddressIpv6SubnetCidrPairRepresentation},
325327
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
326328
"private_ip": acctest.Representation{RepType: acctest.Optional, Create: `privateIp`},
329+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"Oracle-DataSecurity-ZPR": map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}}},
327330
"skip_source_dest_check": acctest.Representation{RepType: acctest.Optional, Create: `false`},
328331
"subnet_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_subnet.test_subnet.id}`},
329332
}
@@ -993,6 +996,7 @@ func TestCoreInstanceConfigurationResourceOptions_basic(t *testing.T) {
993996
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.hostname_label", "hostnameLabel"),
994997
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.nsg_ids.#", "1"),
995998
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.private_ip", "privateIp"),
999+
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.security_attributes.%", "1"),
9961000
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.skip_source_dest_check", "false"),
9971001
resource.TestCheckResourceAttrSet(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.subnet_id"),
9981002
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.display_name", "backend-servers"),
@@ -1032,6 +1036,7 @@ func TestCoreInstanceConfigurationResourceOptions_basic(t *testing.T) {
10321036
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.hostname_label", "hostnameLabel"),
10331037
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.nsg_ids.#", "1"),
10341038
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.private_ip", "privateIp"),
1039+
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.security_attributes.%", "1"),
10351040
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.skip_source_dest_check", "false"),
10361041
resource.TestCheckResourceAttrSet(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.subnet_id"),
10371042
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.display_name", "backend-servers"),
@@ -1107,6 +1112,7 @@ func TestCoreInstanceConfigurationResourceOptions_basic(t *testing.T) {
11071112
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.hostname_label", "hostnameLabel"),
11081113
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.nsg_ids.#", "1"),
11091114
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.private_ip", "privateIp"),
1115+
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.security_attributes.%", "1"),
11101116
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.skip_source_dest_check", "false"),
11111117
resource.TestCheckResourceAttrSet(resourceName, "instance_details.0.options.0.launch_details.0.create_vnic_details.0.subnet_id"),
11121118
resource.TestCheckResourceAttr(resourceName, "instance_details.0.options.0.launch_details.0.display_name", "backend-servers"),
@@ -1169,6 +1175,7 @@ func TestCoreInstanceConfigurationResourceIpv6_basic(t *testing.T) {
11691175
resource.TestCheckResourceAttr(resourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.ipv6address_ipv6subnet_cidr_pair_details.0.ipv6subnet_cidr", "2607:f590:0000:1600:0000:0000:0000:0000/64"),
11701176
resource.TestCheckResourceAttr(resourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.nsg_ids.#", "1"),
11711177
resource.TestCheckResourceAttr(resourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.private_ip", "privateIp"),
1178+
resource.TestCheckResourceAttr(resourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.security_attributes.%", "1"),
11721179
resource.TestCheckResourceAttr(resourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.skip_source_dest_check", "false"),
11731180
resource.TestCheckResourceAttrSet(resourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.subnet_id"),
11741181
resource.TestCheckResourceAttr(resourceName, "instance_details.0.secondary_vnics.0.display_name", "backend-servers"),
@@ -1215,6 +1222,7 @@ func TestCoreInstanceConfigurationResourceIpv6_basic(t *testing.T) {
12151222
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.ipv6address_ipv6subnet_cidr_pair_details.0.ipv6subnet_cidr", "2607:f590:0000:1600:0000:0000:0000:0000/64"),
12161223
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.nsg_ids.#", "1"),
12171224
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.private_ip", "privateIp"),
1225+
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.security_attributes.%", "1"),
12181226
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.create_vnic_details.0.skip_source_dest_check", "false"),
12191227
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.display_name", "backend-servers"),
12201228
resource.TestCheckResourceAttr(singularDatasourceName, "instance_details.0.secondary_vnics.0.nic_index", "0"),

‎internal/integrationtest/core_instance_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ var (
198198
"is_pv_encryption_in_transit_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
199199
"launch_options": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceLaunchOptionsRepresentation_FlexShape},
200200
"metadata": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"user_data": "abcd"}, Update: map[string]string{"user_data": "abcd", "volatile_data": "stringE"}},
201+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"Oracle-DataSecurity-ZPR": map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}}},
201202
"shape_config": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceShapeConfigRepresentation},
202203
"source_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceSourceDetailsRepresentation},
203204
"subnet_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
@@ -238,6 +239,7 @@ var (
238239
"ipv6address_ipv6subnet_cidr_pair_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreInstanceIpv6AddressIpv6SubnetCidrPairRepresentation},
239240
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, Update: []string{}},
240241
"private_ip": acctest.Representation{RepType: acctest.Optional, Create: `10.0.0.5`},
242+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"Oracle-DataSecurity-ZPR": map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}}, Update: map[string]any{"MaxEgressCount": map[string]string{"value": "43", "mode": "audit"}}},
241243
"skip_source_dest_check": acctest.Representation{RepType: acctest.Optional, Create: `false`},
242244
"subnet_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
243245
}
@@ -958,6 +960,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
958960
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.hostname_label", "hostnamelabel"),
959961
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.nsg_ids.#", "1"),
960962
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.private_ip", "10.0.0.5"),
963+
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.security_attributes.%", "1"),
961964
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.skip_source_dest_check", "false"),
962965
resource.TestCheckResourceAttrSet(resourceName, "create_vnic_details.0.subnet_id"),
963966
resource.TestCheckResourceAttrSet(resourceName, "dedicated_vm_host_id"),
@@ -991,6 +994,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
991994
resource.TestCheckResourceAttrSet(resourceName, "launch_volume_attachments.0.volume_id"),
992995
resource.TestCheckResourceAttr(resourceName, "metadata.%", "1"),
993996
resource.TestCheckResourceAttrSet(resourceName, "region"),
997+
resource.TestCheckResourceAttr(resourceName, "security_attributes.%", "1"),
994998
resource.TestCheckResourceAttr(resourceName, "shape", "VM.Standard2.1"),
995999
resource.TestCheckResourceAttr(resourceName, "shape_config.#", "1"),
9961000
resource.TestCheckResourceAttr(resourceName, "shape_config.0.ocpus", "1"),
@@ -1071,6 +1075,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
10711075
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.hostname_label", "hostnamelabel"),
10721076
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.nsg_ids.#", "1"),
10731077
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.private_ip", "10.0.0.5"),
1078+
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.security_attributes.%", "1"),
10741079
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.skip_source_dest_check", "false"),
10751080
resource.TestCheckResourceAttrSet(resourceName, "create_vnic_details.0.subnet_id"),
10761081
resource.TestCheckResourceAttrSet(resourceName, "dedicated_vm_host_id"),
@@ -1110,6 +1115,7 @@ func TestCoreInstanceResource_basic(t *testing.T) {
11101115
resource.TestCheckResourceAttr(resourceName, "launch_volume_attachments.0.launch_create_volume_details.0.vpus_per_gb", "50"),
11111116
resource.TestCheckResourceAttr(resourceName, "metadata.%", "1"),
11121117
resource.TestCheckResourceAttrSet(resourceName, "region"),
1118+
resource.TestCheckResourceAttr(resourceName, "security_attributes.%", "1"),
11131119
resource.TestCheckResourceAttr(resourceName, "shape", "VM.Standard2.1"),
11141120
resource.TestCheckResourceAttr(resourceName, "shape_config.#", "1"),
11151121
resource.TestCheckResourceAttr(resourceName, "shape_config.0.ocpus", "1"),
@@ -1453,6 +1459,8 @@ func TestCoreInstanceResource_basic(t *testing.T) {
14531459
resource.TestCheckResourceAttr(datasourceName, "instances.0.launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
14541460
resource.TestCheckResourceAttr(datasourceName, "instances.0.metadata.%", "2"),
14551461
resource.TestCheckResourceAttrSet(datasourceName, "instances.0.region"),
1462+
resource.TestCheckResourceAttr(datasourceName, "instances.0.security_attributes.%", "1"),
1463+
resource.TestCheckResourceAttrSet(datasourceName, "instances.0.security_attributes_state"),
14561464
resource.TestCheckResourceAttr(datasourceName, "instances.0.shape", "VM.Standard2.1"),
14571465
resource.TestCheckResourceAttr(datasourceName, "instances.0.shape_config.#", "1"),
14581466
resource.TestCheckResourceAttrSet(datasourceName, "instances.0.shape_config.0.gpus"),
@@ -1512,6 +1520,8 @@ func TestCoreInstanceResource_basic(t *testing.T) {
15121520
resource.TestCheckResourceAttr(singularDatasourceName, "launch_options.0.remote_data_volume_type", "PARAVIRTUALIZED"),
15131521
resource.TestCheckResourceAttr(singularDatasourceName, "metadata.%", "2"),
15141522
resource.TestCheckResourceAttrSet(singularDatasourceName, "region"),
1523+
resource.TestCheckResourceAttr(singularDatasourceName, "security_attributes.%", "1"),
1524+
resource.TestCheckResourceAttrSet(singularDatasourceName, "security_attributes_state"),
15151525
resource.TestCheckResourceAttr(singularDatasourceName, "shape", "VM.Standard2.1"),
15161526
resource.TestCheckResourceAttr(singularDatasourceName, "shape_config.#", "1"),
15171527
resource.TestCheckResourceAttrSet(singularDatasourceName, "shape_config.0.gpus"),

‎internal/integrationtest/core_vnic_attachment_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ var (
5959
"hostname_label": acctest.Representation{RepType: acctest.Optional, Create: `attachvnictestinstance`},
6060
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, Update: []string{}},
6161
"private_ip": acctest.Representation{RepType: acctest.Optional, Create: `10.0.0.5`},
62+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}, Update: map[string]any{"MaxEgressCount": map[string]string{"value": "43", "mode": "audit"}}},
6263
"skip_source_dest_check": acctest.Representation{RepType: acctest.Optional, Create: `false`},
6364
}
6465

@@ -80,6 +81,7 @@ var (
8081
"ipv6address_ipv6subnet_cidr_pair_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: CoreVnicAttachmentIpv6AddressIpv6SubnetCidrPairRepresentation},
8182
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, Update: []string{}},
8283
"private_ip": acctest.Representation{RepType: acctest.Optional, Create: `10.0.0.5`},
84+
"security_attributes": acctest.Representation{RepType: acctest.Optional, Create: map[string]any{"MaxEgressCount": map[string]string{"value": "42", "mode": "audit"}}, Update: map[string]any{"MaxEgressCount": map[string]string{"value": "43", "mode": "audit"}}},
8385
"skip_source_dest_check": acctest.Representation{RepType: acctest.Optional, Create: `false`},
8486
}
8587
CoreVnicAttachmentIpv6AddressIpv6SubnetCidrPairRepresentation = map[string]interface{}{
@@ -166,6 +168,7 @@ func TestCoreVnicAttachmentResource_basic(t *testing.T) {
166168
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.hostname_label", "attachvnictestinstance"),
167169
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.nsg_ids.#", "1"),
168170
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.private_ip", "10.0.0.5"),
171+
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.security_attributes.%", "1"),
169172
resource.TestCheckResourceAttr(resourceName, "create_vnic_details.0.skip_source_dest_check", "false"),
170173
resource.TestCheckResourceAttrSet(resourceName, "create_vnic_details.0.subnet_id"),
171174
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),

0 commit comments

Comments
 (0)