feat: Atmos List Instances, Pro Upload

cmd/cmd_utils.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
@@ -87,29 +86,18 @@ func processCustomCommands(
 					executeCustomCommand(atmosConfig, cmd, args, parentCommand, commandConfig)
 				},
 			}
-			// TODO: we need to update this post https://github.com/cloudposse/atmos/pull/959 gets merged
 			customCommand.PersistentFlags().Bool("", false, doubleDashHint)
 			// Process and add flags to the command
 			for _, flag := range commandConfig.Flags {
 				if flag.Type == "bool" {
 					defaultVal := false
-					if flag.Default != "" {
-						// Accept "true"/"false" as string for bool default
-						parsed, err := strconv.ParseBool(flag.Default)
-						if err == nil {
-							defaultVal = parsed
-						}
-					}
 					if flag.Shorthand != "" {
 						customCommand.PersistentFlags().BoolP(flag.Name, flag.Shorthand, defaultVal, flag.Usage)
 					} else {
 						customCommand.PersistentFlags().Bool(flag.Name, defaultVal, flag.Usage)
 					}
 				} else {
 					defaultVal := ""
-					if flag.Default != "" {
-						defaultVal = flag.Default
-					}
 					if flag.Shorthand != "" {
 						customCommand.PersistentFlags().StringP(flag.Name, flag.Shorthand, defaultVal, flag.Usage)
 					} else {

cmd/list_instances.go

@@ -0,0 +1,50 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	e "github.com/cloudposse/atmos/internal/exec"
+	"github.com/cloudposse/atmos/pkg/list"
+	fl "github.com/cloudposse/atmos/pkg/list/flags"
+)
+
+// listInstancesCmd lists atmos instances.
+var listInstancesCmd = &cobra.Command{
+	Use:                "instances",
+	Short:              "List all Atmos instances",
+	Long:               "This command lists all Atmos instances or is used to upload instances to the pro API.",
+	FParseErrWhitelist: struct{ UnknownFlags bool }{UnknownFlags: false},
+	Args:               cobra.NoArgs,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		// Check Atmos configuration
+		checkAtmosConfig()
+		err := ExecuteListInstancesCmd(cmd, args)
+		if err != nil {
+			return err
+		}
+		return nil
+	},
+}
+
+func init() {
+	// Add common list flags
+	fl.AddCommonListFlags(listInstancesCmd)
+
+	// Add instance-specific flags
+	listInstancesCmd.Flags().Bool("upload", false, "Upload instances to pro API")
+
+	// Add the command to the list command
+	listCmd.AddCommand(listInstancesCmd)
+}
+
+func ExecuteListInstancesCmd(cmd *cobra.Command, args []string) error {
+	// Process and validate command line arguments.
+	configAndStacksInfo, err := e.ProcessCommandLineArgs("list", cmd, args, nil)
+	if err != nil {
+		return err
+	}
+	configAndStacksInfo.Command = "list"
+	configAndStacksInfo.SubCommand = "instances"
+
+	return list.ExecuteListInstancesCmd(&configAndStacksInfo, cmd, args)
+}

cmd/terraform_commands.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spf13/cobra"
-
 	errUtils "github.com/cloudposse/atmos/errors"
+	cfg "github.com/cloudposse/atmos/pkg/config"
 	h "github.com/cloudposse/atmos/pkg/hooks"
 	"github.com/cloudposse/atmos/pkg/version"
+	"github.com/spf13/cobra"
 )
 
 // getTerraformCommands returns an array of statically defined Terraform commands with flags
