added parameter to define output for conncetion details

Author: adrianriobo

cmd/cmd/constants.go

@@ -1,14 +1,16 @@
 package cmd
 
 const (
-	projectName           string = "project-name"
-	projectNameDesc       string = "project name to identify the instance of the stack"
-	backedURL             string = "backed-url"
-	backedURLDesc         string = "backed for stack state. Can be a local path with format file:///path/subpath or s3 s3://existing-bucket"
-	supportedHostID       string = "host-id"
-	supportedHostIDDesc   string = "host id from supported hosts list"
-	availabilityZones     string = "availability-zones"
-	availabilityZonesDesc string = "List of comma separated azs to check. If empty all will be searched"
+	projectName                 string = "project-name"
+	projectNameDesc             string = "project name to identify the instance of the stack"
+	backedURL                   string = "backed-url"
+	backedURLDesc               string = "backed for stack state. Can be a local path with format file:///path/subpath or s3 s3://existing-bucket"
+	connectionDetailsOutput     string = "conn-details-output"
+	connectionDetailsOutputDesc string = "path to export host connection information. Here 3 files will be created holding: host, username and privateKey"
+	supportedHostID             string = "host-id"
+	supportedHostIDDesc         string = "host id from supported hosts list"
+	availabilityZones           string = "availability-zones"
+	availabilityZonesDesc       string = "List of comma separated azs to check. If empty all will be searched"
 
 	createCmdName  string = "create"
 	destroyCmdName string = "destroy"

cmd/cmd/host-create.go

@@ -18,6 +18,7 @@ func init() {
 	flagSet := pflag.NewFlagSet(createCmdName, pflag.ExitOnError)
 	flagSet.StringP(projectName, "", "", projectNameDesc)
 	flagSet.StringP(backedURL, "", "", backedURLDesc)
+	flagSet.StringP(connectionDetailsOutput, "", "", connectionDetailsOutputDesc)
 	flagSet.StringP(supportedHostID, "", "", supportedHostIDDesc)
 	hostCreateCmd.Flags().AddFlagSet(flagSet)
 }
@@ -32,6 +33,7 @@ var hostCreateCmd = &cobra.Command{
 		if err := environment.Create(
 			viper.GetString(projectName),
 			viper.GetString(backedURL),
+			viper.GetString(connectionDetailsOutput),
 			// fixed as public to ensure sync, when PR is merged we can offer as param
 			// https://github.com/pulumi/pulumi-command/pull/132
 			true,

cmd/cmd/host-destroy.go

@@ -29,8 +29,8 @@ var hostDestroyCmd = &cobra.Command{
 			return err
 		}
 		if err := environment.Destroy(
-			"qenvs",
-			"file:///tmp/qenvs"); err != nil {
+			viper.GetString(projectName),
+			viper.GetString(backedURL)); err != nil {
 			logging.Error(err)
 		}
 		return nil

pkg/infra/aws/modules/environment/api.go

@@ -17,7 +17,7 @@ import (
 	"github.com/pulumi/pulumi/sdk/v3/go/auto"
 )
 
-func Create(projectName, backedURL string, public bool, targetHostID string) (err error) {
+func Create(projectName, backedURL, connectionDetailsOutput string, public bool, targetHostID string) (err error) {
 	// Check which supported host
 	host, err := supportMatrix.GetHost(targetHostID)
 	if err != nil {
@@ -56,7 +56,7 @@ func Create(projectName, backedURL string, public bool, targetHostID string) (er
 		return err
 	}
 	// Write host access info to disk
-	if err = manageResults(stackResult, host, public, "/tmp/qenvs"); err != nil {
+	if err = manageResults(stackResult, host, public, connectionDetailsOutput); err != nil {
 		return err
 	}
 	logging.Debug("Environment has been created")
@@ -125,32 +125,18 @@ func manageRequest(request *corporateEnvironmentRequest,
 func manageResults(stackResult auto.UpResult,
 	host *supportMatrix.SupportedHost, public bool,
 	destinationFolder string) error {
+	// Currently support only one host on host operation
+	// this should be change when create a environment with multiple hosts
+	remoteHostID := host.ID
 	if !public {
-		if err := writeOutputs(stackResult, destinationFolder, map[string]string{
-			fmt.Sprintf("%s-%s", compute.OutputPrivateKey, "bastion"): "bastion_id_rsa",
-			fmt.Sprintf("%s-%s", compute.OutputHost, "bastion"):       "bastion_host",
-			fmt.Sprintf("%s-%s", compute.OutputUsername, "bastion"):   "bastion_username",
-		}); err != nil {
-			return err
-		}
+		remoteHostID = supportMatrix.S_BASTION.ID
 	}
-	switch host.Type {
-	case supportMatrix.RHEL:
-		if err := writeOutputs(stackResult, destinationFolder, map[string]string{
-			fmt.Sprintf("%s-%s", compute.OutputPrivateKey, supportMatrix.OL_RHEL.ID): "rhel_id_rsa",
-			fmt.Sprintf("%s-%s", compute.OutputHost, supportMatrix.OL_RHEL.ID):       "rhel_host",
-			fmt.Sprintf("%s-%s", compute.OutputUsername, supportMatrix.OL_RHEL.ID):   "rhel_username",
-		}); err != nil {
-			return err
-		}
-	case supportMatrix.MacM1:
-		if err := writeOutputs(stackResult, destinationFolder, map[string]string{
-			fmt.Sprintf("%s-%s", compute.OutputPrivateKey, supportMatrix.G_MAC_M1.ID): "macm1_id_rsa",
-			fmt.Sprintf("%s-%s", compute.OutputHost, supportMatrix.G_MAC_M1.ID):       "macm1_host",
-			fmt.Sprintf("%s-%s", compute.OutputUsername, supportMatrix.G_MAC_M1.ID):   "macm1_username",
-		}); err != nil {
-			return err
-		}
+	if err := writeOutputs(stackResult, destinationFolder, map[string]string{
+		fmt.Sprintf("%s-%s", compute.OutputPrivateKey, remoteHostID): "id_rsa",
+		fmt.Sprintf("%s-%s", compute.OutputHost, remoteHostID):       "host",
+		fmt.Sprintf("%s-%s", compute.OutputUsername, remoteHostID):   "username",
+	}); err != nil {
+		return err
 	}
 	return nil
 }