Skip to content

Commit fe117aa

Browse files
rcohenmavarmax2511
rcohenma
authored and
varmax2511
committed
refactoring dependencies for tests
1 parent cb4966b commit fe117aa

File tree

136 files changed

+640
-426
lines changed

Some content is hidden

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

136 files changed

+640
-426
lines changed

‎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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ var (
1818
"token_version": Representation{repType: Optional, create: `2.0.0`},
1919
}
2020

21-
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+
}))
2229
)
2330

2431
func TestContainerengineClusterKubeConfigResource_basic(t *testing.T) {

‎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) {

‎oci/containerengine_node_pool_resource_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ var (
5353
"security_list_ids": Representation{repType: Optional, create: []string{`${oci_core_vcn.test_vcn.default_security_list_id}`}, update: []string{`${oci_core_security_list.test_security_list.id}`}},
5454
}
5555

56-
NodePoolReginalResourceDependencies = ClusterRequiredOnlyResource + InstanceCommonVariables +
57-
generateResourceFromRepresentationMap("oci_core_subnet", "node_pool_regional_subnet_1", Optional, Create,
58-
getMultipleUpdatedRepresenationCopy(
59-
[]string{"cidr_block", "dns_label"},
60-
[]interface{}{Representation{repType: Optional, create: `10.0.24.0/24`}, Representation{repType: Optional, create: `nodepool1`}},
61-
subnetRegionalRepresentation)) +
62-
generateResourceFromRepresentationMap("oci_core_subnet", "node_pool_regional_subnet_2", Optional, Create,
63-
getMultipleUpdatedRepresenationCopy(
64-
[]string{"cidr_block", "dns_label"},
65-
[]interface{}{Representation{repType: Optional, create: `10.0.25.0/24`}, Representation{repType: Optional, create: `nodepool2`}},
66-
subnetRegionalRepresentation)) +
67-
generateDataSourceFromRepresentationMap("oci_containerengine_node_pool_option", "test_node_pool_option", Required, Create, nodePoolOptionSingularDataSourceRepresentation)
56+
NodePoolReginalResourceDependencies = generateDataSourceFromRepresentationMap("oci_containerengine_node_pool_option", "test_node_pool_option", Required, Create, nodePoolOptionSingularDataSourceRepresentation) +
57+
generateResourceFromRepresentationMap("oci_core_subnet", "node_pool_regional_subnet_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.24.0/24`}, "dns_label": Representation{repType: Required, create: `nodepool1`}})) +
58+
generateResourceFromRepresentationMap("oci_core_subnet", "node_pool_regional_subnet_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.25.0/24`}, "dns_label": Representation{repType: Required, create: `nodepool2`}})) +
59+
generateResourceFromRepresentationMap("oci_containerengine_cluster", "test_cluster", Required, Create, clusterRepresentation) +
60+
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`}})) +
61+
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`}})) +
62+
AvailabilityDomainConfig +
63+
generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Required, Create, clusterOptionSingularDataSourceRepresentation) +
64+
OciImageIdsVariable +
65+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
66+
"dns_label": Representation{repType: Required, create: `dnslabel`},
67+
}))
6868
)
6969

7070
func TestResourceContainerengineNodePool_regionalsubnet(t *testing.T) {

‎oci/containerengine_node_pool_test.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,18 @@ var (
8181
"value": Representation{repType: Optional, create: `value`, update: `value2`},
8282
}
8383

84-
// @CODEGEN: OKE does not support regional subnets
85-
NodePoolResourceDependencies = ClusterRequiredOnlyResource + InstanceCommonVariables +
86-
generateResourceFromRepresentationMap("oci_core_subnet", "nodePool_Subnet_1", Optional, Create,
87-
getMultipleUpdatedRepresenationCopy(
88-
[]string{"cidr_block", "dns_label"},
89-
[]interface{}{Representation{repType: Optional, create: `10.0.22.0/24`}, Representation{repType: Optional, create: `nodepool1`}},
90-
subnetRepresentation)) +
91-
generateResourceFromRepresentationMap("oci_core_subnet", "nodePool_Subnet_2", Optional, Create,
92-
getMultipleUpdatedRepresenationCopy(
93-
[]string{"cidr_block", "dns_label"},
94-
[]interface{}{Representation{repType: Optional, create: `10.0.23.0/24`}, Representation{repType: Optional, create: `nodepool2`}},
95-
subnetRepresentation)) +
96-
generateDataSourceFromRepresentationMap("oci_containerengine_node_pool_option", "test_node_pool_option", Required, Create, nodePoolOptionSingularDataSourceRepresentation)
84+
NodePoolResourceDependencies = generateDataSourceFromRepresentationMap("oci_containerengine_node_pool_option", "test_node_pool_option", Required, Create, nodePoolOptionSingularDataSourceRepresentation) +
85+
generateResourceFromRepresentationMap("oci_core_subnet", "nodePool_Subnet_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.22.0/24`}, "dns_label": Representation{repType: Required, create: `nodepool1`}})) +
86+
generateResourceFromRepresentationMap("oci_core_subnet", "nodePool_Subnet_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.23.0/24`}, "dns_label": Representation{repType: Required, create: `nodepool2`}})) +
87+
generateResourceFromRepresentationMap("oci_containerengine_cluster", "test_cluster", Required, Create, clusterRepresentation) +
88+
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`}})) +
89+
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`}})) +
90+
AvailabilityDomainConfig +
91+
generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Required, Create, clusterOptionSingularDataSourceRepresentation) +
92+
OciImageIdsVariable +
93+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
94+
"dns_label": Representation{repType: Required, create: `dnslabel`},
95+
}))
9796
)
9897

