forked from toolshed/abra
		
	Compare commits
	
		
			10 Commits
		
	
	
		
			0.4.0-alph
			...
			0.4.0-alph
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						e38a0078f3
	
				 | 
					
					
						|||
| 
						
						
							
						
						25b44dc54e
	
				 | 
					
					
						|||
| 
						
						
							
						
						0c2f6fb676
	
				 | 
					
					
						|||
| 
						
						
							
						
						10e4a8b97f
	
				 | 
					
					
						|||
| 
						
						
							
						
						eed2756784
	
				 | 
					
					
						|||
| 
						
						
							
						
						b61b8f0d2a
	
				 | 
					
					
						|||
| 
						
						
							
						
						763e7b5bff
	
				 | 
					
					
						|||
| 
						
						
							
						
						d5ab9aedbf
	
				 | 
					
					
						|||
| 
						
						
							
						
						2ebb00c9d4
	
				 | 
					
					
						|||
| 
						
						
							
						
						6d76b3646a
	
				 | 
					
					
						
@ -30,10 +30,10 @@ is failing to deploy or having issues, it could be a lot of things.
 | 
			
		||||
 | 
			
		||||
This command currently takes into account:
 | 
			
		||||
 | 
			
		||||
		Is the service deployed?
 | 
			
		||||
    Is the service deployed?
 | 
			
		||||
    Is the service killed by an OOM error?
 | 
			
		||||
		Is the service reporting an error (like in "ps --no-trunc" output)
 | 
			
		||||
		Is the service healthcheck failing? what are the healthcheck logs?
 | 
			
		||||
    Is the service reporting an error (like in "ps --no-trunc" output)
 | 
			
		||||
    Is the service healthcheck failing? what are the healthcheck logs?
 | 
			
		||||
 | 
			
		||||
