Clean up awsmock

kubernetes · Feb 15, 2022 · 86a4811 · 86a4811
1 parent 11c1137
commit 86a4811
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 96 deletions.
diff --git a/cloudmock/aws/mockec2/BUILD.bazel b/cloudmock/aws/mockec2/BUILD.bazel
diff --git a/cloudmock/aws/mockec2/api.go b/cloudmock/aws/mockec2/api.go
@@ -48,8 +48,6 @@ type MockEC2 struct {
 
 	Volumes map[string]*ec2.Volume
 
-	PrefixLists map[string]*ec2.ManagedPrefixList
-
 	KeyPairs map[string]*ec2.KeyPairInfo
 
 	Tags []*ec2.TagDescription
@@ -112,9 +110,6 @@ func (m *MockEC2) All() map[string]interface{} {
 	for id, o := range m.NatGateways {
 		all[id] = o
 	}
-	for id, o := range m.PrefixLists {
-		all[id] = o
-	}
 
 	return all
 }

diff --git a/cloudmock/aws/mockec2/prefixlists.go b/cloudmock/aws/mockec2/prefixlists.go
diff --git a/pkg/model/awsmodel/api_loadbalancer.go b/pkg/model/awsmodel/api_loadbalancer.go
@@ -434,7 +434,7 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
 					}
 					t.SetCidrOrPrefix(cidr)
 					c.AddTask(t)
-				} else if utils.IsIPv4CIDR(cidr) {
+				} else {
 					t := &awstasks.SecurityGroupRule{
 						Name:          fi.String("icmp-pmtu-api-elb-" + cidr),
 						Lifecycle:     b.SecurityLifecycle,

diff --git a/pkg/testutils/integrationtestharness.go b/pkg/testutils/integrationtestharness.go
@@ -268,18 +268,6 @@ func (h *IntegrationTestHarness) SetupMockAWS() *awsup.MockAWSCloud {
 		AllocationId: aws.String("eipalloc-b2345678"),
 	}, "nat-b2345678")
 
-	mockEC2.CreateManagedPrefixListWithId(&ec2.CreateManagedPrefixListInput{
-		AddressFamily:  aws.String("ipv4"),
-		PrefixListName: aws.String("test-ipv4-prefix-list"),
-		MaxEntries:     aws.Int64(10),
-	}, "pl-44444444")
-
-	mockEC2.CreateManagedPrefixListWithId(&ec2.CreateManagedPrefixListInput{
-		AddressFamily:  aws.String("ipv6"),
-		PrefixListName: aws.String("test-ipv6-prefix-list"),
-		MaxEntries:     aws.Int64(10),
-	}, "pl-66666666")
-
 	mockELBV2.CreateTargetGroup(&elbv2.CreateTargetGroupInput{
 		Name: aws.String("my-external-tg-1"),
 	})