9998
func TestContainerengineNodePoolResource_basic(t *testing.T) {
@@ -172,7 +171,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
172171
resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
173172
resource.TestCheckResourceAttr(resourceName, "name", "name"),
174173
resource.TestCheckResourceAttrSet(resourceName, "node_image_id"),
175-
resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
174+
resource.TestCheckResourceAttrSet(resourceName, "node_image_name"),
176175
resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
177176
resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
178177
resource.TestCheckResourceAttr(resourceName, "quantity_per_subnet", "1"),
@@ -216,7 +215,7 @@ func TestContainerengineNodePoolResource_basic(t *testing.T) {
216215
resource.TestCheckResourceAttrSet(resourceName, "kubernetes_version"),
217216
resource.TestCheckResourceAttr(resourceName, "name", "name2"),
218217
resource.TestCheckResourceAttrSet(resourceName, "node_image_id"),
219-
resource.TestCheckResourceAttr(resourceName, "node_image_name", "Oracle-Linux-7.4"),
218+
resource.TestCheckResourceAttrSet(resourceName, "node_image_name"),
220219
resource.TestCheckResourceAttr(resourceName, "node_metadata.%", "1"),
221220
resource.TestCheckResourceAttr(resourceName, "node_shape", "VM.Standard2.1"),
222221
resource.TestCheckResourceAttr(resourceName, "quantity_per_subnet", "2"),

‎oci/containerengine_work_request_error_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ 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 = WorkRequestResourceConfig +
22-
generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Optional, Create, workRequestDataSourceRepresentation)
21+
WorkRequestErrorResourceConfig = generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Required, Create, workRequestDataSourceRepresentation)
2322
)
2423

2524
func TestContainerengineWorkRequestErrorResource_basic(t *testing.T) {

‎oci/containerengine_work_request_log_entry_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ 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 = WorkRequestResourceConfig +
22-
generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Optional, Create, workRequestDataSourceRepresentation)
21+
WorkRequestLogEntryResourceConfig = generateDataSourceFromRepresentationMap("oci_containerengine_work_requests", "test_work_requests", Required, Create, workRequestDataSourceRepresentation)
2322
)
2423

2524
func TestContainerengineWorkRequestLogEntryResource_basic(t *testing.T) {

‎oci/containerengine_work_request_test.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ var (
2121
"status": Representation{repType: Optional, create: []string{}},
2222
}
2323

24-
WorkRequestResourceConfig = ClusterRequiredOnlyResource
24+
WorkRequestResourceConfig = generateResourceFromRepresentationMap("oci_containerengine_cluster", "test_cluster", Required, Create, clusterRepresentation) +
25+
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`}})) +
26+
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`}})) +
27+
AvailabilityDomainConfig +
28+
generateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", Required, Create, clusterOptionSingularDataSourceRepresentation) +
29+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
30+
"dns_label": Representation{repType: Required, create: `dnslabel`},
31+
}))
2532
)
2633

2734
func TestContainerengineWorkRequestResource_basic(t *testing.T) {

‎oci/core_boot_volume_attachment_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ var (
2121
"instance_id": Representation{repType: Optional, create: `${oci_core_instance.test_instance.id}`},
2222
}
2323

24-
BootVolumeAttachmentResourceConfig = BootVolumeResourceConfig
24+
BootVolumeAttachmentResourceConfig = generateResourceFromRepresentationMap("oci_core_boot_volume", "test_boot_volume", Required, Create, bootVolumeRepresentation) +
25+
OciImageIdsVariable +
26+
generateResourceFromRepresentationMap("oci_core_instance", "test_instance", Required, Create, instanceRepresentation) +
27+
generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation) +
28+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, vcnRepresentation) +
29+
AvailabilityDomainConfig
2530
)
2631

2732
func TestCoreBootVolumeAttachmentResource_basic(t *testing.T) {

0 commit comments

Comments
 (0)