Support Cloudstack multiple endpoint for preflight checks

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/google/go-github/v35 v35.3.0
 	github.com/google/uuid v1.3.0
+	github.com/hashicorp/go-multierror v1.1.1
 	github.com/mrajashree/etcdadm-controller v1.0.0-rc3
 	github.com/onsi/gomega v1.19.0
 	github.com/pkg/errors v0.9.1

internal/test/cleanup/cleanup.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/hashicorp/go-multierror"
 
 	"github.com/aws/eks-anywhere/internal/pkg/ec2"
 	"github.com/aws/eks-anywhere/internal/pkg/s3"
@@ -85,7 +86,7 @@ func VsphereRmVms(ctx context.Context, clusterName string, opts ...executables.G
 	return govc.CleanupVms(ctx, clusterName, false)
 }
 
-func CleanUpCloudstackTestResources(ctx context.Context, clusterName string, dryRun bool) error {
+func CleanUpCloudstackTestResources(ctx context.Context, clusterName string, dryRun bool) (retErr error) {
 	executableBuilder, close, err := executables.NewExecutableBuilder(ctx, executables.DefaultEksaImage())
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
@@ -99,12 +100,23 @@ func CleanUpCloudstackTestResources(ctx context.Context, clusterName string, dry
 	if err != nil {
 		return fmt.Errorf("building cmk executable: %v", err)
 	}
-	cmk := executableBuilder.BuildCmkExecutable(tmpWriter, *execConfig)
-	defer cmk.Close(ctx)
+	for _, config := range execConfig.Profiles {
+		cmk := executableBuilder.BuildCmkExecutable(tmpWriter, config)
+		if err := cleanupCloudStackVms(ctx, cmk, clusterName, dryRun); err != nil {
+			retErr = multierror.Append(retErr, err)
+		}
+		cmk.Close(ctx)
+	}
+	return retErr
+}
 
+func cleanupCloudStackVms(ctx context.Context, cmk *executables.Cmk, clusterName string, dryRun bool) error {
 	if err := cmk.ValidateCloudStackConnection(ctx); err != nil {
 		return fmt.Errorf("validating cloudstack connection with cloudmonkey: %v", err)
 	}
 
-	return cmk.CleanupVms(ctx, clusterName, dryRun)
+	if err := cmk.CleanupVms(ctx, clusterName, dryRun); err != nil {
+		return fmt.Errorf("cleaning up VMs with cloudmonkey: %v", err)
+	}
+	return nil
 }

pkg/dependencies/factory.go

@@ -50,7 +50,7 @@ type Dependencies struct {
 	DockerClient              *executables.Docker
 	Kubectl                   *executables.Kubectl
 	Govc                      *executables.Govc
-	Cmk                       *executables.Cmk
+	Cmks                      map[string]*executables.Cmk
 	SnowAwsClient             aws.Clients
 	SnowConfigManager         *snow.ConfigManager
 	Writer                    filewriter.FileWriter
@@ -267,12 +267,18 @@ func (f *Factory) WithProvider(clusterConfigFile string, clusterConfig *v1alpha1
 				return fmt.Errorf("unable to get machine config from file %s: %v", clusterConfigFile, err)
 			}
 
+			// map[string]*executables.Cmk and map[string]ProviderCmkClient are not compatible so we convert the map manually
+			cmkClientMap := cloudstack.CmkClientMap{}
+			for name, cmk := range f.dependencies.Cmks {
+				cmkClientMap[name] = cmk
+			}
+
 			f.dependencies.Provider = cloudstack.NewProvider(
 				datacenterConfig,
 				machineConfigs,
 				clusterConfig,
 				f.dependencies.Kubectl,
-				f.dependencies.Cmk,
+				cmkClientMap,
 				f.dependencies.Writer,
 				time.Now,
 				skipIpCheck,
@@ -415,16 +421,21 @@ func (f *Factory) WithCmk() *Factory {
 	f.WithExecutableBuilder().WithWriter()
 
 	f.buildSteps = append(f.buildSteps, func(ctx context.Context) error {
-		if f.dependencies.Cmk != nil {
+		if f.dependencies.Cmks != nil && len(f.dependencies.Cmks) > 0 {
 			return nil
 		}
+		f.dependencies.Cmks = map[string]*executables.Cmk{}
+
 		execConfig, err := decoder.ParseCloudStackSecret()
 		if err != nil {
 			return fmt.Errorf("building cmk executable: %v", err)
 		}
 
-		f.dependencies.Cmk = f.executableBuilder.BuildCmkExecutable(f.dependencies.Writer, *execConfig)
-		f.dependencies.closers = append(f.dependencies.closers, f.dependencies.Cmk)
+		for _, profileConfig := range execConfig.Profiles {
+			cmk := f.executableBuilder.BuildCmkExecutable(f.dependencies.Writer, profileConfig)
+			f.dependencies.Cmks[profileConfig.Name] = cmk
+			f.dependencies.closers = append(f.dependencies.closers, cmk)
+		}
 
 		return nil
 	})

pkg/dependencies/factory_test.go

@@ -2,6 +2,7 @@ package dependencies_test
 
 import (
 	"context"
+	"encoding/base64"
 	"os"
 	"testing"
 
@@ -13,6 +14,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/config"
 	"github.com/aws/eks-anywhere/pkg/dependencies"
+	"github.com/aws/eks-anywhere/pkg/providers/cloudstack/decoder"
 	"github.com/aws/eks-anywhere/pkg/version"
 	"github.com/aws/eks-anywhere/release/api/v1alpha1"
 )
@@ -107,6 +109,10 @@ func TestFactoryBuildWithClusterManagerWithoutCliConfig(t *testing.T) {
 }
 
 func TestFactoryBuildWithMultipleDependencies(t *testing.T) {
+	configString := test.ReadFile(t, "testdata/cloudstack_config_multiple_profiles.ini")
+	encodedConfig := base64.StdEncoding.EncodeToString([]byte(configString))
+	t.Setenv(decoder.EksacloudStackCloudConfigB64SecretKey, encodedConfig)
+
 	tt := newTest(t, vsphere)
 	deps, err := dependencies.NewFactory().
 		UseExecutableImage("image:1").
@@ -125,6 +131,7 @@ func TestFactoryBuildWithMultipleDependencies(t *testing.T) {
 		WithCAPIManager().
 		WithManifestReader().
 		WithUnAuthKubeClient().
+		WithCmk().
 		Build(context.Background())
 
 	tt.Expect(err).To(BeNil())

pkg/dependencies/testdata/cloudstack_config_multiple_profiles.ini

@@ -0,0 +1,11 @@
+[Global]
+verify-ssl = false
+api-key = test-key1
+secret-key = test-secret1
+api-url = http://127.16.0.1:8080/client/api
+
+[Instance2]
+verify-ssl = true
+api-key = test-key2
+secret-key = test-secret2
+api-url = http://127.16.0.2:8080/client/api

pkg/executables/builder.go

@@ -41,8 +41,8 @@ func (b *ExecutableBuilder) BuildGovcExecutable(writer filewriter.FileWriter, op
 	return NewGovc(b.buildExecutable(govcPath), writer, opts...)
 }
 
-func (b *ExecutableBuilder) BuildCmkExecutable(writer filewriter.FileWriter, execConfig decoder.CloudStackExecConfig) *Cmk {
-	return NewCmk(b.buildExecutable(cmkPath), writer, execConfig)
+func (b *ExecutableBuilder) BuildCmkExecutable(writer filewriter.FileWriter, config decoder.CloudStackProfileConfig) *Cmk {
+	return NewCmk(b.buildExecutable(cmkPath), writer, config)
 }
 
 func (b *ExecutableBuilder) BuildAwsCli() *AwsCli {