Got any more ideas? Please let us know:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -39,13 +39,13 @@ var appRemoveCommand = &cli.Command{
 | 
			
		||||
		if !internal.Force {
 | 
			
		||||
			response := false
 | 
			
		||||
			prompt := &survey.Confirm{
 | 
			
		||||
				Message: fmt.Sprintf("about to delete %s, are you sure?", app.Name),
 | 
			
		||||
				Message: fmt.Sprintf("about to remove %s, are you sure?", app.Name),
 | 
			
		||||
			}
 | 
			
		||||
			if err := survey.AskOne(prompt, &response); err != nil {
 | 
			
		||||
				logrus.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
			if !response {
 | 
			
		||||
				logrus.Fatal("user aborted app removal")
 | 
			
		||||
				logrus.Fatal("aborting as requested")
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
@ -54,18 +54,16 @@ var appRemoveCommand = &cli.Command{
 | 
			
		||||
			logrus.Fatal(err)
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if !internal.Force {
 | 
			
		||||
			isDeployed, _, err := stack.IsDeployed(c.Context, cl, app.StackName())
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				logrus.Fatal(err)
 | 
			
		||||
			}
 | 
			
		||||
			if isDeployed {
 | 
			
		||||
				logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s \" or pass --force", app.Name, app.Name)
 | 
			
		||||
			}
 | 
			
		||||
		isDeployed, _, err := stack.IsDeployed(c.Context, cl, app.StackName())
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			logrus.Fatal(err)
 | 
			
		||||
		}
 | 
			
		||||
		if isDeployed {
 | 
			
		||||
			logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s \" or pass --force", app.Name, app.Name)
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		fs := filters.NewArgs()
 | 
			
		||||
		fs.Add("name", app.Name)
 | 
			
		||||
		fs.Add("name", app.StackName())
 | 
			
		||||
		secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: fs})
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			logrus.Fatal(err)
 | 
			
		||||
@ -81,6 +79,7 @@ var appRemoveCommand = &cli.Command{
 | 
			
		||||
 | 
			
		||||
		if len(secrets) > 0 {
 | 
			
		||||
			var secretNamesToRemove []string
 | 
			
		||||
 | 
			
		||||
			if !internal.Force {
 | 
			
		||||
				secretsPrompt := &survey.MultiSelect{
 | 
			
		||||
					Message: "which secrets do you want to remove?",
 | 
			
		||||
 | 
			
		||||
@ -20,18 +20,19 @@ import (
 | 
			
		||||
var allSecrets bool
 | 
			
		||||
var allSecretsFlag = &cli.BoolFlag{
 | 
			
		||||
	Name:        "all",
 | 
			
		||||
	Aliases:     []string{"A"},
 | 
			
		||||
	Aliases:     []string{"a"},
 | 
			
		||||
	Value:       false,
 | 
			
		||||
	Destination: &allSecrets,
 | 
			
		||||
	Usage:       "Generate all secrets",
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var appSecretGenerateCommand = &cli.Command{
 | 
			
		||||
	Name:      "generate",
 | 
			
		||||
	Aliases:   []string{"g"},
 | 
			
		||||
	Usage:     "Generate secrets",
 | 
			
		||||
	ArgsUsage: "<secret> <version>",
 | 
			
		||||
	Flags:     []cli.Flag{allSecretsFlag, internal.PassFlag},
 | 
			
		||||
	Name:         "generate",
 | 
			
		||||
	Aliases:      []string{"g"},
 | 
			
		||||
	Usage:        "Generate secrets",
 | 
			
		||||
	ArgsUsage:    "<secret> <version>",
 | 
			
		||||
	Flags:        []cli.Flag{allSecretsFlag, internal.PassFlag},
 | 
			
		||||
	BashComplete: autocomplete.AppNameComplete,
 | 
			
		||||
	Action: func(c *cli.Context) error {
 | 
			
		||||
		app := internal.ValidateApp(c)
 | 
			
		||||
 | 
			
		||||
@ -95,11 +96,12 @@ var appSecretGenerateCommand = &cli.Command{
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var appSecretInsertCommand = &cli.Command{
 | 
			
		||||
	Name:      "insert",
 | 
			
		||||
	Aliases:   []string{"i"},
 | 
			
		||||
	Usage:     "Insert secret",
 | 
			
		||||
	Flags:     []cli.Flag{internal.PassFlag},
 | 
			
		||||
	ArgsUsage: "<app> <secret-name> <version> <data>",
 | 
			
		||||
	Name:         "insert",
 | 
			
		||||
	Aliases:      []string{"i"},
 | 
			
		||||
	Usage:        "Insert secret",
 | 
			
		||||
	Flags:        []cli.Flag{internal.PassFlag},
 | 
			
		||||
	ArgsUsage:    "<app> <secret-name> <version> <data>",
 | 
			
		||||
	BashComplete: autocomplete.AppNameComplete,
 | 
			
		||||
	Description: `
 | 
			
		||||
This command inserts a secret into an app environment.
 | 
			
		||||
 | 
			
		||||
@ -139,11 +141,12 @@ Example:
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var appSecretRmCommand = &cli.Command{
 | 
			
		||||
	Name:      "remove",
 | 
			
		||||
	Usage:     "Remove a secret",
 | 
			
		||||
	Aliases:   []string{"rm"},
 | 
			
		||||
	Flags:     []cli.Flag{allSecretsFlag, internal.PassFlag},
 | 
			
		||||
	ArgsUsage: "<app> <secret-name>",
 | 
			
		||||
	Name:         "remove",
 | 
			
		||||
	Usage:        "Remove a secret",
 | 
			
		||||
	Aliases:      []string{"rm"},
 | 
			
		||||
	Flags:        []cli.Flag{allSecretsFlag, internal.PassFlag},
 | 
			
		||||
	ArgsUsage:    "<app> <secret-name>",
 | 
			
		||||
	BashComplete: autocomplete.AppNameComplete,
 | 
			
		||||
	Description: `
 | 
			
		||||
This command removes a secret from an app environment.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -163,9 +163,9 @@ func NewAction(c *cli.Context) error {
 | 
			
		||||
		NewAppServer = "local"
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	tableCol := []string{"Name", "Domain", "Type", "Server"}
 | 
			
		||||
	tableCol := []string{"server", "type", "domain", "app name"}
 | 
			
		||||
	table := formatter.CreateTable(tableCol)
 | 
			
		||||
	table.Append([]string{sanitisedAppName, Domain, recipe.Name, NewAppServer})
 | 
			
		||||
	table.Append([]string{NewAppServer, recipe.Name, Domain, NewAppName})
 | 
			
		||||
 | 
			
		||||
	fmt.Println("")
 | 
			
		||||
	fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
 | 
			
		||||
@ -173,10 +173,10 @@ func NewAction(c *cli.Context) error {
 | 
			
		||||
	table.Render()
 | 
			
		||||
	fmt.Println("")
 | 
			
		||||
	fmt.Println("You can configure this app by running the following:")
 | 
			
		||||
	fmt.Println(fmt.Sprintf("\n    abra app config %s", sanitisedAppName))
 | 
			
		||||
	fmt.Println(fmt.Sprintf("\n    abra app config %s", NewAppName))
 | 
			
		||||
	fmt.Println("")
 | 
			
		||||
	fmt.Println("You can deploy this app by running the following:")
 | 
			
		||||
	fmt.Println(fmt.Sprintf("\n    abra app deploy %s", sanitisedAppName))
 | 
			
		||||
	fmt.Println(fmt.Sprintf("\n    abra app deploy %s", NewAppName))
 | 
			
		||||
	fmt.Println("")
 | 
			
		||||
 | 
			
		||||
	return nil
 | 
			
		||||
 | 
			
		||||
@ -2,7 +2,7 @@
 | 
			
		||||
 | 
			
		||||
ABRA_VERSION="0.3.0-alpha"
 | 
			
		||||
ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION"
 | 
			
		||||
RC_VERSION="0.4.0-alpha-rc2"
 | 
			
		||||
RC_VERSION="0.4.0-alpha-rc3"
 | 
			
		||||
RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$RC_VERSION"
 | 
			
		||||
 | 
			
		||||
for arg in "$@"; do
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user