From 4c392ac71abba492c16a7115fe53cd883d26d4e8 Mon Sep 17 00:00:00 2001 From: justinsb Date: Mon, 29 Jan 2024 08:32:53 -0500 Subject: [PATCH] refactor: Introduce runTests helper method into aws tests This mirrors what we do in gce, and eliminates some boilerplate. --- .../egressonlyinternetgateway_test.go | 31 ++++++----- .../fi/cloudup/awstasks/elastic_ip_test.go | 13 +---- .../cloudup/awstasks/internetgateway_test.go | 13 +---- .../fi/cloudup/awstasks/securitygroup_test.go | 13 +---- upup/pkg/fi/cloudup/awstasks/subnet_test.go | 52 ++----------------- upup/pkg/fi/cloudup/awstasks/vpc_test.go | 28 +--------- 6 files changed, 28 insertions(+), 122 deletions(-) diff --git a/upup/pkg/fi/cloudup/awstasks/egressonlyinternetgateway_test.go b/upup/pkg/fi/cloudup/awstasks/egressonlyinternetgateway_test.go index 07db4aaf16..65230e2835 100644 --- a/upup/pkg/fi/cloudup/awstasks/egressonlyinternetgateway_test.go +++ b/upup/pkg/fi/cloudup/awstasks/egressonlyinternetgateway_test.go @@ -94,18 +94,7 @@ func TestSharedEgressOnlyInternetGatewayDoesNotRename(t *testing.T) { allTasks := buildTasks() eigw1 := allTasks["eigw1"].(*EgressOnlyInternetGateway) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(eigw1.ID) == "" { t.Fatalf("ID not set after create") @@ -144,3 +133,21 @@ func TestSharedEgressOnlyInternetGatewayDoesNotRename(t *testing.T) { checkNoChanges(t, ctx, cloud, allTasks) } } + +func runTasks(t *testing.T, cloud awsup.AWSCloud, allTasks map[string]fi.CloudupTask) { + t.Helper() + ctx := context.TODO() + + target := &awsup.AWSAPITarget{ + Cloud: cloud, + } + + context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) + if err != nil { + t.Fatalf("error building context: %v", err) + } + + if err := context.RunTasks(testRunTasksOptions); err != nil { + t.Fatalf("unexpected error during Run: %v", err) + } +} diff --git a/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go b/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go index ae2304d64a..61d8b6f0f4 100644 --- a/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go +++ b/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go @@ -78,18 +78,7 @@ func TestElasticIPCreate(t *testing.T) { allTasks := buildTasks() eip1 := allTasks["eip1"].(*ElasticIP) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(eip1.ID) == "" { t.Fatalf("ID not set after create") diff --git a/upup/pkg/fi/cloudup/awstasks/internetgateway_test.go b/upup/pkg/fi/cloudup/awstasks/internetgateway_test.go index 7f5f3c2b26..f8a8f4771e 100644 --- a/upup/pkg/fi/cloudup/awstasks/internetgateway_test.go +++ b/upup/pkg/fi/cloudup/awstasks/internetgateway_test.go @@ -110,18 +110,7 @@ func TestSharedInternetGatewayDoesNotRename(t *testing.T) { allTasks := buildTasks() igw1 := allTasks["igw1"].(*InternetGateway) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(igw1.ID) == "" { t.Fatalf("ID not set after create") diff --git a/upup/pkg/fi/cloudup/awstasks/securitygroup_test.go b/upup/pkg/fi/cloudup/awstasks/securitygroup_test.go index 509e2d51f1..3821fccf3e 100644 --- a/upup/pkg/fi/cloudup/awstasks/securitygroup_test.go +++ b/upup/pkg/fi/cloudup/awstasks/securitygroup_test.go @@ -137,18 +137,7 @@ func TestSecurityGroupCreate(t *testing.T) { sg1 := allTasks["sg1"].(*SecurityGroup) vpc1 := allTasks["vpc1"].(*VPC) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(sg1.ID) == "" { t.Fatalf("ID not set after create") diff --git a/upup/pkg/fi/cloudup/awstasks/subnet_test.go b/upup/pkg/fi/cloudup/awstasks/subnet_test.go index 955418a12e..72f7549873 100644 --- a/upup/pkg/fi/cloudup/awstasks/subnet_test.go +++ b/upup/pkg/fi/cloudup/awstasks/subnet_test.go @@ -98,18 +98,7 @@ func TestSubnetCreate(t *testing.T) { allTasks := buildTasks() subnet1 := allTasks["subnet1"].(*Subnet) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(subnet1.ID) == "" { t.Fatalf("ID not set after create") @@ -190,18 +179,7 @@ func TestSubnetCreateIPv6(t *testing.T) { allTasks := buildTasks() subnet1 := allTasks["subnet1"].(*Subnet) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(subnet1.ID) == "" { t.Fatalf("ID not set after create") @@ -290,18 +268,7 @@ func TestSubnetCreateIPv6NetNum(t *testing.T) { allTasks := buildTasks() subnet1 := allTasks["subnet1"].(*Subnet) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(subnet1.ID) == "" { t.Fatalf("ID not set after create") @@ -424,18 +391,7 @@ func TestSharedSubnetCreateDoesNotCreateNew(t *testing.T) { allTasks := buildTasks() subnet1 := allTasks["subnet1"].(*Subnet) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(subnet1.ID) == "" { t.Fatalf("ID not set after create") diff --git a/upup/pkg/fi/cloudup/awstasks/vpc_test.go b/upup/pkg/fi/cloudup/awstasks/vpc_test.go index 228d6cd2ad..0064d0d85e 100644 --- a/upup/pkg/fi/cloudup/awstasks/vpc_test.go +++ b/upup/pkg/fi/cloudup/awstasks/vpc_test.go @@ -52,18 +52,7 @@ func TestVPCCreate(t *testing.T) { allTasks := buildTasks() vpc1 := allTasks["vpc1"].(*VPC) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(vpc1.ID) == "" { t.Fatalf("ID not set after create") @@ -134,8 +123,6 @@ func Test4758(t *testing.T) { } func TestSharedVPCAdditionalCIDR(t *testing.T) { - ctx := context.TODO() - cloud := awsup.BuildMockAWSCloud("us-east-1", "abc") c := &mockec2.MockEC2{} c.CreateVpcWithId(&ec2.CreateVpcInput{ @@ -177,18 +164,7 @@ func TestSharedVPCAdditionalCIDR(t *testing.T) { allTasks := buildTasks() vpc1 := allTasks["vpc-1"].(*VPC) - target := &awsup.AWSAPITarget{ - Cloud: cloud, - } - - context, err := fi.NewCloudupContext(ctx, target, nil, cloud, nil, nil, nil, allTasks) - if err != nil { - t.Fatalf("error building context: %v", err) - } - - if err := context.RunTasks(testRunTasksOptions); err != nil { - t.Fatalf("unexpected error during Run: %v", err) - } + runTasks(t, cloud, allTasks) if fi.ValueOf(vpc1.ID) == "" { t.Fatalf("ID not set")