forked from coop-cloud/abra
Compare commits
98 Commits
57728e58e8
...
f432bfdd23
Author | SHA1 | Date |
---|---|---|
knoflook | f432bfdd23 | |
Comrade Renovate Bot | 848e17578d | |
decentral1se | 1615130929 | |
decentral1se | 7f315315f0 | |
decentral1se | 6a50981120 | |
decentral1se | c67471e6ca | |
decentral1se | f0fc1027e5 | |
decentral1se | c66695d55e | |
decentral1se | 262009701e | |
decentral1se | b31cb6b866 | |
decentral1se | f39e186b66 | |
decentral1se | a8f35bdf2f | |
decentral1se | 6e1e02ac28 | |
decentral1se | 16fc5ee54b | |
decentral1se | 37a1fcc4af | |
decentral1se | a9b522719f | |
decentral1se | ce70932a1c | |
decentral1se | d61e104536 | |
decentral1se | d5f30a3ae4 | |
decentral1se | 2555096510 | |
decentral1se | 3797292b20 | |
decentral1se | 6333815b71 | |
decentral1se | 793a850fd5 | |
decentral1se | 42c1450384 | |
decentral1se | a2377882f6 | |
decentral1se | e78b395662 | |
decentral1se | cdec834ca9 | |
decentral1se | b4b0b464bd | |
decentral1se | d8a1b0ccc1 | |
decentral1se | 3fbd381f55 | |
decentral1se | d3e127e5c8 | |
decentral1se | e9cfb076c6 | |
decentral1se | 8ccf856110 | |
decentral1se | d0945aa09d | |
decentral1se | 123619219e | |
decentral1se | a27410952e | |
Comrade Renovate Bot | 13e0392af6 | |
Comrade Renovate Bot | 99a6135f72 | |
decentral1se | a6b52c1354 | |
Comrade Renovate Bot | fa51459191 | |
decentral1se | c529988427 | |
decentral1se | 231cc3c718 | |
decentral1se | 3381b8936d | |
decentral1se | 823f869f1d | |
decentral1se | ecbeacf10f | |
decentral1se | 3f838038d5 | |
Comrade Renovate Bot | 91b4e021d0 | |
decentral1se | 598e87dca2 | |
decentral1se | 001511876d | |
decentral1se | b295958c17 | |
decentral1se | 2fbdcfb958 | |
decentral1se | 09ac74d205 | |
decentral1se | 5da4afa0ec | |
decentral1se | 9d5e805748 | |
Comrade Renovate Bot | 770ae5ed9b | |
decentral1se | e056d8dc44 | |
decentral1se | c3442354e7 | |
decentral1se | 6b2a0011af | |
decentral1se | 46fca7cfa7 | |
decentral1se | 82d560a946 | |
decentral1se | fc5107865b | |
decentral1se | 53ed1fc545 | |
Comrade Renovate Bot | cc9e3d4e60 | |
decentral1se | 0557284461 | |
decentral1se | b5f23d3791 | |
decentral1se | 2b2dcc01b4 | |
decentral1se | 0a208d049e | |
decentral1se | 141711ecd0 | |
Comrade Renovate Bot | cd46d71ce4 | |
Comrade Renovate Bot | 6fa090352d | |
decentral1se | 227c02cd09 | |
decentral1se | bfeda40e34 | |
decentral1se | 5237c7ed50 | |
decentral1se | 4e09f3b9a8 | |
decentral1se | dfb32cbb68 | |
decentral1se | bdd9b0a1aa | |
decentral1se | b2d17a1829 | |
decentral1se | c905376472 | |
decentral1se | d316de218c | |
decentral1se | 123475bd36 | |
decentral1se | 58e98f490d | |
decentral1se | 224b8865bf | |
decentral1se | 8fb9f42f13 | |
decentral1se | dc5e2a5b24 | |
decentral1se | 40b4ef5ab2 | |
decentral1se | 4a912ae3bc | |
decentral1se | 1150fcc595 | |
decentral1se | 45224d1349 | |
decentral1se | 7a40e2d616 | |
decentral1se | 2277e4ef72 | |
decentral1se | c0c3d9fe76 | |
decentral1se | 2493921ade | |
decentral1se | 22f9cf2be4 | |
decentral1se | a23124aede | |
decentral1se | e670844b56 | |
decentral1se | bc1729c5ca | |
decentral1se | fa8611b115 | |
decentral1se | 415df981ff |
10
.drone.yml
10
.drone.yml
|
@ -3,12 +3,12 @@ kind: pipeline
|
||||||
name: coopcloud.tech/abra
|
name: coopcloud.tech/abra
|
||||||
steps:
|
steps:
|
||||||
- name: make check
|
- name: make check
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- make check
|
- make check
|
||||||
|
|
||||||
- name: make static
|
- name: make static
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
ignore: true # until we decide we all want this check
|
ignore: true # until we decide we all want this check
|
||||||
environment:
|
environment:
|
||||||
STATIC_CHECK_URL: honnef.co/go/tools/cmd/staticcheck
|
STATIC_CHECK_URL: honnef.co/go/tools/cmd/staticcheck
|
||||||
|
@ -18,12 +18,12 @@ steps:
|
||||||
- make static
|
- make static
|
||||||
|
|
||||||
- name: make build
|
- name: make build
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- make build
|
- make build
|
||||||
|
|
||||||
- name: make test
|
- name: make test
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
commands:
|
commands:
|
||||||
- make test
|
- make test
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ steps:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
- name: release
|
- name: release
|
||||||
image: golang:1.17
|
image: golang:1.18
|
||||||
environment:
|
environment:
|
||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
from_secret: goreleaser_gitea_token
|
from_secret: goreleaser_gitea_token
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
# authors
|
||||||
|
|
||||||
|
> If you're looking at this and you hack on Abra and you're not listed here,
|
||||||
|
> please do add yourself! This is a community project, let's show
|
||||||
|
|
||||||
|
- 3wordchant
|
||||||
|
- decentral1se
|
||||||
|
- kawaiipunk
|
||||||
|
- knoflook
|
||||||
|
- roxxers
|
65
README.md
65
README.md
|
@ -7,67 +7,6 @@
|
||||||
|
|
||||||
The Co-op Cloud utility belt 🎩🐇
|
The Co-op Cloud utility belt 🎩🐇
|
||||||
|
|
||||||
`abra` is a command-line tool for managing your own [Co-op Cloud](https://coopcloud.tech). It can provision new servers, create apps, deploy them and a whole lot of other things. Please see [docs.coopcloud.tech](https://docs.coopcloud.tech) for more extensive documentation.
|
`abra` is our flagship client & command-line tool which has been developed specifically in the context of the Co-op Cloud project for the purpose of making day-to-day operations for [operators](https://docs.coopcloud.tech/operators/) and [maintainers](https://docs.coopcloud.tech/maintainers/) as convenient as possible. It is libre software, written in [Go](https://go.dev) and maintained and extended by the community ❤
|
||||||
|
|
||||||
## Quick install
|
Please see [docs.coopcloud.tech/abra/](https://docs.coopcloud.tech/abra/) for help on install, upgrade, hacking, troubleshooting & more!
|
||||||
|
|
||||||
```bash
|
|
||||||
curl https://install.abra.autonomic.zone | bash
|
|
||||||
```
|
|
||||||
|
|
||||||
Or using the latest release candidate (extra experimental!):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl https://install.abra.autonomic.zone | bash -s -- --rc
|
|
||||||
```
|
|
||||||
|
|
||||||
Source for this script is in [scripts/installer/installer](./scripts/installer/installer).
|
|
||||||
|
|
||||||
## Hacking
|
|
||||||
|
|
||||||
### Getting started
|
|
||||||
|
|
||||||
Install [direnv](https://direnv.net), run `cp .envrc.sample .envrc`, then run `direnv allow` in this directory. This will set coopcloud repos as private due to [this bug.](https://git.coopcloud.tech/coop-cloud/coopcloud.tech/issues/20#issuecomment-8201). Or you can run `go env -w GOPRIVATE=coopcloud.tech` but I'm not sure how persistent this is.
|
|
||||||
|
|
||||||
Install [Go >= 1.16](https://golang.org/doc/install) and then:
|
|
||||||
|
|
||||||
- `make build` to build
|
|
||||||
- `./abra` to run commands
|
|
||||||
- `make test` will run tests
|
|
||||||
- `make install` will install it to `$GOPATH/bin`
|
|
||||||
- `go get <package>` and `go mod tidy` to add a new dependency
|
|
||||||
|
|
||||||
Our [Drone CI configuration](.drone.yml) runs a number of sanity on each pushed commit. See the [Makefile](./Makefile) for more handy targets.
|
|
||||||
|
|
||||||
Please use the [conventional commit format](https://www.conventionalcommits.org/en/v1.0.0/) for your commits so we can automate our change log.
|
|
||||||
|
|
||||||
### Versioning
|
|
||||||
|
|
||||||
We use [goreleaser](https://goreleaser.com) to help us automate releases. We use [semver](https://semver.org) for versioning all releases of the tool. While we are still in the public alpha release phase, we will maintain a `0.y.z-alpha` format. Change logs are generated from our commit logs. We are still working this out and aim to refine our release praxis as we go.
|
|
||||||
|
|
||||||
For developers, while using this `-alpha` format, the `y` part is the "major" version part. So, if you make breaking changes, you increment that and _not_ the `x` part. So, if you're on `0.1.0-alpha`, then you'd go to `0.1.1-alpha` for a backwards compatible change and `0.2.0-alpha` for a backwards incompatible change.
|
|
||||||
|
|
||||||
### Making a new release
|
|
||||||
|
|
||||||
- Change `ABRA_VERSION` to match the new tag in [`scripts`](./scripts/installer/installer) (use [semver](https://semver.org))
|
|
||||||
- Commit that change (e.g. `git commit -m 'chore: publish next tag x.y.z-alpha'`)
|
|
||||||
- Make a new tag (e.g. `git tag -a x.y.z-alpha`)
|
|
||||||
- Push the new tag (e.g. `git push && git push --tags`)
|
|
||||||
- Wait until the build finishes on [build.coopcloud.tech](https://build.coopcloud.tech/coop-cloud/abra)
|
|
||||||
- Deploy the new installer script (e.g. `cd ./scripts/installer && make`)
|
|
||||||
- Check the release worked, (e.g. `abra upgrade; abra -v`)
|
|
||||||
|
|
||||||
### Fork maintenance
|
|
||||||
|
|
||||||
#### `godotenv`
|
|
||||||
|
|
||||||
We maintain a fork of [godotenv](https://github.com/Autonomic-Cooperative/godotenv) for two features:
|
|
||||||
|
|
||||||
1. multi-line env var support
|
|
||||||
2. inline comment parsing
|
|
||||||
|
|
||||||
You can upgrade the version here by running `go get github.com/Autonomic-Cooperative/godotenv@<commit>` where `<commit>` is the latest commit you want to pin to. At time of writing, `go get github.com/Autonomic-Cooperative/godotenv@b031ea1211e7fd297af4c7747ffb562ebe00cd33` is the command you want to run to maintain the above functionality.
|
|
||||||
|
|
||||||
#### `docker/client`
|
|
||||||
|
|
||||||
A number of modules in [pkg/upstream](./pkg/upstream) are copy/pasta'd from the upstream [docker/docker/client](https://pkg.go.dev/github.com/docker/docker/client). We had to do this because upstream are not exposing their API as public.
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ var AppCommand = cli.Command{
|
||||||
Name: "app",
|
Name: "app",
|
||||||
Aliases: []string{"a"},
|
Aliases: []string{"a"},
|
||||||
Usage: "Manage apps",
|
Usage: "Manage apps",
|
||||||
ArgsUsage: "<app>",
|
ArgsUsage: "<domain>",
|
||||||
Description: "This command provides functionality for managing the life cycle of your apps",
|
Description: "This command provides functionality for managing the life cycle of your apps",
|
||||||
Subcommands: []cli.Command{
|
Subcommands: []cli.Command{
|
||||||
appNewCommand,
|
appNewCommand,
|
||||||
|
|
|
@ -16,16 +16,15 @@ var appCheckCommand = cli.Command{
|
||||||
Name: "check",
|
Name: "check",
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
Usage: "Check if app is configured correctly",
|
Usage: "Check if app is configured correctly",
|
||||||
ArgsUsage: "<service>",
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
envSamplePath := path.Join(config.RECIPES_DIR, app.Type, ".env.sample")
|
envSamplePath := path.Join(config.RECIPES_DIR, app.Recipe, ".env.sample")
|
||||||
if _, err := os.Stat(envSamplePath); err != nil {
|
if _, err := os.Stat(envSamplePath); err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
logrus.Fatalf("%s does not exist?", envSamplePath)
|
logrus.Fatalf("%s does not exist?", envSamplePath)
|
||||||
|
|
|
@ -14,12 +14,12 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var appConfigCommand = cli.Command{
|
var appConfigCommand = cli.Command{
|
||||||
Name: "config",
|
Name: "config",
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
Usage: "Edit app config",
|
Usage: "Edit app config",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
|
|
@ -22,7 +22,7 @@ import (
|
||||||
var appCpCommand = cli.Command{
|
var appCpCommand = cli.Command{
|
||||||
Name: "cp",
|
Name: "cp",
|
||||||
Aliases: []string{"c"},
|
Aliases: []string{"c"},
|
||||||
ArgsUsage: "<src> <dst>",
|
ArgsUsage: "<domain> <src> <dst>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
@ -34,12 +34,11 @@ This command supports copying files to and from any app service file system.
|
||||||
|
|
||||||
If you want to copy a myfile.txt to the root of the app service:
|
If you want to copy a myfile.txt to the root of the app service:
|
||||||
|
|
||||||
abra app cp <app> myfile.txt app:/
|
abra app cp <domain> myfile.txt app:/
|
||||||
|
|
||||||
And if you want to copy that file back to your current working directory locally:
|
And if you want to copy that file back to your current working directory locally:
|
||||||
|
|
||||||
abra app cp <app> app:/myfile.txt .
|
abra app cp <domain> app:/myfile.txt .
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
@ -106,25 +105,15 @@ func configureAndCp(
|
||||||
dstPath string,
|
dstPath string,
|
||||||
service string,
|
service string,
|
||||||
isToContainer bool) error {
|
isToContainer bool) error {
|
||||||
appFiles, err := config.LoadAppFiles("")
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
appEnv, err := config.GetApp(appFiles, app.Name)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cl, err := client.New(app.Server)
|
cl, err := client.New(app.Server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
|
filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), service))
|
||||||
|
|
||||||
container, err := container.GetContainer(context.Background(), cl, filters, true)
|
container, err := container.GetContainer(context.Background(), cl, filters, internal.NoInput)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -157,5 +146,6 @@ func configureAndCp(
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,9 +7,10 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var appDeployCommand = cli.Command{
|
var appDeployCommand = cli.Command{
|
||||||
Name: "deploy",
|
Name: "deploy",
|
||||||
Aliases: []string{"d"},
|
Aliases: []string{"d"},
|
||||||
Usage: "Deploy an app",
|
Usage: "Deploy an app",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
@ -21,7 +22,7 @@ var appDeployCommand = cli.Command{
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
This command deploys an app. It does not support incrementing the version of a
|
This command deploys an app. It does not support incrementing the version of a
|
||||||
deployed app, for this you need to look at the "abra app upgrade <app>"
|
deployed app, for this you need to look at the "abra app upgrade <domain>"
|
||||||
command.
|
command.
|
||||||
|
|
||||||
You may pass "--force" to re-deploy the same version again. This can be useful
|
You may pass "--force" to re-deploy the same version again. This can be useful
|
||||||
|
|
|
@ -20,8 +20,9 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var appErrorsCommand = cli.Command{
|
var appErrorsCommand = cli.Command{
|
||||||
Name: "errors",
|
Name: "errors",
|
||||||
Usage: "List errors for a deployed app",
|
Usage: "List errors for a deployed app",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Description: `
|
Description: `
|
||||||
This command lists errors for a deployed app.
|
This command lists errors for a deployed app.
|
||||||
|
|
||||||
|
@ -40,15 +41,13 @@ Got any more ideas? Please let us know:
|
||||||
|
|
||||||
https://git.coopcloud.tech/coop-cloud/organising/issues/new/choose
|
https://git.coopcloud.tech/coop-cloud/organising/issues/new/choose
|
||||||
|
|
||||||
This command is best accompanied by "abra app logs <app>" which may reveal
|
This command is best accompanied by "abra app logs <domain>" which may reveal
|
||||||
further information which can help you debug the cause of an app failure via
|
further information which can help you debug the cause of an app failure via
|
||||||
the logs.
|
the logs.
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Aliases: []string{"e"},
|
Aliases: []string{"e"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
internal.WatchFlag,
|
internal.WatchFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
|
@ -89,7 +88,7 @@ the logs.
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
|
func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
|
||||||
recipe, err := recipe.Get(app.Type)
|
recipe, err := recipe.Get(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,12 +22,12 @@ var statusFlag = &cli.BoolFlag{
|
||||||
Destination: &status,
|
Destination: &status,
|
||||||
}
|
}
|
||||||
|
|
||||||
var appType string
|
var appRecipe string
|
||||||
var typeFlag = &cli.StringFlag{
|
var recipeFlag = &cli.StringFlag{
|
||||||
Name: "type, t",
|
Name: "recipe, r",
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Show apps of a specific type",
|
Usage: "Show apps of a specific recipe",
|
||||||
Destination: &appType,
|
Destination: &appRecipe,
|
||||||
}
|
}
|
||||||
|
|
||||||
var listAppServer string
|
var listAppServer string
|
||||||
|
@ -68,13 +68,12 @@ in ~/.abra/) to generate a report of all your apps.
|
||||||
By passing the "--status/-S" flag, you can query all your servers for the
|
By passing the "--status/-S" flag, you can query all your servers for the
|
||||||
actual live deployment status. Depending on how many servers you manage, this
|
actual live deployment status. Depending on how many servers you manage, this
|
||||||
can take some time.
|
can take some time.
|
||||||
`,
|
`,
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
statusFlag,
|
statusFlag,
|
||||||
listAppServerFlag,
|
listAppServerFlag,
|
||||||
typeFlag,
|
recipeFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
@ -88,7 +87,7 @@ can take some time.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sort.Sort(config.ByServerAndType(apps))
|
sort.Sort(config.ByServerAndRecipe(apps))
|
||||||
|
|
||||||
statuses := make(map[string]map[string]string)
|
statuses := make(map[string]map[string]string)
|
||||||
var catl recipe.RecipeCatalogue
|
var catl recipe.RecipeCatalogue
|
||||||
|
@ -123,14 +122,14 @@ can take some time.
|
||||||
var ok bool
|
var ok bool
|
||||||
if stats, ok = allStats[app.Server]; !ok {
|
if stats, ok = allStats[app.Server]; !ok {
|
||||||
stats = serverStatus{}
|
stats = serverStatus{}
|
||||||
if appType == "" {
|
if appRecipe == "" {
|
||||||
// count server, no filtering
|
// count server, no filtering
|
||||||
totalServersCount++
|
totalServersCount++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if app.Type == appType || appType == "" {
|
if app.Recipe == appRecipe || appRecipe == "" {
|
||||||
if appType != "" {
|
if appRecipe != "" {
|
||||||
// only count server if matches filter
|
// only count server if matches filter
|
||||||
totalServersCount++
|
totalServersCount++
|
||||||
}
|
}
|
||||||
|
@ -161,7 +160,7 @@ can take some time.
|
||||||
|
|
||||||
var newUpdates []string
|
var newUpdates []string
|
||||||
if version != "unknown" {
|
if version != "unknown" {
|
||||||
updates, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
|
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -198,7 +197,7 @@ can take some time.
|
||||||
}
|
}
|
||||||
|
|
||||||
appStats.server = app.Server
|
appStats.server = app.Server
|
||||||
appStats.recipe = app.Type
|
appStats.recipe = app.Recipe
|
||||||
appStats.appName = app.Name
|
appStats.appName = app.Name
|
||||||
appStats.domain = app.Domain
|
appStats.domain = app.Domain
|
||||||
|
|
||||||
|
@ -216,7 +215,7 @@ can take some time.
|
||||||
|
|
||||||
serverStat := allStats[app.Server]
|
serverStat := allStats[app.Server]
|
||||||
|
|
||||||
tableCol := []string{"recipe", "domain", "app name"}
|
tableCol := []string{"recipe", "domain"}
|
||||||
if status {
|
if status {
|
||||||
tableCol = append(tableCol, []string{"status", "version", "upgrade"}...)
|
tableCol = append(tableCol, []string{"status", "version", "upgrade"}...)
|
||||||
}
|
}
|
||||||
|
@ -224,7 +223,7 @@ can take some time.
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
for _, appStat := range serverStat.apps {
|
for _, appStat := range serverStat.apps {
|
||||||
tableRow := []string{appStat.recipe, appStat.domain, appStat.appName}
|
tableRow := []string{appStat.recipe, appStat.domain}
|
||||||
if status {
|
if status {
|
||||||
tableRow = append(tableRow, []string{appStat.status, appStat.version, appStat.upgrade}...)
|
tableRow = append(tableRow, []string{appStat.status, appStat.version, appStat.upgrade}...)
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,12 +67,11 @@ func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
|
||||||
var appLogsCommand = cli.Command{
|
var appLogsCommand = cli.Command{
|
||||||
Name: "logs",
|
Name: "logs",
|
||||||
Aliases: []string{"l"},
|
Aliases: []string{"l"},
|
||||||
ArgsUsage: "[<service>]",
|
ArgsUsage: "<domain> [<service>]",
|
||||||
Usage: "Tail app logs",
|
Usage: "Tail app logs",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.StdErrOnlyFlag,
|
internal.StdErrOnlyFlag,
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.AppNameComplete,
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
@ -86,7 +85,7 @@ var appLogsCommand = cli.Command{
|
||||||
|
|
||||||
serviceName := c.Args().Get(1)
|
serviceName := c.Args().Get(1)
|
||||||
if serviceName == "" {
|
if serviceName == "" {
|
||||||
logrus.Debugf("tailing logs for all %s services", app.Type)
|
logrus.Debugf("tailing logs for all %s services", app.Recipe)
|
||||||
stackLogs(c, app.StackName(), cl)
|
stackLogs(c, app.StackName(), cl)
|
||||||
} else {
|
} else {
|
||||||
logrus.Debugf("tailing logs for %s", serviceName)
|
logrus.Debugf("tailing logs for %s", serviceName)
|
||||||
|
|
|
@ -11,7 +11,7 @@ This command takes a recipe and uses it to create a new app. This new app
|
||||||
configuration is stored in your ~/.abra directory under the appropriate server.
|
configuration is stored in your ~/.abra directory under the appropriate server.
|
||||||
|
|
||||||
This command does not deploy your app for you. You will need to run "abra app
|
This command does not deploy your app for you. You will need to run "abra app
|
||||||
deploy <app>" to do so.
|
deploy <domain>" to do so.
|
||||||
|
|
||||||
You can see what recipes are available (i.e. values for the <recipe> argument)
|
You can see what recipes are available (i.e. values for the <recipe> argument)
|
||||||
by running "abra recipe ls".
|
by running "abra recipe ls".
|
||||||
|
@ -36,12 +36,11 @@ var appNewCommand = cli.Command{
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
internal.NewAppServerFlag,
|
internal.NewAppServerFlag,
|
||||||
internal.DomainFlag,
|
internal.DomainFlag,
|
||||||
internal.NewAppNameFlag,
|
|
||||||
internal.PassFlag,
|
internal.PassFlag,
|
||||||
internal.SecretsFlag,
|
internal.SecretsFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "[<recipe>]",
|
||||||
Action: internal.NewAction,
|
Action: internal.NewAction,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,11 +25,11 @@ var appPsCommand = cli.Command{
|
||||||
Name: "ps",
|
Name: "ps",
|
||||||
Aliases: []string{"p"},
|
Aliases: []string{"p"},
|
||||||
Usage: "Check app status",
|
Usage: "Check app status",
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Description: "This command shows a more detailed status output of a specific deployed app.",
|
Description: "This command shows a more detailed status output of a specific deployed app.",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.WatchFlag,
|
internal.WatchFlag,
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.AppNameComplete,
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
|
|
@ -21,14 +21,15 @@ var Volumes bool
|
||||||
|
|
||||||
// VolumesFlag is used to specify if volumes should be deleted when deleting an app
|
// VolumesFlag is used to specify if volumes should be deleted when deleting an app
|
||||||
var VolumesFlag = &cli.BoolFlag{
|
var VolumesFlag = &cli.BoolFlag{
|
||||||
Name: "volumes",
|
Name: "volumes, V",
|
||||||
Destination: &Volumes,
|
Destination: &Volumes,
|
||||||
}
|
}
|
||||||
|
|
||||||
var appRemoveCommand = cli.Command{
|
var appRemoveCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Aliases: []string{"rm"},
|
Aliases: []string{"rm"},
|
||||||
Usage: "Remove an already undeployed app",
|
ArgsUsage: "<domain>",
|
||||||
|
Usage: "Remove an already undeployed app",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
VolumesFlag,
|
VolumesFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
|
@ -39,7 +40,7 @@ var appRemoveCommand = cli.Command{
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
response := false
|
response := false
|
||||||
prompt := &survey.Confirm{
|
prompt := &survey.Confirm{
|
||||||
Message: fmt.Sprintf("about to remove %s, are you sure?", app.Name),
|
Message: fmt.Sprintf("about to remove %s, are you sure?", app.Name),
|
||||||
|
@ -62,7 +63,7 @@ var appRemoveCommand = cli.Command{
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if isDeployed {
|
if isDeployed {
|
||||||
logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s \" or pass --force", app.Name, app.Name)
|
logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
fs := filters.NewArgs()
|
fs := filters.NewArgs()
|
||||||
|
@ -83,7 +84,7 @@ var appRemoveCommand = cli.Command{
|
||||||
if len(secrets) > 0 {
|
if len(secrets) > 0 {
|
||||||
var secretNamesToRemove []string
|
var secretNamesToRemove []string
|
||||||
|
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
secretsPrompt := &survey.MultiSelect{
|
secretsPrompt := &survey.MultiSelect{
|
||||||
Message: "which secrets do you want to remove?",
|
Message: "which secrets do you want to remove?",
|
||||||
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
||||||
|
@ -96,6 +97,10 @@ var appRemoveCommand = cli.Command{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if internal.Force || internal.NoInput {
|
||||||
|
secretNamesToRemove = secretNames
|
||||||
|
}
|
||||||
|
|
||||||
for _, name := range secretNamesToRemove {
|
for _, name := range secretNamesToRemove {
|
||||||
err := cl.SecretRemove(context.Background(), secrets[name])
|
err := cl.SecretRemove(context.Background(), secrets[name])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -121,7 +126,7 @@ var appRemoveCommand = cli.Command{
|
||||||
if len(vols) > 0 {
|
if len(vols) > 0 {
|
||||||
if Volumes {
|
if Volumes {
|
||||||
var removeVols []string
|
var removeVols []string
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
volumesPrompt := &survey.MultiSelect{
|
volumesPrompt := &survey.MultiSelect{
|
||||||
Message: "which volumes do you want to remove?",
|
Message: "which volumes do you want to remove?",
|
||||||
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
||||||
|
@ -133,6 +138,7 @@ var appRemoveCommand = cli.Command{
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, vol := range removeVols {
|
for _, vol := range removeVols {
|
||||||
err := cl.VolumeRemove(context.Background(), vol, internal.Force) // last argument is for force removing
|
err := cl.VolumeRemove(context.Background(), vol, internal.Force) // last argument is for force removing
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -18,10 +18,9 @@ var appRestartCommand = cli.Command{
|
||||||
Name: "restart",
|
Name: "restart",
|
||||||
Aliases: []string{"re"},
|
Aliases: []string{"re"},
|
||||||
Usage: "Restart an app",
|
Usage: "Restart an app",
|
||||||
ArgsUsage: "<service>",
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Description: `This command restarts a service within a deployed app.`,
|
Description: `This command restarts a service within a deployed app.`,
|
||||||
|
|
|
@ -22,12 +22,13 @@ var appRollbackCommand = cli.Command{
|
||||||
Name: "rollback",
|
Name: "rollback",
|
||||||
Aliases: []string{"rl"},
|
Aliases: []string{"rl"},
|
||||||
Usage: "Roll an app back to a previous version",
|
Usage: "Roll an app back to a previous version",
|
||||||
ArgsUsage: "<app>",
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
|
internal.NoDomainChecksFlag,
|
||||||
internal.DontWaitConvergeFlag,
|
internal.DontWaitConvergeFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
|
@ -50,12 +51,12 @@ recipes.
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureUpToDate(app.Type); err != nil {
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
r, err := recipe.Get(app.Type)
|
r, err := recipe.Get(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -85,13 +86,13 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
versions, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versions) == 0 && !internal.Chaos {
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Type)
|
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
|
||||||
}
|
}
|
||||||
|
|
||||||
var availableDowngrades []string
|
var availableDowngrades []string
|
||||||
|
@ -125,7 +126,7 @@ recipes.
|
||||||
|
|
||||||
var chosenDowngrade string
|
var chosenDowngrade string
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if internal.Force {
|
if internal.Force || internal.NoInput {
|
||||||
chosenDowngrade = availableDowngrades[0]
|
chosenDowngrade = availableDowngrades[0]
|
||||||
logrus.Debugf("choosing %s as version to downgrade to (--force)", chosenDowngrade)
|
logrus.Debugf("choosing %s as version to downgrade to (--force)", chosenDowngrade)
|
||||||
} else {
|
} else {
|
||||||
|
@ -140,7 +141,7 @@ recipes.
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureVersion(app.Type, chosenDowngrade); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, chosenDowngrade); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -148,13 +149,13 @@ recipes.
|
||||||
if internal.Chaos {
|
if internal.Chaos {
|
||||||
logrus.Warn("chaos mode engaged")
|
logrus.Warn("chaos mode engaged")
|
||||||
var err error
|
var err error
|
||||||
chosenDowngrade, err = recipe.ChaosVersion(app.Type)
|
chosenDowngrade, err = recipe.ChaosVersion(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Type, "abra.sh")
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -163,7 +164,7 @@ recipes.
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,14 +19,14 @@ import (
|
||||||
|
|
||||||
var user string
|
var user string
|
||||||
var userFlag = &cli.StringFlag{
|
var userFlag = &cli.StringFlag{
|
||||||
Name: "user",
|
Name: "user, u",
|
||||||
Value: "",
|
Value: "",
|
||||||
Destination: &user,
|
Destination: &user,
|
||||||
}
|
}
|
||||||
|
|
||||||
var noTTY bool
|
var noTTY bool
|
||||||
var noTTYFlag = &cli.BoolFlag{
|
var noTTYFlag = &cli.BoolFlag{
|
||||||
Name: "no-tty",
|
Name: "no-tty, t",
|
||||||
Destination: &noTTY,
|
Destination: &noTTY,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,12 +35,11 @@ var appRunCommand = cli.Command{
|
||||||
Aliases: []string{"r"},
|
Aliases: []string{"r"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
noTTYFlag,
|
noTTYFlag,
|
||||||
userFlag,
|
userFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
ArgsUsage: "<service> <args>...",
|
ArgsUsage: "<domain> <service> <args>...",
|
||||||
Usage: "Run a command in a service container",
|
Usage: "Run a command in a service container",
|
||||||
BashComplete: autocomplete.AppNameComplete,
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
@ -64,7 +63,7 @@ var appRunCommand = cli.Command{
|
||||||
filters := filters.NewArgs()
|
filters := filters.NewArgs()
|
||||||
filters.Add("name", stackAndServiceName)
|
filters.Add("name", stackAndServiceName)
|
||||||
|
|
||||||
targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, true)
|
targetContainer, err := containerPkg.GetContainer(context.Background(), cl, filters, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,10 +10,12 @@ import (
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/autocomplete"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/formatter"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/secret"
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
|
dockerClient "github.com/docker/docker/client"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
@ -25,15 +27,22 @@ var allSecretsFlag = &cli.BoolFlag{
|
||||||
Usage: "Generate all secrets",
|
Usage: "Generate all secrets",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var rmAllSecrets bool
|
||||||
|
var rmAllSecretsFlag = &cli.BoolFlag{
|
||||||
|
Name: "all, a",
|
||||||
|
Destination: &rmAllSecrets,
|
||||||
|
Usage: "Remove all secrets",
|
||||||
|
}
|
||||||
|
|
||||||
var appSecretGenerateCommand = cli.Command{
|
var appSecretGenerateCommand = cli.Command{
|
||||||
Name: "generate",
|
Name: "generate",
|
||||||
Aliases: []string{"g"},
|
Aliases: []string{"g"},
|
||||||
Usage: "Generate secrets",
|
Usage: "Generate secrets",
|
||||||
ArgsUsage: "<secret> <version>",
|
ArgsUsage: "<domain> <secret> <version>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
allSecretsFlag,
|
||||||
allSecretsFlag, internal.PassFlag,
|
internal.PassFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.AppNameComplete,
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
|
@ -62,8 +71,10 @@ var appSecretGenerateCommand = cli.Command{
|
||||||
parsed := secret.ParseSecretEnvVarName(sec)
|
parsed := secret.ParseSecretEnvVarName(sec)
|
||||||
if secretName == parsed {
|
if secretName == parsed {
|
||||||
secretsToCreate[sec] = secretVersion
|
secretsToCreate[sec] = secretVersion
|
||||||
|
matches = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !matches {
|
if !matches {
|
||||||
logrus.Fatalf("%s doesn't exist in the env config?", secretName)
|
logrus.Fatalf("%s doesn't exist in the env config?", secretName)
|
||||||
}
|
}
|
||||||
|
@ -76,7 +87,7 @@ var appSecretGenerateCommand = cli.Command{
|
||||||
|
|
||||||
if internal.Pass {
|
if internal.Pass {
|
||||||
for name, data := range secretVals {
|
for name, data := range secretVals {
|
||||||
if err := secret.PassInsertSecret(data, name, app.StackName(), app.Server); err != nil {
|
if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -105,11 +116,10 @@ var appSecretInsertCommand = cli.Command{
|
||||||
Usage: "Insert secret",
|
Usage: "Insert secret",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
internal.PassFlag,
|
internal.PassFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
ArgsUsage: "<app> <secret-name> <version> <data>",
|
ArgsUsage: "<domain> <secret-name> <version> <data>",
|
||||||
BashComplete: autocomplete.AppNameComplete,
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Description: `
|
Description: `
|
||||||
This command inserts a secret into an app environment.
|
This command inserts a secret into an app environment.
|
||||||
|
@ -139,8 +149,10 @@ Example:
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logrus.Infof("%s successfully stored on server", secretName)
|
||||||
|
|
||||||
if internal.Pass {
|
if internal.Pass {
|
||||||
if err := secret.PassInsertSecret(data, name, app.StackName(), app.Server); err != nil {
|
if err := secret.PassInsertSecret(data, name, app.Name, app.Server); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -149,6 +161,25 @@ Example:
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// secretRm removes a secret.
|
||||||
|
func secretRm(cl *dockerClient.Client, app config.App, secretName, parsed string) error {
|
||||||
|
if err := cl.SecretRemove(context.Background(), secretName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("deleted %s successfully from server", secretName)
|
||||||
|
|
||||||
|
if internal.PassRemove {
|
||||||
|
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("deleted %s successfully from local pass store", secretName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
var appSecretRmCommand = cli.Command{
|
var appSecretRmCommand = cli.Command{
|
||||||
Name: "remove",
|
Name: "remove",
|
||||||
Aliases: []string{"rm"},
|
Aliases: []string{"rm"},
|
||||||
|
@ -156,27 +187,28 @@ var appSecretRmCommand = cli.Command{
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
allSecretsFlag, internal.PassFlag,
|
rmAllSecretsFlag,
|
||||||
|
internal.PassRemoveFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
ArgsUsage: "<app> <secret-name>",
|
ArgsUsage: "<domain> [<secret-name>]",
|
||||||
BashComplete: autocomplete.AppNameComplete,
|
BashComplete: autocomplete.AppNameComplete,
|
||||||
Description: `
|
Description: `
|
||||||
This command removes a secret from an app environment.
|
This command removes app secrets.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
abra app secret remove myapp db_pass
|
abra app secret remove myapp db_pass
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
secrets := secret.ReadSecretEnvVars(app.Env)
|
||||||
|
|
||||||
if c.Args().Get(1) != "" && allSecrets {
|
if c.Args().Get(1) != "" && rmAllSecrets {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("cannot use '<secret-name>' and '--all' together"))
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Args().Get(1) == "" && !allSecrets {
|
if c.Args().Get(1) == "" && !rmAllSecrets {
|
||||||
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -192,42 +224,49 @@ Example:
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretToRm := c.Args().Get(1)
|
remoteSecretNames := make(map[string]bool)
|
||||||
for _, cont := range secretList {
|
for _, cont := range secretList {
|
||||||
secretName := cont.Spec.Annotations.Name
|
remoteSecretNames[cont.Spec.Annotations.Name] = true
|
||||||
parsed := secret.ParseGeneratedSecretName(secretName, app)
|
}
|
||||||
if allSecrets {
|
|
||||||
if err := cl.SecretRemove(context.Background(), secretName); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
logrus.Infof("deleted %s successfully from server", secretName)
|
|
||||||
|
|
||||||
if internal.Pass {
|
match := false
|
||||||
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
secretToRm := c.Args().Get(1)
|
||||||
logrus.Fatal(err)
|
for sec := range secrets {
|
||||||
}
|
secretName := secret.ParseSecretEnvVarName(sec)
|
||||||
|
|
||||||
logrus.Infof("deleted %s successfully from local pass store", secretName)
|
secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
|
||||||
}
|
if err != nil {
|
||||||
} else {
|
logrus.Fatal(err)
|
||||||
if parsed == secretToRm {
|
}
|
||||||
if err := cl.SecretRemove(context.Background(), secretName); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Infof("deleted %s successfully from server", secretName)
|
secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
|
||||||
|
if _, ok := remoteSecretNames[secretRemoteName]; ok {
|
||||||
if internal.Pass {
|
if secretToRm != "" {
|
||||||
if err := secret.PassRmSecret(parsed, app.StackName(), app.Server); err != nil {
|
if secretName == secretToRm {
|
||||||
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Infof("deleted %s successfully from local pass store", secretName)
|
return nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
match = true
|
||||||
|
|
||||||
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !match && secretToRm != "" {
|
||||||
|
logrus.Fatalf("%s doesn't exist on server?", secretToRm)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !match {
|
||||||
|
logrus.Fatal("no secrets to remove?")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -237,7 +276,6 @@ var appSecretLsCommand = cli.Command{
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Usage: "List all secrets",
|
Usage: "List all secrets",
|
||||||
|
@ -295,7 +333,7 @@ var appSecretCommand = cli.Command{
|
||||||
Name: "secret",
|
Name: "secret",
|
||||||
Aliases: []string{"s"},
|
Aliases: []string{"s"},
|
||||||
Usage: "Manage app secrets",
|
Usage: "Manage app secrets",
|
||||||
ArgsUsage: "<command>",
|
ArgsUsage: "<domain>",
|
||||||
Subcommands: []cli.Command{
|
Subcommands: []cli.Command{
|
||||||
appSecretGenerateCommand,
|
appSecretGenerateCommand,
|
||||||
appSecretInsertCommand,
|
appSecretInsertCommand,
|
||||||
|
|
|
@ -12,8 +12,9 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var appUndeployCommand = cli.Command{
|
var appUndeployCommand = cli.Command{
|
||||||
Name: "undeploy",
|
Name: "undeploy",
|
||||||
Aliases: []string{"un"},
|
Aliases: []string{"un"},
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
|
|
@ -21,13 +21,14 @@ var appUpgradeCommand = cli.Command{
|
||||||
Name: "upgrade",
|
Name: "upgrade",
|
||||||
Aliases: []string{"up"},
|
Aliases: []string{"up"},
|
||||||
Usage: "Upgrade an app",
|
Usage: "Upgrade an app",
|
||||||
ArgsUsage: "<app>",
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
internal.ForceFlag,
|
internal.ForceFlag,
|
||||||
internal.ChaosFlag,
|
internal.ChaosFlag,
|
||||||
internal.NoDomainChecksFlag,
|
internal.NoDomainChecksFlag,
|
||||||
|
internal.DontWaitConvergeFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
|
@ -35,7 +36,7 @@ This command supports upgrading an app. You can use it to choose and roll out a
|
||||||
new upgrade to an existing app.
|
new upgrade to an existing app.
|
||||||
|
|
||||||
This command specifically supports incrementing the version of running apps, as
|
This command specifically supports incrementing the version of running apps, as
|
||||||
opposed to "abra app deploy <app>" which will not change the version of a
|
opposed to "abra app deploy <domain>" which will not change the version of a
|
||||||
deployed app.
|
deployed app.
|
||||||
|
|
||||||
You may pass "--force/-f" to upgrade to the same version again. This can be
|
You may pass "--force/-f" to upgrade to the same version again. This can be
|
||||||
|
@ -53,12 +54,12 @@ recipes.
|
||||||
stackName := app.StackName()
|
stackName := app.StackName()
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureUpToDate(app.Type); err != nil {
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
r, err := recipe.Get(app.Type)
|
r, err := recipe.Get(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -88,17 +89,17 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
versions, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versions) == 0 && !internal.Chaos {
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Type)
|
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
|
||||||
}
|
}
|
||||||
|
|
||||||
var availableUpgrades []string
|
var availableUpgrades []string
|
||||||
if deployedVersion == "uknown" {
|
if deployedVersion == "unknown" {
|
||||||
availableUpgrades = versions
|
availableUpgrades = versions
|
||||||
logrus.Warnf("failed to determine version of deployed %s", app.Name)
|
logrus.Warnf("failed to determine version of deployed %s", app.Name)
|
||||||
}
|
}
|
||||||
|
@ -128,7 +129,7 @@ recipes.
|
||||||
|
|
||||||
var chosenUpgrade string
|
var chosenUpgrade string
|
||||||
if len(availableUpgrades) > 0 && !internal.Chaos {
|
if len(availableUpgrades) > 0 && !internal.Chaos {
|
||||||
if internal.Force {
|
if internal.Force || internal.NoInput {
|
||||||
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
||||||
logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
|
logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
|
||||||
} else {
|
} else {
|
||||||
|
@ -145,13 +146,13 @@ recipes.
|
||||||
// if release notes written after git tag published, read them before we
|
// if release notes written after git tag published, read them before we
|
||||||
// check out the tag and then they'll appear to be missing. this covers
|
// check out the tag and then they'll appear to be missing. this covers
|
||||||
// when we obviously will forget to write release notes before publishing
|
// when we obviously will forget to write release notes before publishing
|
||||||
releaseNotes, err := internal.GetReleaseNotes(app.Type, chosenUpgrade)
|
releaseNotes, err := internal.GetReleaseNotes(app.Recipe, chosenUpgrade)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Chaos {
|
if !internal.Chaos {
|
||||||
if err := recipe.EnsureVersion(app.Type, chosenUpgrade); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, chosenUpgrade); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -159,13 +160,13 @@ recipes.
|
||||||
if internal.Chaos {
|
if internal.Chaos {
|
||||||
logrus.Warn("chaos mode engaged")
|
logrus.Warn("chaos mode engaged")
|
||||||
var err error
|
var err error
|
||||||
chosenUpgrade, err = recipe.ChaosVersion(app.Type)
|
chosenUpgrade, err = recipe.ChaosVersion(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Type, "abra.sh")
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -174,7 +175,7 @@ recipes.
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,8 +31,9 @@ func getImagePath(image string) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var appVersionCommand = cli.Command{
|
var appVersionCommand = cli.Command{
|
||||||
Name: "version",
|
Name: "version",
|
||||||
Aliases: []string{"v"},
|
Aliases: []string{"v"},
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
@ -68,7 +69,7 @@ Cloud recipe version.
|
||||||
logrus.Fatalf("%s is not deployed?", app.Name)
|
logrus.Fatalf("%s is not deployed?", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
recipeMeta, err := recipe.GetRecipeMeta(app.Type)
|
recipeMeta, err := recipe.GetRecipeMeta(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,8 +13,9 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var appVolumeListCommand = cli.Command{
|
var appVolumeListCommand = cli.Command{
|
||||||
Name: "list",
|
Name: "list",
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
|
ArgsUsage: "<domain>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
@ -25,18 +26,15 @@ var appVolumeListCommand = cli.Command{
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
volumeList, err := client.GetVolumes(context.Background(), app.Server, app.Name)
|
volumeList, err := client.GetVolumes(context.Background(), app.Server, app.StackName())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := formatter.CreateTable([]string{"driver", "volume name"})
|
table := formatter.CreateTable([]string{"name", "created", "mounted"})
|
||||||
var volTable [][]string
|
var volTable [][]string
|
||||||
for _, volume := range volumeList {
|
for _, volume := range volumeList {
|
||||||
volRow := []string{
|
volRow := []string{volume.Name, volume.CreatedAt, volume.Mountpoint}
|
||||||
volume.Driver,
|
|
||||||
volume.Name,
|
|
||||||
}
|
|
||||||
volTable = append(volTable, volRow)
|
volTable = append(volTable, volRow)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,15 +56,15 @@ var appVolumeRemoveCommand = cli.Command{
|
||||||
Description: `
|
Description: `
|
||||||
This command supports removing volumes associated with an app. The app in
|
This command supports removing volumes associated with an app. The app in
|
||||||
question must be undeployed before you try to remove volumes. See "abra app
|
question must be undeployed before you try to remove volumes. See "abra app
|
||||||
undeploy <app>" for more.
|
undeploy <domain>" for more.
|
||||||
|
|
||||||
The command is interactive and will show a multiple select input which allows
|
The command is interactive and will show a multiple select input which allows
|
||||||
you to make a seclection. Use the "?" key to see more help on navigating this
|
you to make a seclection. Use the "?" key to see more help on navigating this
|
||||||
interface.
|
interface.
|
||||||
|
|
||||||
Passing "--force" will select all volumes for removal. Be careful.
|
Passing "--force/-f" will select all volumes for removal. Be careful.
|
||||||
`,
|
`,
|
||||||
ArgsUsage: "<app>",
|
ArgsUsage: "<domain>",
|
||||||
Aliases: []string{"rm"},
|
Aliases: []string{"rm"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
|
@ -77,14 +75,14 @@ Passing "--force" will select all volumes for removal. Be careful.
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
app := internal.ValidateApp(c)
|
app := internal.ValidateApp(c)
|
||||||
|
|
||||||
volumeList, err := client.GetVolumes(context.Background(), app.Server, app.Name)
|
volumeList, err := client.GetVolumes(context.Background(), app.Server, app.StackName())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
volumeNames := client.GetVolumeNames(volumeList)
|
volumeNames := client.GetVolumeNames(volumeList)
|
||||||
|
|
||||||
var volumesToRemove []string
|
var volumesToRemove []string
|
||||||
if !internal.Force {
|
if !internal.Force && !internal.NoInput {
|
||||||
volumesPrompt := &survey.MultiSelect{
|
volumesPrompt := &survey.MultiSelect{
|
||||||
Message: "which volumes do you want to remove?",
|
Message: "which volumes do you want to remove?",
|
||||||
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
Help: "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
|
||||||
|
@ -95,7 +93,9 @@ Passing "--force" will select all volumes for removal. Be careful.
|
||||||
if err := survey.AskOne(volumesPrompt, &volumesToRemove); err != nil {
|
if err := survey.AskOne(volumesPrompt, &volumesToRemove); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
|
||||||
|
if internal.Force || internal.NoInput {
|
||||||
volumesToRemove = volumeNames
|
volumesToRemove = volumeNames
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ var appVolumeCommand = cli.Command{
|
||||||
Name: "volume",
|
Name: "volume",
|
||||||
Aliases: []string{"vl"},
|
Aliases: []string{"vl"},
|
||||||
Usage: "Manage app volumes",
|
Usage: "Manage app volumes",
|
||||||
ArgsUsage: "<command>",
|
ArgsUsage: "<domain>",
|
||||||
Subcommands: []cli.Command{
|
Subcommands: []cli.Command{
|
||||||
appVolumeListCommand,
|
appVolumeListCommand,
|
||||||
appVolumeRemoveCommand,
|
appVolumeRemoveCommand,
|
||||||
|
|
|
@ -20,40 +20,42 @@ import (
|
||||||
|
|
||||||
// CatalogueSkipList is all the repos that are not recipes.
|
// CatalogueSkipList is all the repos that are not recipes.
|
||||||
var CatalogueSkipList = map[string]bool{
|
var CatalogueSkipList = map[string]bool{
|
||||||
"abra": true,
|
"abra": true,
|
||||||
"abra-apps": true,
|
"abra-apps": true,
|
||||||
"abra-aur": true,
|
"abra-aur": true,
|
||||||
"abra-bash": true,
|
"abra-bash": true,
|
||||||
"abra-capsul": true,
|
"abra-capsul": true,
|
||||||
"abra-gandi": true,
|
"abra-gandi": true,
|
||||||
"abra-hetzner": true,
|
"abra-hetzner": true,
|
||||||
"apps": true,
|
"apps": true,
|
||||||
"aur-abra-git": true,
|
"aur-abra-git": true,
|
||||||
"auto-apps-json": true,
|
"auto-apps-json": true,
|
||||||
"auto-mirror": true,
|
"auto-mirror": true,
|
||||||
"backup-bot": true,
|
"backup-bot": true,
|
||||||
"backup-bot-two": true,
|
"backup-bot-two": true,
|
||||||
"beta.coopcloud.tech": true,
|
"beta.coopcloud.tech": true,
|
||||||
"comrade-renovate-bot": true,
|
"comrade-renovate-bot": true,
|
||||||
"coopcloud.tech": true,
|
"coopcloud.tech": true,
|
||||||
"coturn": true,
|
"coturn": true,
|
||||||
"docker-cp-deploy": true,
|
"docker-cp-deploy": true,
|
||||||
"docker-dind-bats-kcov": true,
|
"docker-dind-bats-kcov": true,
|
||||||
"docs.coopcloud.tech": true,
|
"docs.coopcloud.tech": true,
|
||||||
"drone-abra": true,
|
"drone-abra": true,
|
||||||
"example": true,
|
"example": true,
|
||||||
"gardening": true,
|
"gardening": true,
|
||||||
"go-abra": true,
|
"go-abra": true,
|
||||||
"organising": true,
|
"organising": true,
|
||||||
"outline-with-patch": true,
|
"outline-with-patch": true,
|
||||||
"pyabra": true,
|
"pyabra": true,
|
||||||
"radicle-seed-node": true,
|
"radicle-seed-node": true,
|
||||||
"recipes": true,
|
"recipes-catalogue-json": true,
|
||||||
"stack-ssh-deploy": true,
|
"recipes-wishlist": true,
|
||||||
"swarm-cronjob": true,
|
"recipes.coopcloud.tech": true,
|
||||||
"tagcmp": true,
|
"stack-ssh-deploy": true,
|
||||||
"traefik-cert-dumper": true,
|
"swarm-cronjob": true,
|
||||||
"tyop": true,
|
"tagcmp": true,
|
||||||
|
"traefik-cert-dumper": true,
|
||||||
|
"tyop": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
var catalogueGenerateCommand = cli.Command{
|
var catalogueGenerateCommand = cli.Command{
|
||||||
|
@ -66,8 +68,6 @@ var catalogueGenerateCommand = cli.Command{
|
||||||
internal.PublishFlag,
|
internal.PublishFlag,
|
||||||
internal.DryFlag,
|
internal.DryFlag,
|
||||||
internal.SkipUpdatesFlag,
|
internal.SkipUpdatesFlag,
|
||||||
internal.RegistryUsernameFlag,
|
|
||||||
internal.RegistryPasswordFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Description: `
|
Description: `
|
||||||
|
@ -94,7 +94,7 @@ keys configured on your account.
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
if recipeName != "" {
|
if recipeName != "" {
|
||||||
internal.ValidateRecipe(c)
|
internal.ValidateRecipe(c, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
repos, err := recipe.ReadReposMetadata()
|
repos, err := recipe.ReadReposMetadata()
|
||||||
|
@ -132,13 +132,9 @@ keys configured on your account.
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
versions, err := recipe.GetRecipeVersions(
|
versions, err := recipe.GetRecipeVersions(recipeMeta.Name)
|
||||||
recipeMeta.Name,
|
|
||||||
internal.RegistryUsername,
|
|
||||||
internal.RegistryPassword,
|
|
||||||
)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Warn(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
|
features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
|
||||||
|
@ -215,7 +211,7 @@ keys configured on your account.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, "recipes")
|
sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
|
||||||
if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
|
if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -236,7 +232,7 @@ keys configured on your account.
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Dry && internal.Publish {
|
if !internal.Dry && internal.Publish {
|
||||||
url := fmt.Sprintf("%s/recipes/commit/%s", config.REPOS_BASE_URL, head.Hash())
|
url := fmt.Sprintf("%s/%s/commit/%s", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME, head.Hash())
|
||||||
logrus.Infof("new changes published: %s", url)
|
logrus.Infof("new changes published: %s", url)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
22
cli/cli.go
22
cli/cli.go
|
@ -40,12 +40,10 @@ Supported shells are as follows:
|
||||||
fizsh
|
fizsh
|
||||||
zsh
|
zsh
|
||||||
bash
|
bash
|
||||||
|
|
||||||
`,
|
`,
|
||||||
ArgsUsage: "<shell>",
|
ArgsUsage: "<shell>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
shellType := c.Args().First()
|
shellType := c.Args().First()
|
||||||
|
@ -92,7 +90,7 @@ Supported shells are as follows:
|
||||||
sudo mkdir /etc/bash_completion.d/
|
sudo mkdir /etc/bash_completion.d/
|
||||||
sudo cp %s /etc/bash_completion.d/abra
|
sudo cp %s /etc/bash_completion.d/abra
|
||||||
echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
|
echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
|
||||||
# And finally run "abra app ps <hit tab key>" to test things are working, you should see app names listed!
|
# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
|
||||||
`, autocompletionFile))
|
`, autocompletionFile))
|
||||||
case "zsh":
|
case "zsh":
|
||||||
fmt.Println(fmt.Sprintf(`
|
fmt.Println(fmt.Sprintf(`
|
||||||
|
@ -100,7 +98,7 @@ echo "source /etc/bash_completion.d/abra" >> ~/.bashrc
|
||||||
sudo mkdir /etc/zsh/completion.d/
|
sudo mkdir /etc/zsh/completion.d/
|
||||||
sudo cp %s /etc/zsh/completion.d/abra
|
sudo cp %s /etc/zsh/completion.d/abra
|
||||||
echo "PROG=abra\n_CLI_ZSH_AUTOCOMPLETE_HACK=1\nsource /etc/zsh/completion.d/abra" >> ~/.zshrc
|
echo "PROG=abra\n_CLI_ZSH_AUTOCOMPLETE_HACK=1\nsource /etc/zsh/completion.d/abra" >> ~/.zshrc
|
||||||
# And finally run "abra app ps <hit tab key>" to test things are working, you should see app names listed!
|
# And finally run "abra app ps <hit tab key>" to test things are working, you should see app domains listed!
|
||||||
`, autocompletionFile))
|
`, autocompletionFile))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,9 +116,9 @@ This command allows you to upgrade Abra in-place with the latest stable or
|
||||||
release candidate.
|
release candidate.
|
||||||
|
|
||||||
If you would like to install the latest release candidate, please pass the
|
If you would like to install the latest release candidate, please pass the
|
||||||
"--rc" option. Please bear in mind that the latest release candidate may have
|
"-r/--rc" option. Please bear in mind that the latest release candidate may
|
||||||
some catastrophic bugs contained in it. In any case, thank you very much for
|
have some catastrophic bugs contained in it. In any case, thank you very much
|
||||||
the testing efforts!
|
for the testing efforts!
|
||||||
`,
|
`,
|
||||||
Flags: []cli.Flag{internal.RCFlag},
|
Flags: []cli.Flag{internal.RCFlag},
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
@ -164,16 +162,6 @@ func newAbraApp(version, commit string) *cli.App {
|
||||||
AutoCompleteCommand,
|
AutoCompleteCommand,
|
||||||
},
|
},
|
||||||
BashComplete: autocomplete.SubcommandComplete,
|
BashComplete: autocomplete.SubcommandComplete,
|
||||||
Authors: []cli.Author{
|
|
||||||
// If you're looking at this and you hack on Abra and you're not listed
|
|
||||||
// here, please do add yourself! This is a community project, let's show
|
|
||||||
// some love
|
|
||||||
{Name: "3wordchant"},
|
|
||||||
{Name: "decentral1se"},
|
|
||||||
{Name: "kawaiipunk"},
|
|
||||||
{Name: "knoflook"},
|
|
||||||
{Name: "roxxers"},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
app.EnableBashCompletion = true
|
app.EnableBashCompletion = true
|
||||||
|
|
|
@ -13,7 +13,7 @@ var Secrets bool
|
||||||
|
|
||||||
// SecretsFlag turns on/off automatically generating secrets
|
// SecretsFlag turns on/off automatically generating secrets
|
||||||
var SecretsFlag = &cli.BoolFlag{
|
var SecretsFlag = &cli.BoolFlag{
|
||||||
Name: "secrets, ss",
|
Name: "secrets, S",
|
||||||
Usage: "Automatically generate secrets",
|
Usage: "Automatically generate secrets",
|
||||||
Destination: &Secrets,
|
Destination: &Secrets,
|
||||||
}
|
}
|
||||||
|
@ -28,14 +28,14 @@ var PassFlag = &cli.BoolFlag{
|
||||||
Destination: &Pass,
|
Destination: &Pass,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Context is temp
|
// PassRemove stores the variable for PassRemoveFlag
|
||||||
var Context string
|
var PassRemove bool
|
||||||
|
|
||||||
// ContextFlag is temp
|
// PassRemoveFlag turns on/off removing generated secrets from pass
|
||||||
var ContextFlag = &cli.StringFlag{
|
var PassRemoveFlag = &cli.BoolFlag{
|
||||||
Name: "context, c",
|
Name: "pass, p",
|
||||||
Value: "",
|
Usage: "Remove generated secrets from a local pass store",
|
||||||
Destination: &Context,
|
Destination: &PassRemove,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Force force functionality without asking.
|
// Force force functionality without asking.
|
||||||
|
@ -53,7 +53,7 @@ var Chaos bool
|
||||||
|
|
||||||
// ChaosFlag turns on/off chaos functionality.
|
// ChaosFlag turns on/off chaos functionality.
|
||||||
var ChaosFlag = &cli.BoolFlag{
|
var ChaosFlag = &cli.BoolFlag{
|
||||||
Name: "chaos, ch",
|
Name: "chaos, C",
|
||||||
Usage: "Deploy uncommitted recipes changes. Use with care!",
|
Usage: "Deploy uncommitted recipes changes. Use with care!",
|
||||||
Destination: &Chaos,
|
Destination: &Chaos,
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ var NoInputFlag = &cli.BoolFlag{
|
||||||
var DNSType string
|
var DNSType string
|
||||||
|
|
||||||
var DNSTypeFlag = &cli.StringFlag{
|
var DNSTypeFlag = &cli.StringFlag{
|
||||||
Name: "type, t",
|
Name: "record-type, rt",
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Domain name record type (e.g. A)",
|
Usage: "Domain name record type (e.g. A)",
|
||||||
Destination: &DNSType,
|
Destination: &DNSType,
|
||||||
|
@ -88,7 +88,7 @@ var DNSTypeFlag = &cli.StringFlag{
|
||||||
var DNSName string
|
var DNSName string
|
||||||
|
|
||||||
var DNSNameFlag = &cli.StringFlag{
|
var DNSNameFlag = &cli.StringFlag{
|
||||||
Name: "name, n",
|
Name: "record-name, rn",
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Domain name record name (e.g. mysubdomain)",
|
Usage: "Domain name record name (e.g. mysubdomain)",
|
||||||
Destination: &DNSName,
|
Destination: &DNSName,
|
||||||
|
@ -97,7 +97,7 @@ var DNSNameFlag = &cli.StringFlag{
|
||||||
var DNSValue string
|
var DNSValue string
|
||||||
|
|
||||||
var DNSValueFlag = &cli.StringFlag{
|
var DNSValueFlag = &cli.StringFlag{
|
||||||
Name: "value, v",
|
Name: "record-value, rv",
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Domain name record value (e.g. 192.168.1.1)",
|
Usage: "Domain name record value (e.g. 192.168.1.1)",
|
||||||
Destination: &DNSValue,
|
Destination: &DNSValue,
|
||||||
|
@ -105,7 +105,7 @@ var DNSValueFlag = &cli.StringFlag{
|
||||||
|
|
||||||
var DNSTTL string
|
var DNSTTL string
|
||||||
var DNSTTLFlag = &cli.StringFlag{
|
var DNSTTLFlag = &cli.StringFlag{
|
||||||
Name: "ttl, T",
|
Name: "record-ttl, rl",
|
||||||
Value: "600s",
|
Value: "600s",
|
||||||
Usage: "Domain name TTL value (seconds)",
|
Usage: "Domain name TTL value (seconds)",
|
||||||
Destination: &DNSTTL,
|
Destination: &DNSTTL,
|
||||||
|
@ -114,7 +114,7 @@ var DNSTTLFlag = &cli.StringFlag{
|
||||||
var DNSPriority int
|
var DNSPriority int
|
||||||
|
|
||||||
var DNSPriorityFlag = &cli.IntFlag{
|
var DNSPriorityFlag = &cli.IntFlag{
|
||||||
Name: "priority, P",
|
Name: "record-priority, rp",
|
||||||
Value: 10,
|
Value: 10,
|
||||||
Usage: "Domain name priority value",
|
Usage: "Domain name priority value",
|
||||||
Destination: &DNSPriority,
|
Destination: &DNSPriority,
|
||||||
|
@ -248,35 +248,35 @@ var RC bool
|
||||||
|
|
||||||
// RCFlag chooses the latest release candidate for install
|
// RCFlag chooses the latest release candidate for install
|
||||||
var RCFlag = &cli.BoolFlag{
|
var RCFlag = &cli.BoolFlag{
|
||||||
Name: "rc",
|
Name: "rc, r",
|
||||||
Destination: &RC,
|
Destination: &RC,
|
||||||
Usage: "Insatll the latest release candidate",
|
Usage: "Insatll the latest release candidate",
|
||||||
}
|
}
|
||||||
|
|
||||||
var Major bool
|
var Major bool
|
||||||
var MajorFlag = &cli.BoolFlag{
|
var MajorFlag = &cli.BoolFlag{
|
||||||
Name: "major, ma, x",
|
Name: "major, x",
|
||||||
Usage: "Increase the major part of the version",
|
Usage: "Increase the major part of the version",
|
||||||
Destination: &Major,
|
Destination: &Major,
|
||||||
}
|
}
|
||||||
|
|
||||||
var Minor bool
|
var Minor bool
|
||||||
var MinorFlag = &cli.BoolFlag{
|
var MinorFlag = &cli.BoolFlag{
|
||||||
Name: "minor, mi, y",
|
Name: "minor, y",
|
||||||
Usage: "Increase the minor part of the version",
|
Usage: "Increase the minor part of the version",
|
||||||
Destination: &Minor,
|
Destination: &Minor,
|
||||||
}
|
}
|
||||||
|
|
||||||
var Patch bool
|
var Patch bool
|
||||||
var PatchFlag = &cli.BoolFlag{
|
var PatchFlag = &cli.BoolFlag{
|
||||||
Name: "patch, pa, z",
|
Name: "patch, z",
|
||||||
Usage: "Increase the patch part of the version",
|
Usage: "Increase the patch part of the version",
|
||||||
Destination: &Patch,
|
Destination: &Patch,
|
||||||
}
|
}
|
||||||
|
|
||||||
var Dry bool
|
var Dry bool
|
||||||
var DryFlag = &cli.BoolFlag{
|
var DryFlag = &cli.BoolFlag{
|
||||||
Name: "dry-run, dr",
|
Name: "dry-run, r",
|
||||||
Usage: "Only reports changes that would be made",
|
Usage: "Only reports changes that would be made",
|
||||||
Destination: &Dry,
|
Destination: &Dry,
|
||||||
}
|
}
|
||||||
|
@ -290,7 +290,7 @@ var PublishFlag = &cli.BoolFlag{
|
||||||
|
|
||||||
var Domain string
|
var Domain string
|
||||||
var DomainFlag = &cli.StringFlag{
|
var DomainFlag = &cli.StringFlag{
|
||||||
Name: "domain, dn",
|
Name: "domain, D",
|
||||||
Value: "",
|
Value: "",
|
||||||
Usage: "Choose a domain name",
|
Usage: "Choose a domain name",
|
||||||
Destination: &Domain,
|
Destination: &Domain,
|
||||||
|
@ -304,17 +304,9 @@ var NewAppServerFlag = &cli.StringFlag{
|
||||||
Destination: &NewAppServer,
|
Destination: &NewAppServer,
|
||||||
}
|
}
|
||||||
|
|
||||||
var NewAppName string
|
|
||||||
var NewAppNameFlag = &cli.StringFlag{
|
|
||||||
Name: "app-name, a",
|
|
||||||
Value: "",
|
|
||||||
Usage: "Choose an app name",
|
|
||||||
Destination: &NewAppName,
|
|
||||||
}
|
|
||||||
|
|
||||||
var NoDomainChecks bool
|
var NoDomainChecks bool
|
||||||
var NoDomainChecksFlag = &cli.BoolFlag{
|
var NoDomainChecksFlag = &cli.BoolFlag{
|
||||||
Name: "no-domain-checks, nd",
|
Name: "no-domain-checks, D",
|
||||||
Usage: "Disable app domain sanity checks",
|
Usage: "Disable app domain sanity checks",
|
||||||
Destination: &NoDomainChecks,
|
Destination: &NoDomainChecks,
|
||||||
}
|
}
|
||||||
|
@ -328,7 +320,7 @@ var StdErrOnlyFlag = &cli.BoolFlag{
|
||||||
|
|
||||||
var DontWaitConverge bool
|
var DontWaitConverge bool
|
||||||
var DontWaitConvergeFlag = &cli.BoolFlag{
|
var DontWaitConvergeFlag = &cli.BoolFlag{
|
||||||
Name: "no-converge-checks, nc",
|
Name: "no-converge-checks, c",
|
||||||
Usage: "Don't wait for converge logic checks",
|
Usage: "Don't wait for converge logic checks",
|
||||||
Destination: &DontWaitConverge,
|
Destination: &DontWaitConverge,
|
||||||
}
|
}
|
||||||
|
@ -354,24 +346,6 @@ var SkipUpdatesFlag = &cli.BoolFlag{
|
||||||
Destination: &SkipUpdates,
|
Destination: &SkipUpdates,
|
||||||
}
|
}
|
||||||
|
|
||||||
var RegistryUsername string
|
|
||||||
var RegistryUsernameFlag = &cli.StringFlag{
|
|
||||||
Name: "username, user",
|
|
||||||
Value: "",
|
|
||||||
Usage: "Registry username",
|
|
||||||
EnvVar: "REGISTRY_USERNAME",
|
|
||||||
Destination: &RegistryUsername,
|
|
||||||
}
|
|
||||||
|
|
||||||
var RegistryPassword string
|
|
||||||
var RegistryPasswordFlag = &cli.StringFlag{
|
|
||||||
Name: "password, pass",
|
|
||||||
Value: "",
|
|
||||||
Usage: "Registry password",
|
|
||||||
EnvVar: "REGISTRY_PASSWORD",
|
|
||||||
Destination: &RegistryUsername,
|
|
||||||
}
|
|
||||||
|
|
||||||
var AllTags bool
|
var AllTags bool
|
||||||
var AllTagsFlag = &cli.BoolFlag{
|
var AllTagsFlag = &cli.BoolFlag{
|
||||||
Name: "all-tags, a",
|
Name: "all-tags, a",
|
||||||
|
@ -428,6 +402,24 @@ Good luck!
|
||||||
|
|
||||||
`
|
`
|
||||||
|
|
||||||
|
var ServerAddFailMsg = `
|
||||||
|
Failed to add server %s.
|
||||||
|
|
||||||
|
This could be caused by two things.
|
||||||
|
|
||||||
|
Abra isn't picking up your SSH configuration or you need to specify it on the
|
||||||
|
command-line (e.g you use a non-standard port or username to connect). Run
|
||||||
|
"server add" with "-d/--debug" to learn more about what Abra is doing under the
|
||||||
|
hood.
|
||||||
|
|
||||||
|
Docker is not installed on your server. You can pass "-p/--provision" to
|
||||||
|
install Docker and initialise Docker Swarm mode. See help output for "server
|
||||||
|
add"
|
||||||
|
|
||||||
|
See "abra server add -h" for more.
|
||||||
|
|
||||||
|
`
|
||||||
|
|
||||||
// SubCommandBefore wires up pre-action machinery (e.g. --debug handling).
|
// SubCommandBefore wires up pre-action machinery (e.g. --debug handling).
|
||||||
func SubCommandBefore(c *cli.Context) error {
|
func SubCommandBefore(c *cli.Context) error {
|
||||||
if Debug {
|
if Debug {
|
||||||
|
|
|
@ -26,12 +26,12 @@ func DeployAction(c *cli.Context) error {
|
||||||
app := ValidateApp(c)
|
app := ValidateApp(c)
|
||||||
|
|
||||||
if !Chaos {
|
if !Chaos {
|
||||||
if err := recipe.EnsureUpToDate(app.Type); err != nil {
|
if err := recipe.EnsureUpToDate(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
r, err := recipe.Get(app.Type)
|
r, err := recipe.Get(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -66,24 +66,24 @@ func DeployAction(c *cli.Context) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
versions, err := recipe.GetRecipeCatalogueVersions(app.Type, catl)
|
versions, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if len(versions) > 0 {
|
if len(versions) > 0 {
|
||||||
version = versions[len(versions)-1]
|
version = versions[len(versions)-1]
|
||||||
logrus.Debugf("choosing %s as version to deploy", version)
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
if err := recipe.EnsureVersion(app.Type, version); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
head, err := git.GetRecipeHead(app.Type)
|
head, err := git.GetRecipeHead(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
version = formatter.SmallSHA(head.String())
|
version = formatter.SmallSHA(head.String())
|
||||||
logrus.Warn("no versions detected, using latest commit")
|
logrus.Warn("no versions detected, using latest commit")
|
||||||
if err := recipe.EnsureLatest(app.Type); err != nil {
|
if err := recipe.EnsureLatest(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -91,13 +91,13 @@ func DeployAction(c *cli.Context) error {
|
||||||
|
|
||||||
if version == "unknown" && !Chaos {
|
if version == "unknown" && !Chaos {
|
||||||
logrus.Debugf("choosing %s as version to deploy", version)
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
if err := recipe.EnsureVersion(app.Type, version); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if version != "unknown" && !Chaos {
|
if version != "unknown" && !Chaos {
|
||||||
if err := recipe.EnsureVersion(app.Type, version); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -105,13 +105,13 @@ func DeployAction(c *cli.Context) error {
|
||||||
if Chaos {
|
if Chaos {
|
||||||
logrus.Warnf("chaos mode engaged")
|
logrus.Warnf("chaos mode engaged")
|
||||||
var err error
|
var err error
|
||||||
version, err = recipe.ChaosVersion(app.Type)
|
version, err = recipe.ChaosVersion(app.Recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Type, "abra.sh")
|
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, app.Recipe, "abra.sh")
|
||||||
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
abraShEnv, err := config.ReadAbraShEnvVars(abraShPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -120,7 +120,7 @@ func DeployAction(c *cli.Context) error {
|
||||||
app.Env[k] = v
|
app.Env[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := config.GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -141,11 +141,6 @@ func DeployAction(c *cli.Context) error {
|
||||||
|
|
||||||
if !NoDomainChecks {
|
if !NoDomainChecks {
|
||||||
domainName := app.Env["DOMAIN"]
|
domainName := app.Env["DOMAIN"]
|
||||||
ipv4, err := dns.EnsureIPv4(domainName)
|
|
||||||
if err != nil || ipv4 == "" {
|
|
||||||
logrus.Fatalf("could not find an IP address assigned to %s?", domainName)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
|
if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -162,7 +157,7 @@ func DeployAction(c *cli.Context) error {
|
||||||
|
|
||||||
// DeployOverview shows a deployment overview
|
// DeployOverview shows a deployment overview
|
||||||
func DeployOverview(app config.App, version, message string) error {
|
func DeployOverview(app config.App, version, message string) error {
|
||||||
tableCol := []string{"server", "compose", "domain", "app name", "version"}
|
tableCol := []string{"server", "recipe", "config", "domain", "version"}
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
|
@ -175,7 +170,7 @@ func DeployOverview(app config.App, version, message string) error {
|
||||||
server = "local"
|
server = "local"
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Append([]string{server, deployConfig, app.Domain, app.Name, version})
|
table.Append([]string{server, app.Recipe, deployConfig, app.Domain, version})
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
if NoInput {
|
if NoInput {
|
||||||
|
@ -200,7 +195,7 @@ func DeployOverview(app config.App, version, message string) error {
|
||||||
|
|
||||||
// NewVersionOverview shows an upgrade or downgrade overview
|
// NewVersionOverview shows an upgrade or downgrade overview
|
||||||
func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes string) error {
|
func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes string) error {
|
||||||
tableCol := []string{"server", "compose", "domain", "app name", "current version", "to be deployed"}
|
tableCol := []string{"server", "recipe", "config", "domain", "current version", "to be deployed"}
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
deployConfig := "compose.yml"
|
deployConfig := "compose.yml"
|
||||||
|
@ -213,12 +208,12 @@ func NewVersionOverview(app config.App, currentVersion, newVersion, releaseNotes
|
||||||
server = "local"
|
server = "local"
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Append([]string{server, deployConfig, app.Domain, app.Name, currentVersion, newVersion})
|
table.Append([]string{server, app.Recipe, deployConfig, app.Domain, currentVersion, newVersion})
|
||||||
table.Render()
|
table.Render()
|
||||||
|
|
||||||
if releaseNotes == "" {
|
if releaseNotes == "" {
|
||||||
var err error
|
var err error
|
||||||
releaseNotes, err = GetReleaseNotes(app.Type, newVersion)
|
releaseNotes, err = GetReleaseNotes(app.Recipe, newVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
|
"coopcloud.tech/abra/pkg/app"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/formatter"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
|
@ -11,6 +12,7 @@ import (
|
||||||
"coopcloud.tech/abra/pkg/secret"
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
"coopcloud.tech/abra/pkg/ssh"
|
"coopcloud.tech/abra/pkg/ssh"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/olekukonko/tablewriter"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
@ -23,7 +25,7 @@ var RecipeName string
|
||||||
|
|
||||||
// createSecrets creates all secrets for a new app.
|
// createSecrets creates all secrets for a new app.
|
||||||
func createSecrets(sanitisedAppName string) (AppSecrets, error) {
|
func createSecrets(sanitisedAppName string) (AppSecrets, error) {
|
||||||
appEnvPath := path.Join(config.ABRA_DIR, "servers", NewAppServer, fmt.Sprintf("%s.env", NewAppName))
|
appEnvPath := path.Join(config.ABRA_DIR, "servers", NewAppServer, fmt.Sprintf("%s.env", Domain))
|
||||||
appEnv, err := config.ReadEnv(appEnvPath)
|
appEnv, err := config.ReadEnv(appEnvPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -38,7 +40,7 @@ func createSecrets(sanitisedAppName string) (AppSecrets, error) {
|
||||||
if Pass {
|
if Pass {
|
||||||
for secretName := range secrets {
|
for secretName := range secrets {
|
||||||
secretValue := secrets[secretName]
|
secretValue := secrets[secretName]
|
||||||
if err := secret.PassInsertSecret(secretValue, secretName, sanitisedAppName, NewAppServer); err != nil {
|
if err := secret.PassInsertSecret(secretValue, secretName, Domain, NewAppServer); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,6 +67,31 @@ func ensureDomainFlag(recipe recipe.Recipe, server string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// promptForSecrets asks if we should generate secrets for a new app.
|
||||||
|
func promptForSecrets(appName string) error {
|
||||||
|
app, err := app.Get(appName)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
secretEnvVars := secret.ReadSecretEnvVars(app.Env)
|
||||||
|
if len(secretEnvVars) == 0 {
|
||||||
|
logrus.Debugf("%s has no secrets to generate, skipping...", app.Recipe)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if !Secrets && !NoInput {
|
||||||
|
prompt := &survey.Confirm{
|
||||||
|
Message: "Generate app secrets?",
|
||||||
|
}
|
||||||
|
if err := survey.AskOne(prompt, &Secrets); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// ensureServerFlag checks if the server flag was used. if not, asks the user for it.
|
// ensureServerFlag checks if the server flag was used. if not, asks the user for it.
|
||||||
func ensureServerFlag() error {
|
func ensureServerFlag() error {
|
||||||
servers, err := config.GetServers()
|
servers, err := config.GetServers()
|
||||||
|
@ -89,28 +116,9 @@ func ensureServerFlag() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ensureServerFlag checks if the AppName flag was used. if not, asks the user for it.
|
|
||||||
func ensureAppNameFlag() error {
|
|
||||||
if NewAppName == "" && !NoInput {
|
|
||||||
prompt := &survey.Input{
|
|
||||||
Message: "Specify app name:",
|
|
||||||
Default: Domain,
|
|
||||||
}
|
|
||||||
if err := survey.AskOne(prompt, &NewAppName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if NewAppName == "" {
|
|
||||||
return fmt.Errorf("no app name provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewAction is the new app creation logic
|
// NewAction is the new app creation logic
|
||||||
func NewAction(c *cli.Context) error {
|
func NewAction(c *cli.Context) error {
|
||||||
recipe := ValidateRecipeWithPrompt(c)
|
recipe := ValidateRecipeWithPrompt(c, false)
|
||||||
|
|
||||||
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -124,48 +132,45 @@ func NewAction(c *cli.Context) error {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := ensureAppNameFlag(); err != nil {
|
if err := promptForSecrets(Domain); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sanitisedAppName := config.SanitiseAppName(NewAppName)
|
sanitisedAppName := config.SanitiseAppName(Domain)
|
||||||
if len(sanitisedAppName) > 45 {
|
logrus.Debugf("%s sanitised as %s for new app", Domain, sanitisedAppName)
|
||||||
logrus.Fatalf("%s cannot be longer than 45 characters", sanitisedAppName)
|
|
||||||
}
|
|
||||||
logrus.Debugf("%s sanitised as %s for new app", NewAppName, sanitisedAppName)
|
|
||||||
|
|
||||||
if err := config.TemplateAppEnvSample(recipe.Name, NewAppName, NewAppServer, Domain); err != nil {
|
if err := config.TemplateAppEnvSample(recipe.Name, Domain, NewAppServer, Domain); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var secrets AppSecrets
|
||||||
|
var secretTable *tablewriter.Table
|
||||||
if Secrets {
|
if Secrets {
|
||||||
if err := ssh.EnsureHostKey(NewAppServer); err != nil {
|
if err := ssh.EnsureHostKey(NewAppServer); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secrets, err := createSecrets(sanitisedAppName)
|
var err error
|
||||||
|
secrets, err = createSecrets(sanitisedAppName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretCols := []string{"Name", "Value"}
|
secretCols := []string{"Name", "Value"}
|
||||||
secretTable := formatter.CreateTable(secretCols)
|
secretTable = formatter.CreateTable(secretCols)
|
||||||
for secret := range secrets {
|
for secret := range secrets {
|
||||||
secretTable.Append([]string{secret, secrets[secret]})
|
secretTable.Append([]string{secret, secrets[secret]})
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
|
||||||
defer secretTable.Render()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if NewAppServer == "default" {
|
if NewAppServer == "default" {
|
||||||
NewAppServer = "local"
|
NewAppServer = "local"
|
||||||
}
|
}
|
||||||
|
|
||||||
tableCol := []string{"server", "type", "domain", "app name"}
|
tableCol := []string{"server", "recipe", "domain"}
|
||||||
table := formatter.CreateTable(tableCol)
|
table := formatter.CreateTable(tableCol)
|
||||||
table.Append([]string{NewAppServer, recipe.Name, Domain, NewAppName})
|
table.Append([]string{NewAppServer, recipe.Name, Domain})
|
||||||
|
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
|
fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
|
||||||
|
@ -173,11 +178,19 @@ func NewAction(c *cli.Context) error {
|
||||||
table.Render()
|
table.Render()
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println("You can configure this app by running the following:")
|
fmt.Println("You can configure this app by running the following:")
|
||||||
fmt.Println(fmt.Sprintf("\n abra app config %s", NewAppName))
|
fmt.Println(fmt.Sprintf("\n abra app config %s", Domain))
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
fmt.Println("You can deploy this app by running the following:")
|
fmt.Println("You can deploy this app by running the following:")
|
||||||
fmt.Println(fmt.Sprintf("\n abra app deploy %s", NewAppName))
|
fmt.Println(fmt.Sprintf("\n abra app deploy %s", Domain))
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
|
|
||||||
|
if len(secrets) > 0 {
|
||||||
|
fmt.Println("Here are your generated secrets:")
|
||||||
|
fmt.Println("")
|
||||||
|
secretTable.Render()
|
||||||
|
fmt.Println("")
|
||||||
|
logrus.Warn("generated secrets are not shown again, please take note of them *now*")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// PromptBumpType prompts for version bump type
|
// PromptBumpType prompts for version bump type
|
||||||
func PromptBumpType(tagString string) error {
|
func PromptBumpType(tagString, latestRelease string) error {
|
||||||
if (!Major && !Minor && !Patch) && tagString == "" {
|
if (!Major && !Minor && !Patch) && tagString == "" {
|
||||||
fmt.Printf(`
|
fmt.Printf(`
|
||||||
You need to make a decision about what kind of an update this new recipe
|
You need to make a decision about what kind of an update this new recipe
|
||||||
|
@ -20,6 +20,8 @@ migration work or take care of some breaking changes? This can be signaled in
|
||||||
the version you specify on the recipe deploy label and is called a semantic
|
the version you specify on the recipe deploy label and is called a semantic
|
||||||
version.
|
version.
|
||||||
|
|
||||||
|
The latest published version is %s.
|
||||||
|
|
||||||
Here is a semver cheat sheet (more on https://semver.org):
|
Here is a semver cheat sheet (more on https://semver.org):
|
||||||
|
|
||||||
major: new features/bug fixes, backwards incompatible (e.g 1.0.0 -> 2.0.0).
|
major: new features/bug fixes, backwards incompatible (e.g 1.0.0 -> 2.0.0).
|
||||||
|
@ -34,7 +36,7 @@ Here is a semver cheat sheet (more on https://semver.org):
|
||||||
should also Just Work and is mostly to do with minor bug fixes
|
should also Just Work and is mostly to do with minor bug fixes
|
||||||
and/or security patches. "nothing to worry about".
|
and/or security patches. "nothing to worry about".
|
||||||
|
|
||||||
`)
|
`, latestRelease)
|
||||||
|
|
||||||
var chosenBumpType string
|
var chosenBumpType string
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
var AppName string
|
var AppName string
|
||||||
|
|
||||||
// ValidateRecipe ensures the recipe arg is valid.
|
// ValidateRecipe ensures the recipe arg is valid.
|
||||||
func ValidateRecipe(c *cli.Context) recipe.Recipe {
|
func ValidateRecipe(c *cli.Context, ensureLatest bool) recipe.Recipe {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
if recipeName == "" {
|
if recipeName == "" {
|
||||||
|
@ -38,6 +38,12 @@ func ValidateRecipe(c *cli.Context) recipe.Recipe {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ensureLatest {
|
||||||
|
if err := recipe.EnsureLatest(recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated %s as recipe argument", recipeName)
|
logrus.Debugf("validated %s as recipe argument", recipeName)
|
||||||
|
|
||||||
return chosenRecipe
|
return chosenRecipe
|
||||||
|
@ -45,7 +51,7 @@ func ValidateRecipe(c *cli.Context) recipe.Recipe {
|
||||||
|
|
||||||
// ValidateRecipeWithPrompt ensures a recipe argument is present before
|
// ValidateRecipeWithPrompt ensures a recipe argument is present before
|
||||||
// validating, asking for input if required.
|
// validating, asking for input if required.
|
||||||
func ValidateRecipeWithPrompt(c *cli.Context) recipe.Recipe {
|
func ValidateRecipeWithPrompt(c *cli.Context, ensureLatest bool) recipe.Recipe {
|
||||||
recipeName := c.Args().First()
|
recipeName := c.Args().First()
|
||||||
|
|
||||||
if recipeName == "" && !NoInput {
|
if recipeName == "" && !NoInput {
|
||||||
|
@ -99,6 +105,12 @@ func ValidateRecipeWithPrompt(c *cli.Context) recipe.Recipe {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ensureLatest {
|
||||||
|
if err := recipe.EnsureLatest(recipeName); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated %s as recipe argument", recipeName)
|
logrus.Debugf("validated %s as recipe argument", recipeName)
|
||||||
|
|
||||||
return chosenRecipe
|
return chosenRecipe
|
||||||
|
@ -122,7 +134,7 @@ func ValidateApp(c *cli.Context) config.App {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := recipe.EnsureExists(app.Type); err != nil {
|
if err := recipe.EnsureExists(app.Recipe); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,7 +148,7 @@ func ValidateApp(c *cli.Context) config.App {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateDomain ensures the domain name arg is valid.
|
// ValidateDomain ensures the domain name arg is valid.
|
||||||
func ValidateDomain(c *cli.Context) (string, error) {
|
func ValidateDomain(c *cli.Context) string {
|
||||||
domainName := c.Args().First()
|
domainName := c.Args().First()
|
||||||
|
|
||||||
if domainName == "" && !NoInput {
|
if domainName == "" && !NoInput {
|
||||||
|
@ -145,7 +157,7 @@ func ValidateDomain(c *cli.Context) (string, error) {
|
||||||
Default: "example.com",
|
Default: "example.com",
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &domainName); err != nil {
|
if err := survey.AskOne(prompt, &domainName); err != nil {
|
||||||
return domainName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,7 +167,7 @@ func ValidateDomain(c *cli.Context) (string, error) {
|
||||||
|
|
||||||
logrus.Debugf("validated %s as domain argument", domainName)
|
logrus.Debugf("validated %s as domain argument", domainName)
|
||||||
|
|
||||||
return domainName, nil
|
return domainName
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
||||||
|
@ -173,12 +185,12 @@ func ValidateSubCmdFlags(c *cli.Context) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateServer ensures the server name arg is valid.
|
// ValidateServer ensures the server name arg is valid.
|
||||||
func ValidateServer(c *cli.Context) (string, error) {
|
func ValidateServer(c *cli.Context) string {
|
||||||
serverName := c.Args().First()
|
serverName := c.Args().First()
|
||||||
|
|
||||||
serverNames, err := config.ReadServerNames()
|
serverNames, err := config.ReadServerNames()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return serverName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if serverName == "" && !NoInput {
|
if serverName == "" && !NoInput {
|
||||||
|
@ -187,17 +199,28 @@ func ValidateServer(c *cli.Context) (string, error) {
|
||||||
Options: serverNames,
|
Options: serverNames,
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &serverName); err != nil {
|
if err := survey.AskOne(prompt, &serverName); err != nil {
|
||||||
return serverName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
matched := false
|
||||||
|
for _, name := range serverNames {
|
||||||
|
if name == serverName {
|
||||||
|
matched = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !matched {
|
||||||
|
ShowSubcommandHelpAndError(c, errors.New("server doesn't exist?"))
|
||||||
|
}
|
||||||
|
|
||||||
if serverName == "" {
|
if serverName == "" {
|
||||||
ShowSubcommandHelpAndError(c, errors.New("no server provided"))
|
ShowSubcommandHelpAndError(c, errors.New("no server provided"))
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("validated %s as server argument", serverName)
|
logrus.Debugf("validated %s as server argument", serverName)
|
||||||
|
|
||||||
return serverName, nil
|
return serverName
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnsureDNSProvider ensures a DNS provider is chosen.
|
// EnsureDNSProvider ensures a DNS provider is chosen.
|
||||||
|
|
|
@ -19,13 +19,12 @@ var recipeLintCommand = cli.Command{
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
internal.OnlyErrorFlag,
|
internal.OnlyErrorFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c)
|
recipe := internal.ValidateRecipe(c, true)
|
||||||
|
|
||||||
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
|
|
@ -27,7 +27,6 @@ var recipeListCommand = cli.Command{
|
||||||
Aliases: []string{"ls"},
|
Aliases: []string{"ls"},
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
patternFlag,
|
patternFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
|
|
|
@ -59,7 +59,7 @@ your SSH keys configured on your account.
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c)
|
recipe := internal.ValidateRecipeWithPrompt(c, false)
|
||||||
|
|
||||||
imagesTmp, err := getImageVersions(recipe)
|
imagesTmp, err := getImageVersions(recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -322,12 +322,6 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
|
||||||
}
|
}
|
||||||
|
|
||||||
var lastGitTag tagcmp.Tag
|
var lastGitTag tagcmp.Tag
|
||||||
if tagString == "" {
|
|
||||||
if err := internal.PromptBumpType(tagString); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tag := range tags {
|
for _, tag := range tags {
|
||||||
parsed, err := tagcmp.Parse(tag)
|
parsed, err := tagcmp.Parse(tag)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -368,6 +362,12 @@ func createReleaseFromPreviousTag(tagString, mainAppVersion string, recipe recip
|
||||||
newTag.Major = strconv.Itoa(now + 1)
|
newTag.Major = strconv.Itoa(now + 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if tagString == "" {
|
||||||
|
if err := internal.PromptBumpType(tagString, lastGitTag.String()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if internal.Major || internal.Minor || internal.Patch {
|
if internal.Major || internal.Minor || internal.Patch {
|
||||||
newTag.Metadata = mainAppVersion
|
newTag.Metadata = mainAppVersion
|
||||||
tagString = newTag.String()
|
tagString = newTag.String()
|
||||||
|
|
|
@ -41,7 +41,7 @@ auto-generate it for you. The <recipe> configuration will be updated on the
|
||||||
local file system.
|
local file system.
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c)
|
recipe := internal.ValidateRecipeWithPrompt(c, false)
|
||||||
|
|
||||||
mainApp, err := internal.GetMainAppImage(recipe)
|
mainApp, err := internal.GetMainAppImage(recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -95,7 +95,8 @@ likely to change.
|
||||||
}
|
}
|
||||||
|
|
||||||
if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
if nextTag == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
|
||||||
if err := internal.PromptBumpType(""); err != nil {
|
latestRelease := tags[len(tags)-1]
|
||||||
|
if err := internal.PromptBumpType("", latestRelease); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,6 @@ interface.
|
||||||
You may invoke this command in "wizard" mode and be prompted for input:
|
You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
abra recipe upgrade
|
abra recipe upgrade
|
||||||
|
|
||||||
`,
|
`,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
|
@ -60,7 +59,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c)
|
recipe := internal.ValidateRecipeWithPrompt(c, true)
|
||||||
|
|
||||||
bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
|
bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch)
|
||||||
if bumpType != 0 {
|
if bumpType != 0 {
|
||||||
|
@ -113,13 +112,13 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
image := reference.Path(img)
|
regVersions, err := client.GetRegistryTags(img)
|
||||||
regVersions, err := client.GetRegistryTags(image)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
logrus.Debugf("retrieved %s from remote registry for %s", regVersions, image)
|
|
||||||
|
|
||||||
|
image := reference.Path(img)
|
||||||
|
logrus.Debugf("retrieved %s from remote registry for %s", regVersions, image)
|
||||||
image = formatter.StripTagMeta(image)
|
image = formatter.StripTagMeta(image)
|
||||||
|
|
||||||
switch img.(type) {
|
switch img.(type) {
|
||||||
|
@ -142,7 +141,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
var compatible []tagcmp.Tag
|
var compatible []tagcmp.Tag
|
||||||
for _, regVersion := range regVersions {
|
for _, regVersion := range regVersions {
|
||||||
other, err := tagcmp.Parse(regVersion.Name)
|
other, err := tagcmp.Parse(regVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue // skip tags that cannot be parsed
|
continue // skip tags that cannot be parsed
|
||||||
}
|
}
|
||||||
|
@ -232,7 +231,7 @@ You may invoke this command in "wizard" mode and be prompted for input:
|
||||||
msg = fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
|
msg = fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
|
||||||
compatibleStrings = []string{"skip"}
|
compatibleStrings = []string{"skip"}
|
||||||
for _, regVersion := range regVersions {
|
for _, regVersion := range regVersions {
|
||||||
compatibleStrings = append(compatibleStrings, regVersion.Name)
|
compatibleStrings = append(compatibleStrings, regVersion)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,12 +16,11 @@ var recipeVersionCommand = cli.Command{
|
||||||
ArgsUsage: "<recipe>",
|
ArgsUsage: "<recipe>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c)
|
recipe := internal.ValidateRecipe(c, false)
|
||||||
|
|
||||||
catalogue, err := recipePkg.ReadRecipeCatalogue()
|
catalogue, err := recipePkg.ReadRecipeCatalogue()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -21,7 +21,6 @@ var RecordListCommand = cli.Command{
|
||||||
ArgsUsage: "<zone>",
|
ArgsUsage: "<zone>",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
internal.DNSProviderFlag,
|
internal.DNSProviderFlag,
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
|
|
|
@ -45,7 +45,6 @@ Example:
|
||||||
You may also invoke this command in "wizard" mode and be prompted for input:
|
You may also invoke this command in "wizard" mode and be prompted for input:
|
||||||
|
|
||||||
abra record new
|
abra record new
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
zone, err := internal.EnsureZoneArgument(c)
|
zone, err := internal.EnsureZoneArgument(c)
|
||||||
|
|
|
@ -28,7 +28,6 @@ library documentation for more. It supports many existing providers and allows
|
||||||
to implement new provider support easily.
|
to implement new provider support easily.
|
||||||
|
|
||||||
https://pkg.go.dev/github.com/libdns/libdns
|
https://pkg.go.dev/github.com/libdns/libdns
|
||||||
|
|
||||||
`,
|
`,
|
||||||
Subcommands: []cli.Command{
|
Subcommands: []cli.Command{
|
||||||
RecordListCommand,
|
RecordListCommand,
|
||||||
|
|
|
@ -41,7 +41,6 @@ such purposes. Docker stable is now installed by default by this script. The
|
||||||
source for this script can be seen here:
|
source for this script can be seen here:
|
||||||
|
|
||||||
https://github.com/docker/docker-install
|
https://github.com/docker/docker-install
|
||||||
|
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -61,7 +60,7 @@ var provisionFlag = &cli.BoolFlag{
|
||||||
|
|
||||||
var sshAuth string
|
var sshAuth string
|
||||||
var sshAuthFlag = &cli.StringFlag{
|
var sshAuthFlag = &cli.StringFlag{
|
||||||
Name: "ssh-auth, sh",
|
Name: "ssh-auth, s",
|
||||||
Value: "identity-file",
|
Value: "identity-file",
|
||||||
Usage: "Select SSH authentication method (identity-file, password)",
|
Usage: "Select SSH authentication method (identity-file, password)",
|
||||||
Destination: &sshAuth,
|
Destination: &sshAuth,
|
||||||
|
@ -69,7 +68,7 @@ var sshAuthFlag = &cli.StringFlag{
|
||||||
|
|
||||||
var askSudoPass bool
|
var askSudoPass bool
|
||||||
var askSudoPassFlag = &cli.BoolFlag{
|
var askSudoPassFlag = &cli.BoolFlag{
|
||||||
Name: "ask-sudo-pass, as",
|
Name: "ask-sudo-pass, a",
|
||||||
Usage: "Ask for sudo password",
|
Usage: "Ask for sudo password",
|
||||||
Destination: &askSudoPass,
|
Destination: &askSudoPass,
|
||||||
}
|
}
|
||||||
|
@ -372,39 +371,27 @@ var serverAddCommand = cli.Command{
|
||||||
Usage: "Add a server to your configuration",
|
Usage: "Add a server to your configuration",
|
||||||
Description: `
|
Description: `
|
||||||
This command adds a new server to your configuration so that it can be managed
|
This command adds a new server to your configuration so that it can be managed
|
||||||
by Abra. This can be useful when you already have a server provisioned and want
|
by Abra. This command can also provision your server ("--provision/-p") with a
|
||||||
to start running Abra commands against it.
|
Docker installation so that it is capable of hosting Co-op Cloud apps.
|
||||||
|
|
||||||
This command can also provision your server ("--provision/-p") so that it is
|
Abra will default to expecting that you have a running ssh-agent and are using
|
||||||
capable of hosting Co-op Cloud apps. Abra will default to expecting that you
|
SSH keys to connect to your new server. Abra will also read your SSH config
|
||||||
have a running ssh-agent and are using SSH keys to connect to your new server.
|
(matching "Host" as <domain>). SSH connection details precedence follows as
|
||||||
Abra will also read your SSH config (matching "Host" as <domain>). SSH
|
such: command-line > SSH config > guessed defaults.
|
||||||
connection details precedence follows as such: command-line > SSH config >
|
|
||||||
guessed defaults.
|
|
||||||
|
|
||||||
If you have no SSH key configured for this host and are instead using password
|
If you have no SSH key configured for this host and are instead using password
|
||||||
authentication, you may pass "--ssh-auth password" to have Abra ask you for the
|
authentication, you may pass "--ssh-auth password" to have Abra ask you for the
|
||||||
password. "--ask-sudo-pass" may be passed if you run your provisioning commands
|
password. "--ask-sudo-pass" may be passed if you run your provisioning commands
|
||||||
via sudo privilege escalation.
|
via sudo privilege escalation.
|
||||||
|
|
||||||
If "--local" is passed, then Abra assumes that the current local server is
|
The <domain> argument must be a publicy accessible domain name which points to
|
||||||
intended as the target server. This is useful when you want to have your entire
|
your server. You should working SSH access to this server already, Abra will
|
||||||
Co-op Cloud config located on the server itself, and not on your local
|
assume port 22 and will use your current system username to make an initial
|
||||||
developer machine.
|
connection. You can use the <user> and <port> arguments to adjust this.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
abra server add --local
|
abra server add varia.zone glodemodem 12345 -p
|
||||||
|
|
||||||
Otherwise, you may specify a remote server. The <domain> argument must be a
|
|
||||||
publicy accessible domain name which points to your server. You should have SSH
|
|
||||||
access to this server, Abra will assume port 22 and will use your current
|
|
||||||
system username to make an initial connection. You can use the <user> and
|
|
||||||
<port> arguments to adjust this.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
abra server add --provision varia.zone glodemodem 12345
|
|
||||||
|
|
||||||
Abra will construct the following SSH connection and Docker context:
|
Abra will construct the following SSH connection and Docker context:
|
||||||
|
|
||||||
|
@ -412,9 +399,10 @@ Abra will construct the following SSH connection and Docker context:
|
||||||
|
|
||||||
All communication between Abra and the server will use this SSH connection.
|
All communication between Abra and the server will use this SSH connection.
|
||||||
|
|
||||||
In this example, Abra will install Docker and initialise swarm mode.
|
If "--local" is passed, then Abra assumes that the current local server is
|
||||||
|
intended as the target server. This is useful when you want to have your entire
|
||||||
You may omit flags to avoid performing this provisioning logic.
|
Co-op Cloud config located on the server itself, and not on your local
|
||||||
|
developer machine.
|
||||||
`,
|
`,
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
|
@ -437,6 +425,8 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
internal.ShowSubcommandHelpAndError(c, err)
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
domainName := internal.ValidateDomain(c)
|
||||||
|
|
||||||
if local {
|
if local {
|
||||||
if err := newLocalServer(c, "default"); err != nil {
|
if err := newLocalServer(c, "default"); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -444,11 +434,6 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
domainName, err := internal.ValidateDomain(c)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
username := c.Args().Get(1)
|
username := c.Args().Get(1)
|
||||||
if username == "" {
|
if username == "" {
|
||||||
systemUser, err := user.Current()
|
systemUser, err := user.Current()
|
||||||
|
@ -473,14 +458,17 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
|
|
||||||
cl, err := newClient(c, domainName)
|
cl, err := newClient(c, domainName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
cleanUp(domainName)
|
||||||
|
logrus.Debugf("failed to construct client for %s, saw %s", domainName, err.Error())
|
||||||
|
logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
|
||||||
}
|
}
|
||||||
|
|
||||||
if provision {
|
if provision {
|
||||||
logrus.Debugf("attempting to construct SSH client for %s", domainName)
|
logrus.Debugf("attempting to construct SSH client for %s", domainName)
|
||||||
sshCl, err := ssh.New(domainName, sshAuth, username, port)
|
sshCl, err := ssh.New(domainName, sshAuth, username, port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
cleanUp(domainName)
|
||||||
|
logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
|
||||||
}
|
}
|
||||||
defer sshCl.Close()
|
defer sshCl.Close()
|
||||||
logrus.Debugf("successfully created SSH client for %s", domainName)
|
logrus.Debugf("successfully created SSH client for %s", domainName)
|
||||||
|
@ -495,7 +483,7 @@ You may omit flags to avoid performing this provisioning logic.
|
||||||
|
|
||||||
if _, err := cl.Info(context.Background()); err != nil {
|
if _, err := cl.Info(context.Background()); err != nil {
|
||||||
cleanUp(domainName)
|
cleanUp(domainName)
|
||||||
logrus.Fatalf("couldn't make a remote docker connection to %s? use --provision/-p to attempt to install", domainName)
|
logrus.Fatalf(fmt.Sprintf(internal.ServerAddFailMsg, domainName))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -18,7 +18,6 @@ var serverListCommand = cli.Command{
|
||||||
Usage: "List managed servers",
|
Usage: "List managed servers",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
|
|
|
@ -223,10 +223,7 @@ Where "$provider_TOKEN" is the expected env var format.
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
|
||||||
internal.ServerProviderFlag,
|
internal.ServerProviderFlag,
|
||||||
internal.DebugFlag,
|
|
||||||
internal.NoInputFlag,
|
|
||||||
|
|
||||||
// Capsul
|
// Capsul
|
||||||
internal.CapsulInstanceURLFlag,
|
internal.CapsulInstanceURLFlag,
|
||||||
|
|
|
@ -126,21 +126,24 @@ like tears in rain.
|
||||||
},
|
},
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
serverName := c.Args().Get(1)
|
serverName := internal.ValidateServer(c)
|
||||||
if serverName != "" {
|
|
||||||
var err error
|
warnMsg := `Did not pass -s/--server for actual server deletion, prompting!
|
||||||
serverName, err = internal.ValidateServer(c)
|
|
||||||
if err != nil {
|
Abra doesn't currently know if it helped you create this server with one of the
|
||||||
logrus.Fatal(err)
|
3rd party integrations (e.g. Capsul). You have a choice here to actually,
|
||||||
}
|
really and finally destroy this server using those integrations. If you want to
|
||||||
}
|
do this, choose Yes.
|
||||||
|
|
||||||
|
If you just want to remove the server config files & context, choose No.
|
||||||
|
`
|
||||||
|
|
||||||
if !rmServer {
|
if !rmServer {
|
||||||
logrus.Warn("did not pass -s/--server for actual server deletion, prompting")
|
logrus.Warn(fmt.Sprintf(warnMsg))
|
||||||
|
|
||||||
response := false
|
response := false
|
||||||
prompt := &survey.Confirm{
|
prompt := &survey.Confirm{
|
||||||
Message: "prompt to actual server deletion?",
|
Message: "delete actual live server?",
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &response); err != nil {
|
if err := survey.AskOne(prompt, &response); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -164,21 +167,18 @@ like tears in rain.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if serverName != "" {
|
if err := client.DeleteContext(serverName); err != nil {
|
||||||
if err := client.DeleteContext(serverName); err != nil {
|
logrus.Fatal(err)
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, serverName)); err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Infof("server at %s has been lost in time, like tears in rain", serverName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, serverName)); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Infof("server at %s has been lost in time, like tears in rain", serverName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
30
go.mod
30
go.mod
|
@ -7,17 +7,17 @@ require (
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.2
|
github.com/AlecAivazis/survey/v2 v2.3.2
|
||||||
github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731094149-b031ea1211e7
|
github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731094149-b031ea1211e7
|
||||||
github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
|
github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
|
||||||
github.com/docker/cli v20.10.12+incompatible
|
github.com/docker/cli v20.10.13+incompatible
|
||||||
github.com/docker/distribution v2.7.1+incompatible
|
github.com/docker/distribution v2.8.1+incompatible
|
||||||
github.com/docker/docker v20.10.12+incompatible
|
github.com/docker/docker v20.10.13+incompatible
|
||||||
github.com/docker/go-units v0.4.0
|
github.com/docker/go-units v0.4.0
|
||||||
github.com/go-git/go-git/v5 v5.4.2
|
github.com/go-git/go-git/v5 v5.4.2
|
||||||
github.com/hetznercloud/hcloud-go v1.33.1
|
github.com/hetznercloud/hcloud-go v1.33.1
|
||||||
github.com/moby/sys/signal v0.6.0
|
github.com/moby/sys/signal v0.7.0
|
||||||
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
|
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
|
||||||
github.com/olekukonko/tablewriter v0.0.5
|
github.com/olekukonko/tablewriter v0.0.5
|
||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/schollz/progressbar/v3 v3.8.5
|
github.com/schollz/progressbar/v3 v3.8.6
|
||||||
github.com/schultz-is/passgen v1.0.1
|
github.com/schultz-is/passgen v1.0.1
|
||||||
github.com/sirupsen/logrus v1.8.1
|
github.com/sirupsen/logrus v1.8.1
|
||||||
gotest.tools/v3 v3.1.0
|
gotest.tools/v3 v3.1.0
|
||||||
|
@ -25,9 +25,11 @@ require (
|
||||||
|
|
||||||
require (
|
require (
|
||||||
coopcloud.tech/libcapsul v0.0.0-20211022074848-c35e78fe3f3e
|
coopcloud.tech/libcapsul v0.0.0-20211022074848-c35e78fe3f3e
|
||||||
github.com/Microsoft/hcsshim v0.8.21 // indirect
|
github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 // indirect
|
||||||
github.com/buger/goterm v1.0.3
|
github.com/buger/goterm v1.0.4
|
||||||
github.com/containerd/containerd v1.5.5 // indirect
|
github.com/containerd/containerd v1.5.9 // indirect
|
||||||
|
github.com/containers/image v3.0.2+incompatible
|
||||||
|
github.com/containers/storage v1.38.2 // indirect
|
||||||
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
github.com/docker/docker-credential-helpers v0.6.4 // indirect
|
||||||
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
|
||||||
github.com/fvbommel/sortorder v1.0.2 // indirect
|
github.com/fvbommel/sortorder v1.0.2 // indirect
|
||||||
|
@ -39,11 +41,13 @@ require (
|
||||||
github.com/libdns/gandi v1.0.2
|
github.com/libdns/gandi v1.0.2
|
||||||
github.com/libdns/libdns v0.2.1
|
github.com/libdns/libdns v0.2.1
|
||||||
github.com/moby/sys/mount v0.2.0 // indirect
|
github.com/moby/sys/mount v0.2.0 // indirect
|
||||||
github.com/morikuni/aec v1.0.0 // indirect
|
github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
|
||||||
github.com/opencontainers/runc v1.0.2 // indirect
|
github.com/sergi/go-diff v1.2.0 // indirect
|
||||||
|
github.com/spf13/cobra v1.3.0 // indirect
|
||||||
github.com/theupdateframework/notary v0.7.0 // indirect
|
github.com/theupdateframework/notary v0.7.0 // indirect
|
||||||
github.com/urfave/cli v1.22.5
|
github.com/urfave/cli v1.22.5
|
||||||
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
github.com/xanzy/ssh-agent v0.3.1 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
|
github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
|
||||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
|
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838
|
||||||
|
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
|
||||||
)
|
)
|
||||||
|
|
|
@ -27,7 +27,11 @@ func New(contextName string) (*client.Client, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
helper := commandconnPkg.NewConnectionHelper(ctxEndpoint)
|
helper, err := commandconnPkg.NewConnectionHelper(ctxEndpoint)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
httpClient := &http.Client{
|
httpClient := &http.Client{
|
||||||
// No tls, no proxy
|
// No tls, no proxy
|
||||||
Transport: &http.Transport{
|
Transport: &http.Transport{
|
||||||
|
|
|
@ -1,193 +1,57 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/base64"
|
"context"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/web"
|
"github.com/containers/image/docker"
|
||||||
|
"github.com/containers/image/types"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
"github.com/hashicorp/go-retryablehttp"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
type RawTag struct {
|
// GetRegistryTags retrieves all tags of an image from a container registry.
|
||||||
Layer string
|
func GetRegistryTags(img reference.Named) ([]string, error) {
|
||||||
Name string
|
var tags []string
|
||||||
}
|
|
||||||
|
|
||||||
type RawTags []RawTag
|
ref, err := docker.ParseReference(fmt.Sprintf("//%s", img))
|
||||||
|
if err != nil {
|
||||||
|
return tags, fmt.Errorf("failed to parse image %s, saw: %s", img, err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
var registryURL = "https://registry.hub.docker.com/v1/repositories/%s/tags"
|
ctx := context.Background()
|
||||||
|
tags, err = docker.GetRepositoryTags(ctx, &types.SystemContext{}, ref)
|
||||||
func GetRegistryTags(image string) (RawTags, error) {
|
if err != nil {
|
||||||
var tags RawTags
|
|
||||||
|
|
||||||
tagsUrl := fmt.Sprintf(registryURL, image)
|
|
||||||
if err := web.ReadJSON(tagsUrl, &tags); err != nil {
|
|
||||||
return tags, err
|
return tags, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return tags, nil
|
return tags, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func basicAuth(username, password string) string {
|
// GetTagDigest retrieves an image digest from a container registry.
|
||||||
auth := username + ":" + password
|
func GetTagDigest(cl *client.Client, image reference.Named) (string, error) {
|
||||||
return base64.StdEncoding.EncodeToString([]byte(auth))
|
target := fmt.Sprintf("//%s", reference.Path(image))
|
||||||
}
|
|
||||||
|
|
||||||
// getRegv2Token retrieves a registry v2 authentication token.
|
ref, err := docker.ParseReference(target)
|
||||||
func getRegv2Token(cl *client.Client, image reference.Named, registryUsername, registryPassword string) (string, error) {
|
|
||||||
img := reference.Path(image)
|
|
||||||
tokenURL := "https://auth.docker.io/token"
|
|
||||||
values := fmt.Sprintf("service=registry.docker.io&scope=repository:%s:pull", img)
|
|
||||||
|
|
||||||
fullURL := fmt.Sprintf("%s?%s", tokenURL, values)
|
|
||||||
req, err := retryablehttp.NewRequest("GET", fullURL, nil)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", fmt.Errorf("failed to parse image %s, saw: %s", image, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
if registryUsername != "" && registryPassword != "" {
|
ctx := context.Background()
|
||||||
logrus.Debugf("using registry log in credentials for token request")
|
img, err := ref.NewImage(ctx, nil)
|
||||||
auth := basicAuth(registryUsername, registryPassword)
|
|
||||||
req.Header.Add("Authorization", fmt.Sprintf("Basic %s", auth))
|
|
||||||
}
|
|
||||||
|
|
||||||
client := web.NewHTTPRetryClient()
|
|
||||||
res, err := client.Do(req)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
logrus.Debugf("failed to query remote registry for %s, saw: %s", image, err.Error())
|
||||||
|
return "", fmt.Errorf("unable to read digest for %s", image)
|
||||||
}
|
}
|
||||||
defer res.Body.Close()
|
defer img.Close()
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
digest := img.ConfigInfo().Digest.String()
|
||||||
_, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
body, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
|
|
||||||
tokenRes := struct {
|
|
||||||
AccessToken string `json:"access_token"`
|
|
||||||
Expiry int `json:"expires_in"`
|
|
||||||
Issued string `json:"issued_at"`
|
|
||||||
Token string `json:"token"`
|
|
||||||
}{}
|
|
||||||
|
|
||||||
if err := json.Unmarshal(body, &tokenRes); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return tokenRes.Token, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetTagDigest retrieves an image digest from a v2 registry
|
|
||||||
func GetTagDigest(cl *client.Client, image reference.Named, registryUsername, registryPassword string) (string, error) {
|
|
||||||
img := reference.Path(image)
|
|
||||||
tag := image.(reference.NamedTagged).Tag()
|
|
||||||
manifestURL := fmt.Sprintf("https://index.docker.io/v2/%s/manifests/%s", img, tag)
|
|
||||||
|
|
||||||
req, err := retryablehttp.NewRequest("GET", manifestURL, nil)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := getRegv2Token(cl, image, registryUsername, registryPassword)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
if token == "" {
|
|
||||||
return "", fmt.Errorf("unable to retrieve registry token?")
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Header = http.Header{
|
|
||||||
"Accept": []string{
|
|
||||||
"application/vnd.docker.distribution.manifest.v2+json",
|
|
||||||
"application/vnd.docker.distribution.manifest.list.v2+json",
|
|
||||||
},
|
|
||||||
"Authorization": []string{fmt.Sprintf("Bearer %s", token)},
|
|
||||||
}
|
|
||||||
|
|
||||||
client := web.NewHTTPRetryClient()
|
|
||||||
res, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
defer res.Body.Close()
|
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
|
||||||
_, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
body, err := ioutil.ReadAll(res.Body)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
registryResT1 := struct {
|
|
||||||
SchemaVersion int
|
|
||||||
MediaType string
|
|
||||||
Manifests []struct {
|
|
||||||
MediaType string
|
|
||||||
Size int
|
|
||||||
Digest string
|
|
||||||
Platform struct {
|
|
||||||
Architecture string
|
|
||||||
Os string
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
|
|
||||||
registryResT2 := struct {
|
|
||||||
SchemaVersion int
|
|
||||||
MediaType string
|
|
||||||
Config struct {
|
|
||||||
MediaType string
|
|
||||||
Size int
|
|
||||||
Digest string
|
|
||||||
}
|
|
||||||
Layers []struct {
|
|
||||||
MediaType string
|
|
||||||
Size int
|
|
||||||
Digest string
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
|
|
||||||
if err := json.Unmarshal(body, ®istryResT1); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
var digest string
|
|
||||||
for _, manifest := range registryResT1.Manifests {
|
|
||||||
if string(manifest.Platform.Architecture) == "amd64" {
|
|
||||||
digest = strings.Split(manifest.Digest, ":")[1][:7]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if digest == "" {
|
if digest == "" {
|
||||||
if err := json.Unmarshal(body, ®istryResT2); err != nil {
|
return digest, fmt.Errorf("unable to read digest for %s", image)
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
digest = strings.Split(registryResT2.Config.Digest, ":")[1][:7]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if digest == "" {
|
return strings.Split(digest, ":")[1][:7], nil
|
||||||
return "", fmt.Errorf("Unable to retrieve amd64 digest for %s", image)
|
|
||||||
}
|
|
||||||
|
|
||||||
return digest, nil
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,11 +5,9 @@ import (
|
||||||
|
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Volume, error) {
|
func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Volume, error) {
|
||||||
|
|
||||||
cl, err := New(server)
|
cl, err := New(server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -21,7 +19,7 @@ func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Vo
|
||||||
volumeListOKBody, err := cl.VolumeList(ctx, fs)
|
volumeListOKBody, err := cl.VolumeList(ctx, fs)
|
||||||
volumeList := volumeListOKBody.Volumes
|
volumeList := volumeListOKBody.Volumes
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return volumeList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return volumeList, nil
|
return volumeList, nil
|
||||||
|
@ -29,9 +27,11 @@ func GetVolumes(ctx context.Context, server string, appName string) ([]*types.Vo
|
||||||
|
|
||||||
func GetVolumeNames(volumes []*types.Volume) []string {
|
func GetVolumeNames(volumes []*types.Volume) []string {
|
||||||
var volumeNames []string
|
var volumeNames []string
|
||||||
|
|
||||||
for _, vol := range volumes {
|
for _, vol := range volumes {
|
||||||
volumeNames = append(volumeNames, vol.Name)
|
volumeNames = append(volumeNames, vol.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
return volumeNames
|
return volumeNames
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,12 +40,13 @@ func RemoveVolumes(ctx context.Context, server string, volumeNames []string, for
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, volName := range volumeNames {
|
for _, volName := range volumeNames {
|
||||||
err := cl.VolumeRemove(ctx, volName, force)
|
err := cl.VolumeRemove(ctx, volName, force)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ type AppFiles map[AppName]AppFile
|
||||||
// App reprents an app with its env file read into memory
|
// App reprents an app with its env file read into memory
|
||||||
type App struct {
|
type App struct {
|
||||||
Name AppName
|
Name AppName
|
||||||
Type string
|
Recipe string
|
||||||
Domain string
|
Domain string
|
||||||
Env AppEnv
|
Env AppEnv
|
||||||
Server string
|
Server string
|
||||||
|
@ -52,13 +52,17 @@ func (a App) StackName() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
stackName := SanitiseAppName(a.Name)
|
stackName := SanitiseAppName(a.Name)
|
||||||
|
|
||||||
|
if len(stackName) > 45 {
|
||||||
|
logrus.Debugf("trimming %s to %s to avoid runtime limits", stackName, stackName[:45])
|
||||||
|
stackName = stackName[:45]
|
||||||
|
}
|
||||||
|
|
||||||
a.Env["STACK_NAME"] = stackName
|
a.Env["STACK_NAME"] = stackName
|
||||||
|
|
||||||
return stackName
|
return stackName
|
||||||
}
|
}
|
||||||
|
|
||||||
// SORTING TYPES
|
|
||||||
|
|
||||||
// ByServer sort a slice of Apps
|
// ByServer sort a slice of Apps
|
||||||
type ByServer []App
|
type ByServer []App
|
||||||
|
|
||||||
|
@ -68,25 +72,25 @@ func (a ByServer) Less(i, j int) bool {
|
||||||
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ByServerAndType sort a slice of Apps
|
// ByServerAndRecipe sort a slice of Apps
|
||||||
type ByServerAndType []App
|
type ByServerAndRecipe []App
|
||||||
|
|
||||||
func (a ByServerAndType) Len() int { return len(a) }
|
func (a ByServerAndRecipe) Len() int { return len(a) }
|
||||||
func (a ByServerAndType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
func (a ByServerAndRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
||||||
func (a ByServerAndType) Less(i, j int) bool {
|
func (a ByServerAndRecipe) Less(i, j int) bool {
|
||||||
if a[i].Server == a[j].Server {
|
if a[i].Server == a[j].Server {
|
||||||
return strings.ToLower(a[i].Type) < strings.ToLower(a[j].Type)
|
return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
|
||||||
}
|
}
|
||||||
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
return strings.ToLower(a[i].Server) < strings.ToLower(a[j].Server)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ByType sort a slice of Apps
|
// ByRecipe sort a slice of Apps
|
||||||
type ByType []App
|
type ByRecipe []App
|
||||||
|
|
||||||
func (a ByType) Len() int { return len(a) }
|
func (a ByRecipe) Len() int { return len(a) }
|
||||||
func (a ByType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
func (a ByRecipe) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
||||||
func (a ByType) Less(i, j int) bool {
|
func (a ByRecipe) Less(i, j int) bool {
|
||||||
return strings.ToLower(a[i].Type) < strings.ToLower(a[j].Type)
|
return strings.ToLower(a[i].Recipe) < strings.ToLower(a[j].Recipe)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ByName sort a slice of Apps
|
// ByName sort a slice of Apps
|
||||||
|
@ -118,15 +122,18 @@ func readAppEnvFile(appFile AppFile, name AppName) (App, error) {
|
||||||
func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
|
func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
|
||||||
domain := env["DOMAIN"]
|
domain := env["DOMAIN"]
|
||||||
|
|
||||||
appType, exists := env["TYPE"]
|
recipe, exists := env["RECIPE"]
|
||||||
if !exists {
|
if !exists {
|
||||||
return App{}, fmt.Errorf("%s is missing the TYPE env var", name)
|
recipe, exists = env["TYPE"]
|
||||||
|
if !exists {
|
||||||
|
return App{}, fmt.Errorf("%s is missing the RECIPE env var", name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return App{
|
return App{
|
||||||
Name: name,
|
Name: name,
|
||||||
Domain: domain,
|
Domain: domain,
|
||||||
Type: appType,
|
Recipe: recipe,
|
||||||
Env: env,
|
Env: env,
|
||||||
Server: appFile.Server,
|
Server: appFile.Server,
|
||||||
Path: appFile.Path,
|
Path: appFile.Path,
|
||||||
|
@ -213,13 +220,13 @@ func GetAppServiceNames(appName string) ([]string, error) {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
composeFiles, err := GetAppComposeFiles(app.Type, app.Env)
|
composeFiles, err := GetAppComposeFiles(app.Recipe, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
opts := stack.Deploy{Composefiles: composeFiles}
|
opts := stack.Deploy{Composefiles: composeFiles}
|
||||||
compose, err := GetAppComposeConfig(app.Type, opts, app.Env)
|
compose, err := GetAppComposeConfig(app.Recipe, opts, app.Env)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return serviceNames, err
|
return serviceNames, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,10 +16,11 @@ import (
|
||||||
|
|
||||||
var ABRA_DIR = os.ExpandEnv("$HOME/.abra")
|
var ABRA_DIR = os.ExpandEnv("$HOME/.abra")
|
||||||
var SERVERS_DIR = path.Join(ABRA_DIR, "servers")
|
var SERVERS_DIR = path.Join(ABRA_DIR, "servers")
|
||||||
var RECIPES_DIR = path.Join(ABRA_DIR, "apps")
|
var RECIPES_DIR = path.Join(ABRA_DIR, "recipes")
|
||||||
var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
|
var VENDOR_DIR = path.Join(ABRA_DIR, "vendor")
|
||||||
var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json")
|
var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json")
|
||||||
var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
|
var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud"
|
||||||
|
var CATALOGUE_JSON_REPO_NAME = "recipes-catalogue-json"
|
||||||
var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
|
var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
|
||||||
|
|
||||||
// GetServers retrieves all servers.
|
// GetServers retrieves all servers.
|
||||||
|
|
|
@ -20,12 +20,12 @@ var serverName = "evil.corp"
|
||||||
|
|
||||||
var expectedAppEnv = AppEnv{
|
var expectedAppEnv = AppEnv{
|
||||||
"DOMAIN": "ecloud.evil.corp",
|
"DOMAIN": "ecloud.evil.corp",
|
||||||
"TYPE": "ecloud",
|
"RECIPE": "ecloud",
|
||||||
}
|
}
|
||||||
|
|
||||||
var expectedApp = App{
|
var expectedApp = App{
|
||||||
Name: appName,
|
Name: appName,
|
||||||
Type: expectedAppEnv["TYPE"],
|
Recipe: expectedAppEnv["RECIPE"],
|
||||||
Domain: expectedAppEnv["DOMAIN"],
|
Domain: expectedAppEnv["DOMAIN"],
|
||||||
Env: expectedAppEnv,
|
Env: expectedAppEnv,
|
||||||
Path: expectedAppFile.Path,
|
Path: expectedAppFile.Path,
|
||||||
|
@ -74,11 +74,11 @@ func TestReadEnv(t *testing.T) {
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(env, expectedAppEnv) {
|
if !reflect.DeepEqual(env, expectedAppEnv) {
|
||||||
t.Fatalf(
|
t.Fatalf(
|
||||||
"did not get expected application settings. Expected: DOMAIN=%s TYPE=%s; Got: DOMAIN=%s TYPE=%s",
|
"did not get expected application settings. Expected: DOMAIN=%s RECIPE=%s; Got: DOMAIN=%s RECIPE=%s",
|
||||||
expectedAppEnv["DOMAIN"],
|
expectedAppEnv["DOMAIN"],
|
||||||
expectedAppEnv["TYPE"],
|
expectedAppEnv["RECIPE"],
|
||||||
env["DOMAIN"],
|
env["DOMAIN"],
|
||||||
env["TYPE"],
|
env["RECIPE"],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,10 +13,10 @@ import (
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetContainer retrieves a container. If prompt is true and the retrievd count
|
// GetContainer retrieves a container. If noInput is false and the retrievd
|
||||||
// of containers does not match 1, then a prompt is presented to let the user
|
// count of containers does not match 1, then a prompt is presented to let the
|
||||||
// choose. A count of 0 is handled gracefully.
|
// user choose. A count of 0 is handled gracefully.
|
||||||
func GetContainer(c context.Context, cl *client.Client, filters filters.Args, prompt bool) (types.Container, error) {
|
func GetContainer(c context.Context, cl *client.Client, filters filters.Args, noInput bool) (types.Container, error) {
|
||||||
containerOpts := types.ContainerListOptions{Filters: filters}
|
containerOpts := types.ContainerListOptions{Filters: filters}
|
||||||
containers, err := cl.ContainerList(c, containerOpts)
|
containers, err := cl.ContainerList(c, containerOpts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -37,7 +37,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, pr
|
||||||
containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
|
containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
|
||||||
}
|
}
|
||||||
|
|
||||||
if !prompt {
|
if noInput {
|
||||||
err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
|
err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
|
||||||
return types.Container{}, err
|
return types.Container{}, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,6 @@ func EnsureIPv4(domainName string) (string, error) {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("created DNS resolver via %s", freifunkDNS)
|
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
ips, err := resolver.LookupIPAddr(ctx, domainName)
|
ips, err := resolver.LookupIPAddr(ctx, domainName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -60,7 +58,7 @@ func EnsureIPv4(domainName string) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ipv4 = ips[0].IP.To4().String()
|
ipv4 = ips[0].IP.To4().String()
|
||||||
logrus.Debugf("discovered the following ipv4 addr: %s", ipv4)
|
logrus.Debugf("%s points to %s (resolver: %s)", domainName, ipv4, freifunkDNS)
|
||||||
|
|
||||||
return ipv4, nil
|
return ipv4, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,6 +78,13 @@ var LintRules = map[string][]LintRule{
|
||||||
HowToResolve: "fill out all the metadata",
|
HowToResolve: "fill out all the metadata",
|
||||||
Function: LintMetadataFilledIn,
|
Function: LintMetadataFilledIn,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
Ref: "R013",
|
||||||
|
Level: "warn",
|
||||||
|
Description: "git.coopcloud.tech repo exists",
|
||||||
|
HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
|
||||||
|
Function: LintHasRecipeRepo,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
{
|
{
|
||||||
|
@ -115,13 +122,6 @@ var LintRules = map[string][]LintRule{
|
||||||
HowToResolve: "vendor config versions in an abra.sh",
|
HowToResolve: "vendor config versions in an abra.sh",
|
||||||
Function: LintAbraShVendors,
|
Function: LintAbraShVendors,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
Ref: "R013",
|
|
||||||
Level: "error",
|
|
||||||
Description: "git.coopcloud.tech repo exists",
|
|
||||||
HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
|
|
||||||
Function: LintHasRecipeRepo,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecipeCatalogueURL is the only current recipe catalogue available.
|
// RecipeCatalogueURL is the only current recipe catalogue available.
|
||||||
const RecipeCatalogueURL = "https://apps.coopcloud.tech"
|
const RecipeCatalogueURL = "https://recipes.coopcloud.tech"
|
||||||
|
|
||||||
// ReposMetadataURL is the recipe repository metadata
|
// ReposMetadataURL is the recipe repository metadata
|
||||||
const ReposMetadataURL = "https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos"
|
const ReposMetadataURL = "https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos"
|
||||||
|
@ -232,7 +232,11 @@ func Get(recipeName string) (Recipe, error) {
|
||||||
|
|
||||||
meta, err := GetRecipeMeta(recipeName)
|
meta, err := GetRecipeMeta(recipeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return Recipe{}, err
|
if strings.Contains(err.Error(), "does not exist") {
|
||||||
|
meta = RecipeMeta{}
|
||||||
|
} else {
|
||||||
|
return Recipe{}, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Recipe{
|
return Recipe{
|
||||||
|
@ -355,7 +359,7 @@ func EnsureLatest(recipeName string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
branch, err := gitPkg.GetCurrentBranch(repo)
|
branch, err := GetDefaultBranch(repo, recipeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -615,11 +619,15 @@ func EnsureUpToDate(recipeName string) error {
|
||||||
func GetDefaultBranch(repo *git.Repository, recipeName string) (plumbing.ReferenceName, error) {
|
func GetDefaultBranch(repo *git.Repository, recipeName string) (plumbing.ReferenceName, error) {
|
||||||
recipeDir := path.Join(config.RECIPES_DIR, recipeName)
|
recipeDir := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
|
|
||||||
|
meta, _ := GetRecipeMeta(recipeName)
|
||||||
|
if meta.DefaultBranch != "" {
|
||||||
|
return plumbing.ReferenceName(fmt.Sprintf("refs/heads/%s", meta.DefaultBranch)), nil
|
||||||
|
}
|
||||||
|
|
||||||
branch := "master"
|
branch := "master"
|
||||||
if _, err := repo.Branch("master"); err != nil {
|
if _, err := repo.Branch("master"); err != nil {
|
||||||
if _, err := repo.Branch("main"); err != nil {
|
if _, err := repo.Branch("main"); err != nil {
|
||||||
logrus.Debugf("failed to select branch in %s", recipeDir)
|
return "", fmt.Errorf("failed to select default branch in %s", recipeDir)
|
||||||
return "", err
|
|
||||||
}
|
}
|
||||||
branch = "main"
|
branch = "main"
|
||||||
}
|
}
|
||||||
|
@ -689,7 +697,7 @@ func recipeCatalogueFSIsLatest() (bool, error) {
|
||||||
return false, nil
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debug("file system cached recipe catalogue is now up-to-date")
|
logrus.Debug("file system cached recipe catalogue is up-to-date")
|
||||||
|
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
@ -708,14 +716,12 @@ func ReadRecipeCatalogue() (RecipeCatalogue, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if !recipeFSIsLatest {
|
if !recipeFSIsLatest {
|
||||||
logrus.Debugf("reading recipe catalogue from web to get latest")
|
|
||||||
if err := readRecipeCatalogueWeb(&recipes); err != nil {
|
if err := readRecipeCatalogueWeb(&recipes); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return recipes, nil
|
return recipes, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Debugf("reading recipe catalogue from file system cache to get latest")
|
|
||||||
if err := readRecipeCatalogueFS(&recipes); err != nil {
|
if err := readRecipeCatalogueFS(&recipes); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -797,8 +803,7 @@ func GetRecipeMeta(recipeName string) (RecipeMeta, error) {
|
||||||
|
|
||||||
recipeMeta, ok := catl[recipeName]
|
recipeMeta, ok := catl[recipeName]
|
||||||
if !ok {
|
if !ok {
|
||||||
err := fmt.Errorf("recipe %s does not exist?", recipeName)
|
return RecipeMeta{}, fmt.Errorf("recipe %s does not exist?", recipeName)
|
||||||
return RecipeMeta{}, err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := EnsureExists(recipeName); err != nil {
|
if err := EnsureExists(recipeName); err != nil {
|
||||||
|
@ -923,7 +928,7 @@ func ReadReposMetadata() (RepoCatalogue, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRecipeVersions retrieves all recipe versions.
|
// GetRecipeVersions retrieves all recipe versions.
|
||||||
func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (RecipeVersions, error) {
|
func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
|
||||||
versions := RecipeVersions{}
|
versions := RecipeVersions{}
|
||||||
|
|
||||||
recipeDir := path.Join(config.RECIPES_DIR, recipeName)
|
recipeDir := path.Join(config.RECIPES_DIR, recipeName)
|
||||||
|
@ -937,7 +942,7 @@ func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (R
|
||||||
|
|
||||||
worktree, err := repo.Worktree()
|
worktree, err := repo.Worktree()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return versions, err
|
||||||
}
|
}
|
||||||
|
|
||||||
gitTags, err := repo.Tags()
|
gitTags, err := repo.Tags()
|
||||||
|
@ -967,9 +972,9 @@ func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (R
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
cl, err := client.New("default") // only required for docker.io registry calls
|
cl, err := client.New("default") // only required for container registry calls
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
queryCache := make(map[reference.Named]string)
|
queryCache := make(map[reference.Named]string)
|
||||||
|
@ -997,18 +1002,19 @@ func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (R
|
||||||
var exists bool
|
var exists bool
|
||||||
var digest string
|
var digest string
|
||||||
if digest, exists = queryCache[img]; !exists {
|
if digest, exists = queryCache[img]; !exists {
|
||||||
logrus.Debugf("looking up image: %s from %s", img, path)
|
logrus.Debugf("cache miss: querying for image: %s, tag: %s", path, tag)
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
digest, err = client.GetTagDigest(cl, img, registryUsername, registryPassword)
|
digest, err = client.GetTagDigest(cl, img)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Warn(err)
|
logrus.Warn(err)
|
||||||
continue
|
digest = "unknown"
|
||||||
}
|
}
|
||||||
logrus.Debugf("queried for image: %s, tag: %s, digest: %s", path, tag, digest)
|
|
||||||
queryCache[img] = digest
|
queryCache[img] = digest
|
||||||
logrus.Debugf("cached image: %s, tag: %s, digest: %s", path, tag, digest)
|
logrus.Debugf("cached insert: %s, tag: %s, digest: %s", path, tag, digest)
|
||||||
} else {
|
} else {
|
||||||
logrus.Debugf("reading image: %s, tag: %s, digest: %s from cache", path, tag, digest)
|
logrus.Debugf("cache hit: image: %s, tag: %s, digest: %s", path, tag, digest)
|
||||||
}
|
}
|
||||||
|
|
||||||
versionMeta[service.Name] = ServiceMeta{
|
versionMeta[service.Name] = ServiceMeta{
|
||||||
|
@ -1054,7 +1060,7 @@ func GetRecipeCatalogueVersions(recipeName string, catl RecipeCatalogue) ([]stri
|
||||||
func EnsureCatalogue() error {
|
func EnsureCatalogue() error {
|
||||||
catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
|
catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
|
||||||
if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
|
if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
|
||||||
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "recipes")
|
url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME)
|
||||||
if err := gitPkg.Clone(catalogueDir, url); err != nil {
|
if err := gitPkg.Clone(catalogueDir, url); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"coopcloud.tech/abra/pkg/client"
|
"coopcloud.tech/abra/pkg/client"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
|
@ -119,23 +120,32 @@ func ParseSecretEnvVarValue(secret string) (secretValue, error) {
|
||||||
func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (map[string]string, error) {
|
func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (map[string]string, error) {
|
||||||
secrets := make(map[string]string)
|
secrets := make(map[string]string)
|
||||||
|
|
||||||
|
var mutex sync.Mutex
|
||||||
|
var wg sync.WaitGroup
|
||||||
ch := make(chan error, len(secretEnvVars))
|
ch := make(chan error, len(secretEnvVars))
|
||||||
for secretEnvVar := range secretEnvVars {
|
for secretEnvVar := range secretEnvVars {
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
go func(s string) {
|
go func(s string) {
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
secretName := ParseSecretEnvVarName(s)
|
secretName := ParseSecretEnvVarName(s)
|
||||||
secretValue, err := ParseSecretEnvVarValue(secretEnvVars[s])
|
secretValue, err := ParseSecretEnvVarValue(secretEnvVars[s])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ch <- err
|
ch <- err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
secretRemoteName := fmt.Sprintf("%s_%s_%s", appName, secretName, secretValue.Version)
|
secretRemoteName := fmt.Sprintf("%s_%s_%s", appName, secretName, secretValue.Version)
|
||||||
logrus.Debugf("attempting to generate and store %s on %s", secretRemoteName, server)
|
logrus.Debugf("attempting to generate and store %s on %s", secretRemoteName, server)
|
||||||
|
|
||||||
if secretValue.Length > 0 {
|
if secretValue.Length > 0 {
|
||||||
passwords, err := GeneratePasswords(1, uint(secretValue.Length))
|
passwords, err := GeneratePasswords(1, uint(secretValue.Length))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ch <- err
|
ch <- err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
|
if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
|
||||||
if strings.Contains(err.Error(), "AlreadyExists") {
|
if strings.Contains(err.Error(), "AlreadyExists") {
|
||||||
logrus.Warnf("%s already exists, moving on...", secretRemoteName)
|
logrus.Warnf("%s already exists, moving on...", secretRemoteName)
|
||||||
|
@ -145,6 +155,9 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex.Lock()
|
||||||
|
defer mutex.Unlock()
|
||||||
secrets[secretName] = passwords[0]
|
secrets[secretName] = passwords[0]
|
||||||
} else {
|
} else {
|
||||||
passphrases, err := GeneratePassphrases(1)
|
passphrases, err := GeneratePassphrases(1)
|
||||||
|
@ -152,6 +165,7 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
|
||||||
ch <- err
|
ch <- err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
|
if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
|
||||||
if strings.Contains(err.Error(), "AlreadyExists") {
|
if strings.Contains(err.Error(), "AlreadyExists") {
|
||||||
logrus.Warnf("%s already exists, moving on...", secretRemoteName)
|
logrus.Warnf("%s already exists, moving on...", secretRemoteName)
|
||||||
|
@ -161,12 +175,17 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex.Lock()
|
||||||
|
defer mutex.Unlock()
|
||||||
secrets[secretName] = passphrases[0]
|
secrets[secretName] = passphrases[0]
|
||||||
}
|
}
|
||||||
ch <- nil
|
ch <- nil
|
||||||
}(secretEnvVar)
|
}(secretEnvVar)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
for range secretEnvVars {
|
for range secretEnvVars {
|
||||||
err := <-ch
|
err := <-ch
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -67,13 +67,13 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*connhelper.Conne
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewConnectionHelper(daemonURL string) *connhelper.ConnectionHelper {
|
func NewConnectionHelper(daemonURL string) (*connhelper.ConnectionHelper, error) {
|
||||||
helper, err := GetConnectionHelper(daemonURL)
|
helper, err := GetConnectionHelper(daemonURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return helper
|
return helper, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDockerEndpoint(host string) (docker.Endpoint, error) {
|
func getDockerEndpoint(host string) (docker.Endpoint, error) {
|
||||||
|
|
|
@ -420,6 +420,12 @@ func convertServiceSecrets(
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE(d1): strip # length=... modifiers
|
||||||
|
if strings.Contains(obj.Name, "#") {
|
||||||
|
vals := strings.Split(obj.Name, "#")
|
||||||
|
obj.Name = strings.TrimSpace(vals[0])
|
||||||
|
}
|
||||||
|
|
||||||
file := swarm.SecretReferenceFileTarget(obj.File)
|
file := swarm.SecretReferenceFileTarget(obj.File)
|
||||||
refs = append(refs, &swarm.SecretReference{
|
refs = append(refs, &swarm.SecretReference{
|
||||||
File: &file,
|
File: &file,
|
||||||
|
|
|
@ -35,16 +35,21 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
recipeName, exists := appEnv["RECIPE"]
|
||||||
|
if !exists {
|
||||||
|
recipeName, _ = appEnv["TYPE"]
|
||||||
|
}
|
||||||
|
|
||||||
unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
|
unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
|
||||||
if len(unsupportedProperties) > 0 {
|
if len(unsupportedProperties) > 0 {
|
||||||
logrus.Warnf("%s: ignoring unsupported options: %s",
|
logrus.Warnf("%s: ignoring unsupported options: %s",
|
||||||
appEnv["TYPE"], strings.Join(unsupportedProperties, ", "))
|
recipeName, strings.Join(unsupportedProperties, ", "))
|
||||||
}
|
}
|
||||||
|
|
||||||
deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
|
deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
|
||||||
if len(deprecatedProperties) > 0 {
|
if len(deprecatedProperties) > 0 {
|
||||||
logrus.Warnf("%s: ignoring deprecated options: %s",
|
logrus.Warnf("%s: ignoring deprecated options: %s",
|
||||||
appEnv["TYPE"], propertyWarnings(deprecatedProperties))
|
recipeName, propertyWarnings(deprecatedProperties))
|
||||||
}
|
}
|
||||||
return config, nil
|
return config, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
TYPE=gitea
|
|
|
@ -1 +0,0 @@
|
||||||
TYPE=wordpress
|
|
|
@ -1 +0,0 @@
|
||||||
TYPE=wordpress
|
|
|
@ -1,7 +0,0 @@
|
||||||
FROM debian:bullseye-slim
|
|
||||||
|
|
||||||
RUN apt update && apt install -y wget curl git;
|
|
||||||
|
|
||||||
RUN git config --global user.email "integration-tests@coopcloud.tech";
|
|
||||||
|
|
||||||
RUN git config --global user.name "integration-tests";
|
|
|
@ -1,11 +1,28 @@
|
||||||
# integration tests
|
# integration tests
|
||||||
|
|
||||||
- `cp .envrc.sample .envrc` (fill out values && `direnv allow`)
|
> You need to be a member of Autonomic Co-op to run these tests, sorry!
|
||||||
- `TARGET=install.sh make` (ensure `docker context use default`)
|
|
||||||
|
|
||||||
`testfunctions.sh` contains the functions necessary to save and manipulate logs
|
`testfunctions.sh` contains the functions necessary to save and manipulate
|
||||||
run `test_all.sh logdir` to run tests specified in that file and save the logs to `logdir`
|
logs. Run `test_all.sh logdir` to run tests specified in that file and save the
|
||||||
when creating new tests, make sure the test command is a one-liner (you can use `;` to separate commands). include `testfunctions.sh` and then write your tests like this:
|
logs to `logdir`.
|
||||||
`run_test '$ABRA other stuff here'`
|
|
||||||
|
|
||||||
by default, the testing script will ask after every command if the execution succeeded. If you reply `n`, it will log the test in the `logdir`. If you want all tests to run without questions, run `export logall=yes` before executing the test script
|
When creating new tests, make sure the test command is a one-liner (you can use
|
||||||
|
`;` to separate commands). Include `testfunctions.sh` and then write your tests
|
||||||
|
like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
run_test '$ABRA other stuff here'
|
||||||
|
```
|
||||||
|
|
||||||
|
By default, the testing script will ask after every command if the execution
|
||||||
|
succeeded. If you reply `n`, it will log the test in the `logdir`. If you want
|
||||||
|
all tests to run without questions, run `export logall=yes` before executing
|
||||||
|
the test script.
|
||||||
|
|
||||||
|
To run tests, you'll need to prepare your environment:
|
||||||
|
|
||||||
|
```
|
||||||
|
cp .envrc.sample .envrc # fill out values...
|
||||||
|
direnv allow
|
||||||
|
./test_all.sh logs
|
||||||
|
```
|
||||||
|
|
|
@ -3,14 +3,12 @@
|
||||||
source ./testfunctions.sh
|
source ./testfunctions.sh
|
||||||
source ./common.sh
|
source ./common.sh
|
||||||
|
|
||||||
echo "all apps, all servers"
|
|
||||||
run_test '$ABRA app ls'
|
run_test '$ABRA app ls'
|
||||||
printf "\\n\\n\\n"
|
|
||||||
|
|
||||||
echo "all wordpress apps, all servers"
|
run_test '$ABRA app ls --status'
|
||||||
|
|
||||||
run_test '$ABRA app ls --type wordpress'
|
run_test '$ABRA app ls --type wordpress'
|
||||||
printf "\\n\\n\\n"
|
|
||||||
|
|
||||||
echo "all wordpress apps, only server2"
|
run_test '$ABRA app ls --type wordpress --server swarm.autonomic.zone'
|
||||||
run_test '$ABRA app ls --type wordpress --server server2'
|
|
||||||
printf "\\n\\n\\n"
|
run_test '$ABRA app ls --type wordpress --server swarm.autonomic.zone --status'
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
source ./testfunctions.sh
|
source ./testfunctions.sh
|
||||||
source ./common.sh
|
source ./common.sh
|
||||||
|
|
||||||
run_test '$ABRA --debug catalogue generate'
|
run_test '$ABRA catalogue generate'
|
||||||
|
|
||||||
run_test '$ABRA --debug catalogue generate gitea'
|
run_test '$ABRA catalogue generate gitea'
|
||||||
|
|
|
@ -3,15 +3,8 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
ABRA="$HOME/.local/bin/abra"
|
ABRA="$(pwd)/../../abra"
|
||||||
INSTALLER_URL="https://install.abra.coopcloud.tech"
|
INSTALLER_URL="https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/installer/installer"
|
||||||
|
|
||||||
for arg in "$@"; do
|
|
||||||
if [ "$arg" == "--dev" ]; then
|
|
||||||
ABRA="/src/abra"
|
|
||||||
INSTALLER_URL="https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/installer/installer"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
export PATH=$PATH:$HOME/.local/bin
|
export PATH=$PATH:$HOME/.local/bin
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
default:
|
|
||||||
@docker run \
|
|
||||||
-v $$(pwd)/../../:/src \
|
|
||||||
-v $$(pwd)/.abra:/root/.abra \
|
|
||||||
--env-file .envrc \
|
|
||||||
decentral1se/abra-int:latest \
|
|
||||||
sh -c '\
|
|
||||||
echo "Running $(TARGET)..."; \
|
|
||||||
cd /src/tests/integration; \
|
|
||||||
bash "$(TARGET)" -- --dev \
|
|
||||||
'
|
|
|
@ -6,7 +6,8 @@ source ./common.sh
|
||||||
run_test '$ABRA recipe new testrecipe'
|
run_test '$ABRA recipe new testrecipe'
|
||||||
|
|
||||||
run_test '$ABRA recipe list'
|
run_test '$ABRA recipe list'
|
||||||
run_test '$ABRA recipe list -p cloud'
|
|
||||||
|
run_test '$ABRA recipe list --pattern cloud'
|
||||||
|
|
||||||
run_test '$ABRA recipe versions peertube'
|
run_test '$ABRA recipe versions peertube'
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,21 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
source ./testfunctions.sh
|
||||||
source ./common.sh
|
source ./common.sh
|
||||||
|
|
||||||
$ABRA record new -p gandi -t A -n int-core -v 192.157.2.21 coopcloud.tech
|
run_test "$ABRA record new \
|
||||||
|
--provider gandi \
|
||||||
|
--record-type A \
|
||||||
|
--record-name integration-tests \
|
||||||
|
--record-value 192.157.2.21 \
|
||||||
|
--no-input coopcloud.tech \
|
||||||
|
"
|
||||||
|
|
||||||
$ABRA record list -p gandi coopcloud.tech | grep -q int-core
|
run_test '$ABRA record list --provider gandi coopcloud.tech'
|
||||||
|
|
||||||
$ABRA -n record rm -p gandi -t A -n int-core coopcloud.tech
|
run_test "$ABRA record rm \
|
||||||
|
--provider gandi \
|
||||||
|
--record-type A \
|
||||||
|
--record-name integration-tests \
|
||||||
|
--no-input coopcloud.tech
|
||||||
|
"
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
source ./testfunctions.sh
|
||||||
source ./common.sh
|
source ./common.sh
|
||||||
|
|
||||||
$ABRA -n server new -p hetzner-cloud --hn int-core
|
run_test '$ABRA server new --provider hetzner-cloud --hetzner-name integration-tests --no-input'
|
||||||
|
|
||||||
$ABRA server ls | grep -q int-core
|
run_test '$ABRA server ls'
|
||||||
|
|
||||||
$ABRA -n server rm -s -p hetzner-cloud --hn int-core
|
run_test '$ABRA server rm --provider hetzner-cloud --hetzner-name int-core --server --no-input'
|
||||||
|
|
|
@ -16,7 +16,7 @@ run_test () {
|
||||||
echo $logfile
|
echo $logfile
|
||||||
}
|
}
|
||||||
|
|
||||||
testScripts=("app.sh" "recipe.sh" "install.sh")
|
testScripts=("app.sh" "autocomplete.sh" "catalogue.sh" "install.sh" "recipe.sh" "records.sh" "server.sh")
|
||||||
|
|
||||||
for i in "${testScripts[@]}"; do
|
for i in "${testScripts[@]}"; do
|
||||||
cmd="./$i $res_dir${i/sh/log}"
|
cmd="./$i $res_dir${i/sh/log}"
|
||||||
|
|
|
@ -16,7 +16,7 @@ run_test () {
|
||||||
else
|
else
|
||||||
tempLogfile=$(mktemp)
|
tempLogfile=$(mktemp)
|
||||||
cmd=$(eval echo "$@")
|
cmd=$(eval echo "$@")
|
||||||
echo "------------ INPUT -------------------" | tee -a $tempLogfile
|
echo -e "\\n------------ INPUT -------------------" | tee -a $tempLogfile
|
||||||
echo "$" "$cmd" | tee -a $tempLogfile
|
echo "$" "$cmd" | tee -a $tempLogfile
|
||||||
echo "------------ OUTPUT ------------------" | tee -a $tempLogfile
|
echo "------------ OUTPUT ------------------" | tee -a $tempLogfile
|
||||||
eval $cmd 2>&1 | tee -a $tempLogfile
|
eval $cmd 2>&1 | tee -a $tempLogfile
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
# manual test plan
|
|
||||||
|
|
||||||
## recipe publish
|
|
||||||
|
|
||||||
- `abra recipe upgrade <recipe>`
|
|
||||||
- `cd ~/.abra/apps/<recipe>/ && git diff` to ensure changes made
|
|
||||||
|
|
||||||
- `abra recipe sync <recipe>`
|
|
||||||
- `cd ~/.abra/apps/<recipe>/ && git diff` to ensure changes made
|
|
||||||
|
|
||||||
- `abra recipe release <recipe> --dry-run`
|
|
||||||
- prompts should be correct, read what `abra` asks you carefully
|
|
||||||
|
|
||||||
## deploy, upgrade, rollback
|
|
||||||
|
|
||||||
- `abra app deploy --chaos <app>`
|
|
||||||
- `abra app deploy --force <app>`
|
|
||||||
- `abra app deploy <app>`
|
|
||||||
- `abra app rollback <app>`
|
|
||||||
- `abra app upgrade <app>`
|
|
||||||
|
|
||||||
## app day-to-day ops
|
|
||||||
|
|
||||||
- `abra app check <app>`
|
|
||||||
- `abra app config <app>`
|
|
||||||
- `abra app cp <app>`
|
|
||||||
- `abra app errors -w <app>`
|
|
||||||
- `abra app logs <app>`
|
|
||||||
- `abra app ls --status <app>`
|
|
||||||
- `abra app new --secrets <recipe>`
|
|
||||||
- `abra app ps <app>`
|
|
||||||
- `abra app remove <app>`
|
|
||||||
- `abra app restart <app>`
|
|
||||||
- `abra app run <app>`
|
|
||||||
- `abra app secret generate --all`
|
|
||||||
- `abra app secret insert <app> foo v1 bar`
|
|
||||||
- `abra app secret ls <app>`
|
|
||||||
- `abra app secret remove <app> foo`
|
|
||||||
- `abra app volume ls <app>`
|
|
||||||
- `abra app volume remove --force <app>`
|
|
|
@ -1,2 +1,2 @@
|
||||||
TYPE=ecloud
|
RECIPE=ecloud
|
||||||
DOMAIN=ecloud.evil.corp
|
DOMAIN=ecloud.evil.corp
|
||||||
|
|
Loading…
Reference in New Issue