tests/ai-conformance: work with zones

Author: justinsb

tests/e2e/scenarios/ai-conformance/run-test.sh

@@ -36,14 +36,16 @@ export CLOUD_PROVIDER=aws
 export AWS_REGION="${AWS_REGION:-us-east-2}"
 SCENARIO_ROOT="${REPO_ROOT}/tests/e2e/scenarios/ai-conformance"
 
+
 # Check for g6.xlarge availability in the region
 echo "Checking availability of g6.xlarge in ${AWS_REGION}..."
 (cd "${SCENARIO_ROOT}/tools/check-aws-availability" && go build -o check-aws-availability main.go)
-AVAILABILITY=$("${SCENARIO_ROOT}/tools/check-aws-availability/check-aws-availability" -region "${AWS_REGION}" -instance-type g6.xlarge)
-if [[ "${AVAILABILITY}" == "false" ]]; then
-  echo "Error: g6.xlarge instances are not available in ${AWS_REGION}. Please choose a region with L4 GPU support."
-  exit 1
-fi
+# Run and source the output to get the ZONES variable
+source <("${SCENARIO_ROOT}/tools/check-aws-availability/check-aws-availability" -region "${AWS_REGION}" -instance-type g6.xlarge)
+
+echo "ZONES=${ZONES}"
+export ZONES
+
 rm -f "${SCENARIO_ROOT}/tools/check-aws-availability/check-aws-availability"
 
 kops-acquire-latest

tests/e2e/scenarios/ai-conformance/tools/check-aws-availability/main.go

@@ -21,6 +21,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
@@ -29,6 +30,14 @@ import (
 )
 
 func main() {
+	ctx := context.Background()
+	if err := run(ctx); err != nil {
+		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func run(ctx context.Context) error {
 	var region string
 	var instanceType string
 
@@ -37,15 +46,12 @@ func main() {
 	flag.Parse()
 
 	if region == "" || instanceType == "" {
-		fmt.Println("Usage: check-aws-availability -region <region> -instance-type <type>")
-		os.Exit(1)
+		return fmt.Errorf("Usage: check-aws-availability -region <region> -instance-type <type>")
 	}
 
-	ctx := context.TODO()
 	cfg, err := config.LoadDefaultConfig(ctx, config.WithRegion(region))
 	if err != nil {
-		fmt.Printf("Error loading configuration: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error loading configuration: %w", err)
 	}
 
 	client := ec2.NewFromConfig(cfg)
@@ -62,13 +68,21 @@ func main() {
 
 	result, err := client.DescribeInstanceTypeOfferings(ctx, input)
 	if err != nil {
-		fmt.Printf("Error describing instance type offerings: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error describing instance type offerings: %w", err)
 	}
 
-	if len(result.InstanceTypeOfferings) > 0 {
-		fmt.Println("true")
-	} else {
-		fmt.Println("false")
+	var zones []string
+
+	// Gather the availability zones where the instance type is offered
+	for _, offering := range result.InstanceTypeOfferings {
+		zone := aws.ToString(offering.Location)
+		zones = append(zones, zone)
 	}
+
+	if len(zones) == 0 {
+		return fmt.Errorf("Instance type %s is not available in any availability zones in region %s", instanceType, region)
+	}
+
+	fmt.Fprintf(os.Stdout, "ZONES=%s\n", strings.Join(zones, ","))
+	return nil
 }