Skip to content

Commit 8c080e0

Browse files
committed
test fixes
1 parent a6c1613 commit 8c080e0

8 files changed

+13
-12
lines changed

oci/containerengine_work_request_error_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ var (
1818
"work_request_id": Representation{repType: Required, create: `${lookup(data.oci_containerengine_work_requests.test_work_requests.work_requests[0], "id")}`},
1919
}
2020

21-
WorkRequestErrorResourceConfig = generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Required, Create, workRequestDataSourceRepresentation)
21+
WorkRequestErrorResourceConfig = WorkRequestResourceConfig +
22+
generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Required, Create, workRequestDataSourceRepresentation)
2223
)
2324

2425
func TestContainerengineWorkRequestErrorResource_basic(t *testing.T) {

oci/containerengine_work_request_log_entry_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ var (
1818
"work_request_id": Representation{repType: Required, create: `${lookup(data.oci_containerengine_work_requests.test_work_requests.work_requests[0], "id")}`},
1919
}
2020

21-
WorkRequestLogEntryResourceConfig = generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Required, Create, workRequestDataSourceRepresentation)
21+
WorkRequestLogEntryResourceConfig = WorkRequestResourceConfig +
22+
generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Required, Create, workRequestDataSourceRepresentation)
2223
)
2324

2425
func TestContainerengineWorkRequestLogEntryResource_basic(t *testing.T) {

oci/core_dedicated_vm_hosts_instance_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ var (
1919
"availability_domain": Representation{repType: Optional, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
2020
}
2121

22-
DedicatedVmHostsInstanceResourceConfig = generateResourceFromRepresentationMap("oci_core_dedicated_vm_host", "test_dedicated_vm_host", Required, Create, dedicatedVmHostRepresentation) +
23-
AvailabilityDomainConfig
22+
DedicatedVmHostsInstanceResourceConfig = InstanceResourceConfig
2423
)
2524

2625
func TestCoreDedicatedVmHostsInstanceResource_basic(t *testing.T) {

oci/core_volume_backup_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ var (
5959
volumeBackupId, volumeId string
6060
volumeBackupSourceDetailsRepresentation = map[string]interface{}{}
6161

62-
VolumeBackupResourceDependencies = generateResourceFromRepresentationMap("oci_core_volume", "test_volume", Required, Create, volumeRepresentation) +
63-
AvailabilityDomainConfig +
64-
DefinedTagsDependencies
62+
VolumeBackupResourceDependencies = VolumeResourceConfig
6563
)
6664

6765
func TestCoreVolumeBackupResource_basic(t *testing.T) {

oci/database_data_guard_association_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ var (
5555
"nsg_ids": Representation{repType: Optional, create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
5656
})
5757

58-
DataGuardAssociationResourceDependenciesBase = AvailabilityDomainConfig + NetworkSecurityGroupResourceConfig + `
58+
DataGuardAssociationResourceDependenciesBase = AvailabilityDomainConfig + DefinedTagsDependencies + VcnResourceConfig +
59+
generateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group", Optional, Update, networkSecurityGroupRepresentation) +
60+
`
5961
#dataguard requires the some port to be open on the subnet
6062
resource "oci_core_subnet" "test_subnet" {
6163
availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"

oci/identity_availability_domain_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestIdentityAvailabilityDomainResource_basic(t *testing.T) {
8282

8383
// no matching AD name
8484
if res == nil || len(res) < 1 {
85-
fmt.Errorf("No match found for case insensitive search")
85+
err = fmt.Errorf("no match found for case insensitive search")
8686
}
8787
return err
8888
},

oci/load_balancer_backend_set_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ var (
7070
"verify_peer_certificate": Representation{repType: Optional, create: `false`},
7171
}
7272

73-
BackendSetResourceDependencies = generateResourceFromRepresentationMap("oci_load_balancer_certificate", "test_certificate", Required, Create, certificateRepresentation) +
73+
BackendSetResourceDependencies = generateResourceFromRepresentationMap("oci_load_balancer_certificate", "test_certificate", Optional, Create, certificateRepresentation) +
7474
generateResourceFromRepresentationMap("oci_load_balancer_load_balancer", "test_load_balancer", Required, Create, loadBalancerRepresentation) +
75-
LoadBalancerSubnetDependencies
75+
LoadBalancerResourceDependencies
7676
)
7777

7878
func TestLoadBalancerBackendSetResource_basic(t *testing.T) {

oci/load_balancer_listener_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var (
4242
}
4343

4444
ListenerResourceDependencies = generateResourceFromRepresentationMap("oci_load_balancer_backend_set", "test_backend_set", Required, Create, backendSetRepresentation) +
45-
generateResourceFromRepresentationMap("oci_load_balancer_certificate", "test_certificate", Required, Create, certificateRepresentation) +
45+
generateResourceFromRepresentationMap("oci_load_balancer_certificate", "test_certificate", Optional, Create, certificateRepresentation) +
4646
generateResourceFromRepresentationMap("oci_load_balancer_load_balancer", "test_load_balancer", Required, Create, loadBalancerRepresentation) +
4747
LoadBalancerSubnetDependencies +
4848
generateResourceFromRepresentationMap("oci_load_balancer_path_route_set", "test_path_route_set", Required, Create, pathRouteSetRepresentation) +

0 commit comments

Comments
 (0)