@@ -321,6 +321,7 @@ func attachTerraformCommands(parentCmd *cobra.Command) {
 
 var commandMaps = map[string]func(cmd *cobra.Command){
 	"plan": func(cmd *cobra.Command) {
+		cmd.PersistentFlags().Bool(cfg.UploadStatusFlag, false, "If set atmos will upload the plan result to the pro API")
 		cmd.PersistentFlags().Bool("affected", false, "Plan the affected components in dependency order")
 		cmd.PersistentFlags().Bool("all", false, "Plan all components in all stacks")
 		cmd.PersistentFlags().Bool("skip-planfile", false, "Skip writing the plan to a file by not passing the `-out` flag to Terraform when executing the command. Set it to `true` when using Terraform Cloud since the `-out` flag is not supported. Terraform Cloud automatically stores plans in its backend")

errors/errors.go

@@ -55,20 +55,22 @@ var (
 	ErrReadS3ObjectBody = errors.New("failed to read S3 object body")
 
 	// Git-related errors.
-	ErrGitNotAvailable     = errors.New("git must be available and on the PATH")
-	ErrInvalidGitPort      = errors.New("invalid port number")
-	ErrSSHKeyUsage         = errors.New("error using ssh key")
-	ErrGitCommandExited    = errors.New("git command exited with error")
-	ErrGitCommandFailed    = errors.New("error running git command")
-	ErrReadDestDir         = errors.New("failed to read the destination directory during git update")
-	ErrRemoveGitDir        = errors.New("failed to remove the .git directory in the destination directory during git update")
-	ErrUnexpectedGitOutput = errors.New("unexpected 'git version' output")
-	ErrGitVersionMismatch  = errors.New("git version requirement not met")
+	ErrGitNotAvailable      = errors.New("git must be available and on the PATH")
+	ErrInvalidGitPort       = errors.New("invalid port number")
+	ErrSSHKeyUsage          = errors.New("error using SSH key")
+	ErrGitCommandExited     = errors.New("git command exited with non-zero status")
+	ErrGitCommandFailed     = errors.New("failed to execute git command")
+	ErrReadDestDir          = errors.New("failed to read the destination directory during git update")
+	ErrRemoveGitDir         = errors.New("failed to remove the .git directory in the destination directory during git update")
+	ErrUnexpectedGitOutput  = errors.New("unexpected 'git version' output")
+	ErrGitVersionMismatch   = errors.New("git version requirement not met")
+	ErrFailedToGetLocalRepo = errors.New("failed to get local repository")
+	ErrFailedToGetRepoInfo  = errors.New("failed to get repository info")
 
 	ErrReadFile    = errors.New("error reading file")
 	ErrInvalidFlag = errors.New("invalid flag")
 
-	ErrMissingStack                       = errors.New("stack is required; specify it on the command line using the flag `--stack <stack>` (shorthand `-s`)\"")
+	ErrMissingStack                       = errors.New("stack is required; specify it on the command line using the flag `--stack <stack>` (shorthand `-s`)")
 	ErrInvalidComponent                   = errors.New("invalid component")
 	ErrAbstractComponentCantBeProvisioned = errors.New("abstract component cannot be provisioned")
 	ErrLockedComponentCantBeProvisioned   = errors.New("locked component cannot be provisioned")
@@ -79,4 +81,44 @@ var (
 	ErrAtmosConfigIsNil         = errors.New("atmos config is nil")
 	ErrInvalidListMergeStrategy = errors.New("invalid list merge strategy")
 	ErrMerge                    = errors.New("merge error")
+
+	// Pro API client errors.
+	ErrFailedToCreateRequest        = errors.New("failed to create request")
+	ErrFailedToMarshalPayload       = errors.New("failed to marshal request body")
+	ErrFailedToCreateAuthRequest    = errors.New("failed to create authenticated request")
+	ErrFailedToMakeRequest          = errors.New("failed to make request")
+	ErrFailedToUploadStacks         = errors.New("failed to upload stacks")
+	ErrFailedToReadResponseBody     = errors.New("failed to read response body")
+	ErrFailedToLockStack            = errors.New("failed to lock stack")
+	ErrFailedToUnlockStack          = errors.New("failed to unlock stack")
+	ErrOIDCWorkspaceIDRequired      = errors.New("workspace ID environment variable is required for OIDC authentication")
+	ErrOIDCTokenExchangeFailed      = errors.New("failed to exchange OIDC token for Atmos token")
+	ErrOIDCAuthFailedNoToken        = errors.New("OIDC authentication failed: no token")
+	ErrNotInGitHubActions           = errors.New("not running in GitHub Actions or missing OIDC token environment variables")
+	ErrFailedToGetOIDCToken         = errors.New("failed to get OIDC token")
+	ErrFailedToDecodeOIDCResponse   = errors.New("failed to decode OIDC token response")
+	ErrFailedToExchangeOIDCToken    = errors.New("failed to exchange OIDC token")
+	ErrFailedToDecodeTokenResponse  = errors.New("failed to decode token response")
+	ErrFailedToGetGitHubOIDCToken   = errors.New("failed to get GitHub OIDC token")
+	ErrFailedToUploadInstances      = errors.New("failed to upload instances")
+	ErrFailedToUploadInstanceStatus = errors.New("failed to upload instance status")
+	ErrFailedToUnmarshalAPIResponse = errors.New("failed to unmarshal API response")
+	ErrNilRequestDTO                = errors.New("nil request DTO")
+	ErrAPIResponseError             = errors.New("API response error")
+
+	// Exec package errors.
+	ErrComponentAndStackRequired = errors.New("both '--component' and '--stack' flags must be provided")
+	ErrFailedToCreateAPIClient   = errors.New("failed to create API client")
+	ErrFailedToProcessArgs       = errors.New("failed to process command-line arguments")
+	ErrFailedToInitConfig        = errors.New("failed to initialize Atmos configuration")
+	ErrFailedToCreateLogger      = errors.New("failed to create logger")
+	ErrFailedToGetComponentFlag  = errors.New("failed to get '--component' flag")
+	ErrFailedToGetStackFlag      = errors.New("failed to get '--stack' flag")
+	ErrOPAPolicyViolations       = errors.New("OPA policy violations detected")
+
+	// List package errors.
+	ErrExecuteDescribeStacks     = errors.New("failed to execute describe stacks")
+	ErrProcessInstances          = errors.New("failed to process instances")
+	ErrParseFlag                 = errors.New("failed to parse flag value")
+	ErrFailedToFinalizeCSVOutput = errors.New("failed to finalize CSV output")
 )

internal/exec/describe_affected.go

@@ -13,7 +13,6 @@ import (
 	errUtils "github.com/cloudposse/atmos/errors"
 	"github.com/cloudposse/atmos/internal/tui/templates/term"
 	cfg "github.com/cloudposse/atmos/pkg/config"
-	l "github.com/cloudposse/atmos/pkg/logger"
 	"github.com/cloudposse/atmos/pkg/pager"
 	"github.com/cloudposse/atmos/pkg/pro"
 	"github.com/cloudposse/atmos/pkg/pro/dtos"
@@ -311,7 +310,9 @@ func (d *describeAffectedExec) uploadableQuery(args *DescribeAffectedCmdArgs, re
 	if err != nil {
 		return err
 	}
-	logger, err := l.NewLoggerFromCliConfig(*d.atmosConfig)
+
+	log.Debug("Creating API client")
+	apiClient, err := pro.NewAtmosProAPIClientFromEnv(d.atmosConfig)
 	if err != nil {
 		return err
 	}
@@ -325,13 +326,8 @@ func (d *describeAffectedExec) uploadableQuery(args *DescribeAffectedCmdArgs, re
 		RepoHost:  gitURL.GetHostName(),
 		Stacks:    affected,
 	}
-	log.Debug("Preparing upload affected stacks request", "req", req)
 
-	log.Debug("Creating API client")
-	apiClient, err := pro.NewAtmosProAPIClientFromEnv(logger, d.atmosConfig)
-	if err != nil {
-		return err
-	}
+	log.Debug("Preparing upload affected stacks request", "req", req)
 
 	return apiClient.UploadAffectedStacks(&req)
 }