OCM-6592 | fix: filter out local-zone and wave-length zone associated…

… subnets during 'rosa create machinepool (HCP)'

pkg/aws/client.go

@@ -113,7 +113,6 @@ type Client interface {
 	GetVPCSubnets(subnetID string) ([]ec2types.Subnet, error)
 	GetVPCPrivateSubnets(isHostedCp bool, subnetID string) ([]ec2types.Subnet, error)
 	FilterVPCsPrivateSubnets(isHostedCp bool, subnets []ec2types.Subnet) ([]ec2types.Subnet, error)
-	FilterSubnetsWithStandardAvailabilityZones(subnets []ec2types.Subnet) ([]ec2types.Subnet, error)
 	ValidateQuota() (bool, error)
 	TagUserRegion(username string, region string) error
 	GetClusterRegionTagForUser(username string) (string, error)
@@ -616,7 +615,7 @@ func (c *awsClient) FilterVPCsPrivateSubnets(isHostedCp bool, subnets []ec2types
 
 	// Temporary filter until local-zone and wave-length zones are supported by HCP
 	if isHostedCp {
-		privateSubnets, err = c.FilterSubnetsWithStandardAvailabilityZones(privateSubnets)
+		privateSubnets, err = c.filterSubnetsWithStandardAvailabilityZones(privateSubnets)
 		if err != nil {
 			return nil, err
 		}
@@ -629,14 +628,14 @@ func (c *awsClient) FilterVPCsPrivateSubnets(isHostedCp bool, subnets []ec2types
 	return privateSubnets, nil
 }
 
-func (c *awsClient) FilterSubnetsWithStandardAvailabilityZones(subnets []ec2types.Subnet) ([]ec2types.Subnet, error) {
+func (c *awsClient) filterSubnetsWithStandardAvailabilityZones(subnets []ec2types.Subnet) ([]ec2types.Subnet, error) {
 	filteredSubnets := []ec2types.Subnet{}
 	subnetAvailabilityZonesList := []string{}
 	standardAvailabilityZonesMap := map[string]bool{}
 
 	// list of availability zones to pass as input
 	for _, subnet := range subnets {
-		subnetAvailabilityZonesList = append(subnetAvailabilityZonesList, *subnet.AvailabilityZone)
+		subnetAvailabilityZonesList = append(subnetAvailabilityZonesList, aws.ToString(subnet.AvailabilityZone))
 	}
 
 	describeAvailabilityZonesOutput, err := c.ec2Client.DescribeAvailabilityZones(
@@ -647,13 +646,13 @@ func (c *awsClient) FilterSubnetsWithStandardAvailabilityZones(subnets []ec2type
 	}
 
 	for _, availabilityZone := range describeAvailabilityZonesOutput.AvailabilityZones {
-		if *availabilityZone.ZoneType == standardZone {
-			standardAvailabilityZonesMap[*availabilityZone.ZoneName] = true
+		if aws.ToString(availabilityZone.ZoneType) == standardZone {
+			standardAvailabilityZonesMap[aws.ToString(availabilityZone.ZoneName)] = true
 		}
 	}
 
 	for _, subnet := range subnets {
-		_, exists := standardAvailabilityZonesMap[*subnet.AvailabilityZone]
+		_, exists := standardAvailabilityZonesMap[aws.ToString(subnet.AvailabilityZone)]
 		if exists {
 			filteredSubnets = append(filteredSubnets, subnet)
 		}

pkg/aws/client_test.go

@@ -800,13 +800,13 @@ var _ = Describe("Client", func() {
 		},
 		}
 
-		Context("FilterSubnetsWithStandardAvailabilityZones", func() {
+		Context("filterSubnetsWithStandardAvailabilityZones", func() {
 			It("Filters out subnets with local-zone, wavelength-zone availability zones", func() {
 
 				mockEC2API.EXPECT().DescribeAvailabilityZones(gomock.Any(), gomock.Any()).Return(
 					mockDescribeAvailabilityZoneOutput, nil)
-
-				filteredSubnets, err := client.FilterSubnetsWithStandardAvailabilityZones(mockSubnets)
+				mockClient := awsClient{ec2Client: mockEC2API}
+				filteredSubnets, err := mockClient.filterSubnetsWithStandardAvailabilityZones(mockSubnets)
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(len(filteredSubnets)).To(Equal(1))