codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(recipe): remove remaining usage of old recipe struct

Browse Source
This commit is contained in:
p4u1
2024-07-08 13:15:20 +02:00
parent c1b03bcbd7
commit 5617a9ba07
24 changed files with 167 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cli/app/new.go
View File

@ -66,21 +66,20 @@ var appNewCommand = cli.Command{
},
Action: func(c *cli.Context) error {
recipe := internal.ValidateRecipe(c)
r := recipePkg.Get2(recipe.Name)
if !internal.Chaos {
if err := r.EnsureIsClean(); err != nil {
if err := recipe.EnsureIsClean(); err != nil {
log.Fatal(err)
}
if !internal.Offline {
if err := r.EnsureUpToDate(); err != nil {
if err := recipe.EnsureUpToDate(); err != nil {
log.Fatal(err)
}
}
if c.Args().Get(1) == "" {
var version string
recipeVersions, err := r.GetRecipeVersions(internal.Offline)
recipeVersions, err := recipe.GetRecipeVersions(internal.Offline)
if err != nil {
log.Fatal(err)
}
@ -93,16 +92,16 @@ var appNewCommand = cli.Command{
version = tag
}
if err := r.EnsureVersion(version); err != nil {
if err := recipe.EnsureVersion(version); err != nil {
log.Fatal(err)
}
} else {
if err := r.EnsureLatest(); err != nil {
if err := recipe.EnsureLatest(); err != nil {
log.Fatal(err)
}
}
} else {
if err := r.EnsureVersion(c.Args().Get(1)); err != nil {
if err := recipe.EnsureVersion(c.Args().Get(1)); err != nil {
log.Fatal(err)
}
}
@ -120,7 +119,7 @@ var appNewCommand = cli.Command{
log.Debugf("%s sanitised as %s for new app", internal.Domain, sanitisedAppName)
if err := appPkg.TemplateAppEnvSample(
r,
recipe,
internal.Domain,
internal.NewAppServer,
internal.Domain,
@ -131,17 +130,17 @@ var appNewCommand = cli.Command{
var secrets AppSecrets
var secretTable *jsontable.JSONTable
if internal.Secrets {
sampleEnv, err := r.SampleEnv()
sampleEnv, err := recipe.SampleEnv()
if err != nil {
log.Fatal(err)
}
composeFiles, err := r.GetComposeFiles(sampleEnv)
composeFiles, err := recipe.GetComposeFiles(sampleEnv)
if err != nil {
log.Fatal(err)
}
secretsConfig, err := secret.ReadSecretsConfig(r.SampleEnvPath, composeFiles, appPkg.StackName(internal.Domain))
secretsConfig, err := secret.ReadSecretsConfig(recipe.SampleEnvPath, composeFiles, appPkg.StackName(internal.Domain))
if err != nil {
return err
}
@ -231,7 +230,7 @@ func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secr
}
// ensureDomainFlag checks if the domain flag was used. if not, asks the user for it/
func ensureDomainFlag(recipe recipePkg.Recipe, server string) error {
func ensureDomainFlag(recipe recipePkg.Recipe2, server string) error {
if internal.Domain == "" && !internal.NoInput {
prompt := &survey.Input{
Message: "Specify app domain",