fix suggestion

konstructio · Dec 31, 2024 · 1eea540 · 1eea540
1 parent 181d4d6
commit 1eea540
Show file tree

Hide file tree

Showing 2 changed files with 197 additions and 180 deletions.
diff --git a/cmd/aws/create.go b/cmd/aws/create.go
@@ -166,7 +166,11 @@ func ValidateProvidedFlags(ctx context.Context, cfg aws.Config, gitProvider, ami
 		log.Info().Msgf("%q %s", "gitlab.com", key.Type())
 	}
 
-	if err := ValidateAMIType(ctx, cfg, amiType, nodeType); err != nil {
+	ssmClient := ssm.NewFromConfig(cfg)
+	ec2Client := ec2.NewFromConfig(cfg)
+	paginator := ec2.NewDescribeInstanceTypesPaginator(ec2Client, &ec2.DescribeInstanceTypesInput{})
+
+	if err := ValidateAMIType(ctx, amiType, nodeType, ssmClient, ec2Client, paginator); err != nil {
 		progress.Error(err.Error())
 		return fmt.Errorf("failed to validte ami type for node group: %w", err)
 	}
@@ -186,18 +190,14 @@ func getSessionCredentials(ctx context.Context, cfg aws.CredentialsProvider) (*a
 	return &creds, nil
 }
 
-func ValidateAMIType(ctx context.Context, cfg aws.Config, amiType, nodeType string) error {
+func ValidateAMIType(ctx context.Context, amiType, nodeType string, ssmClient ssmClienter, ec2Client ec2Clienter, paginator paginater) error {
 	ssmParameterName, ok := ssmTypesID[amiType]
 	if !ok {
 		return fmt.Errorf("not a valid ami type: %q", amiType)
 	}
 
 	log.Info().Msgf("ami type is  %s", amiType)
 
-	ssmClient := ssm.NewFromConfig(cfg)
-	ec2Client := ec2.NewFromConfig(cfg)
-	paginator := ec2.NewDescribeInstanceTypesPaginator(ec2Client, &ec2.DescribeInstanceTypesInput{})
-
 	amiID, err := GetLatestAMIFromSSM(ctx, ssmClient, ssmParameterName)
 	if err != nil {
 		return fmt.Errorf("failed to get AMI ID from SSM: %w", err)
@@ -213,6 +213,8 @@ func ValidateAMIType(ctx context.Context, cfg aws.Config, amiType, nodeType stri
 		return fmt.Errorf("failed to get supported instance types: %w", err)
 	}
 
+	fmt.Println("Supported instance types: ", instanceTypes)
+
 	for _, instanceType := range instanceTypes {
 		if instanceType == nodeType {
 			return nil