Fix errors with 1007 backport

Signed-off-by: Vishal Thapar <[email protected]>
submariner-io · Sep 26, 2024 · a6f0732 · a6f0732
1 parent 741981a
commit a6f0732
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/pkg/aws/aws.go b/pkg/aws/aws.go
@@ -20,6 +20,9 @@ package aws
 
 import (
 	"context"
+	"fmt"
+	"regexp"
+	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"

diff --git a/pkg/aws/aws_suite_test.go b/pkg/aws/aws_suite_test.go
@@ -32,6 +32,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/submariner-io/admiral/pkg/mock"
 	"github.com/submariner-io/cloud-prepare/pkg/aws/client/fake"
+	"k8s.io/utils/ptr"
 )
 
 const (
@@ -66,6 +67,7 @@ type fakeAWSClientBase struct {
 	awsClient                        *fake.MockInterface
 	mockCtrl                         *gomock.Controller
 	vpcID                            string
+	subnets                          []types.Subnet
 	describeSubnetsErr               error
 	authorizeSecurityGroupIngressErr error
 	createTagsErr                    error
@@ -76,6 +78,7 @@ func (f *fakeAWSClientBase) beforeEach() {
 	f.mockCtrl = gomock.NewController(GinkgoT())
 	f.awsClient = fake.NewMockInterface(f.mockCtrl)
 	f.vpcID = vpcID
+	f.subnets = []types.Subnet{newSubnet(availabilityZone1, subnetID1), newSubnet(availabilityZone2, subnetID2)}
 	f.describeSubnetsErr = nil
 	f.authorizeSecurityGroupIngressErr = nil
 	f.createTagsErr = nil
@@ -112,18 +115,15 @@ func (f *fakeAWSClientBase) expectDescribeVpcs(vpcID string) {
 	}, types.Filter{
 		Name:   awssdk.String("tag:kubernetes.io/cluster/" + infraID),
 		Values: []string{"owned"},
-	}, {
-		Name:   ptr.To(providerAWSTagPrefix + infraID),
-		Values: []string{"owned"},
-	}}}).Matches))).Return(&ec2.DescribeVpcsOutput{Vpcs: vpcs}, nil).Maybe()
+	})).Return(&ec2.DescribeVpcsOutput{Vpcs: vpcs}, nil).AnyTimes()
 }
 
-func (f *fakeAWSClientBase) expectValidateAuthorizeSecurityGroupIngress(authErr error) *mock.Call {
-	return f.awsClient.EXPECT().AuthorizeSecurityGroupIngress(mock.Anything,
-		mock.MatchedBy((&authorizeSecurityGroupIngressInputMatcher{ec2.AuthorizeSecurityGroupIngressInput{
+func (f *fakeAWSClientBase) expectValidateAuthorizeSecurityGroupIngress(authErr error) *gomock.Call {
+	return f.awsClient.EXPECT().AuthorizeSecurityGroupIngress(gomock.Any(),
+		mock.Eq((&authorizeSecurityGroupIngressInputMatcher{ec2.AuthorizeSecurityGroupIngressInput{
 			DryRun:  ptr.To(true),
 			GroupId: ptr.To(workerGroupID),
-		}}).Matches)).Return(&ec2.AuthorizeSecurityGroupIngressOutput{}, authErr).Call
+		}}).Matches)).Return(&ec2.AuthorizeSecurityGroupIngressOutput{}, authErr)
 }
 
 func (f *fakeAWSClientBase) expectAuthorizeSecurityGroupIngress(srcGroup string, ipPerm *types.IpPermission) {
@@ -149,7 +149,7 @@ func (f *fakeAWSClientBase) expectValidateRevokeSecurityGroupIngress(retErr erro
 func (f *fakeAWSClientBase) expectDescribePublicSubnets(retSubnets ...types.Subnet) {
 	f.awsClient.EXPECT().DescribeSubnets(gomock.Any(), eqFilters(types.Filter{
 		Name:   awssdk.String("tag:Name"),
-		Values: []string{infraID + "-public-" + region + "*"},
+		Values: []string{infraID + "*-public-" + region + "*"},
 	}, types.Filter{
 		Name:   awssdk.String("vpc-id"),
 		Values: []string{f.vpcID},
@@ -159,6 +159,19 @@ func (f *fakeAWSClientBase) expectDescribePublicSubnets(retSubnets ...types.Subn
 	})).Return(&ec2.DescribeSubnetsOutput{Subnets: retSubnets}, f.describeSubnetsErr).AnyTimes()
 }
 
+func (f *fakeAWSClientBase) expectDescribePublicSubnetsSigs(retSubnets ...types.Subnet) {
+	f.awsClient.EXPECT().DescribeSubnets(gomock.Any(), eqFilters(types.Filter{
+		Name:   awssdk.String("tag:Name"),
+		Values: []string{infraID + "*-public-" + region + "*"},
+	}, types.Filter{
+		Name:   awssdk.String("vpc-id"),
+		Values: []string{f.vpcID},
+	}, types.Filter{
+		Name:   awssdk.String(clusterFilterTagNameSigs),
+		Values: []string{"owned"},
+	})).Return(&ec2.DescribeSubnetsOutput{Subnets: retSubnets}, f.describeSubnetsErr).AnyTimes()
+}
+
 func (f *fakeAWSClientBase) expectDescribeGatewaySubnets(retSubnets ...types.Subnet) {
 	f.awsClient.EXPECT().DescribeSubnets(gomock.Any(), eqFilters(types.Filter{
 		Name:   awssdk.String("tag:submariner.io/gateway"),

diff --git a/pkg/aws/securitygroups.go b/pkg/aws/securitygroups.go
@@ -331,3 +331,7 @@ func (ac *awsCloud) revokePortsFromGroup(group *types.SecurityGroup) error {
 
 	return errors.Wrap(err, "error revoking AWS security group ingress")
 }
+
+func withInfraIDPrefix(s string) string {
+	return "{infraID}" + s
+}
diff --git a/pkg/aws/vpcs.go b/pkg/aws/vpcs.go
@@ -39,7 +39,9 @@ func (ac *awsCloud) getVpcID() (string, error) {
 		return vpcIDStr, nil
 	}
 
-	ownedFilters := ac.filterByCurrentCluster()
+	ownedFilters := []types.Filter{
+		ac.filterByCurrentCluster(),
+	}
 	vpcName := ac.withAWSInfo("{infraID}-vpc")
 
 	filters := []types.Filter{