basebuilder/abra
0
0
Fork 0
forked from toolshed/abra
Code Pull Requests Activity

refactor: NewClientWithContext -> New, and use server only

Browse Source
This commit is contained in:
decentral1se
2021-09-05 00:41:31 +02:00
parent dac679db48
commit 07a43cb314
14 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cli/app/secret.go
View File

@ -51,7 +51,7 @@ var appSecretGenerateCommand = &cli.Command{
}
secretsToCreate := make(map[string]string)
host := appFiles[appName].Server
server := appFiles[appName].Server
secretEnvVars := secret.ReadSecretEnvVars(appEnv.Env)
if allSecrets {
secretsToCreate = secretEnvVars
@ -66,14 +66,14 @@ var appSecretGenerateCommand = &cli.Command{
}
}
secretVals, err := secret.GenerateSecrets(secretsToCreate, appEnv.StackName(), host)
secretVals, err := secret.GenerateSecrets(secretsToCreate, appEnv.StackName(), server)
if err != nil {
logrus.Fatal(err)
}
if internal.Pass {
for name, data := range secretVals {
if err := secret.PassInsertSecret(data, name, appEnv.StackName(), host); err != nil {
if err := secret.PassInsertSecret(data, name, appEnv.StackName(), server); err != nil {
logrus.Fatal(err)
}
}
@ -112,14 +112,14 @@ var appSecretInsertCommand = &cli.Command{
logrus.Fatal(err)
}
host := appFiles[appName].Server
server := appFiles[appName].Server
secretName := fmt.Sprintf("%s_%s_%s", appEnv.StackName(), name, version)
if err := client.StoreSecret(secretName, data, host); err != nil {
if err := client.StoreSecret(secretName, data, server); err != nil {
logrus.Fatal(err)
}
if internal.Pass {
if err := secret.PassInsertSecret(data, name, appEnv.StackName(), host); err != nil {
if err := secret.PassInsertSecret(data, name, appEnv.StackName(), server); err != nil {
logrus.Fatal(err)
}
}
@ -158,9 +158,9 @@ var appSecretRmCommand = &cli.Command{
logrus.Fatal(err)
}
host := appFiles[appName].Server
server := appFiles[appName].Server
ctx := context.Background()
cl, err := client.NewClientWithContext(host)
cl, err := client.New(server)
if err != nil {
logrus.Fatal(err)
}
@ -181,7 +181,7 @@ var appSecretRmCommand = &cli.Command{
logrus.Fatal(err)
}
if internal.Pass {
if err := secret.PassRmSecret(parsed, appEnv.StackName(), host); err != nil {
if err := secret.PassRmSecret(parsed, appEnv.StackName(), server); err != nil {
logrus.Fatal(err)
}
}
@ -191,7 +191,7 @@ var appSecretRmCommand = &cli.Command{
logrus.Fatal(err)
}
if internal.Pass {
if err := secret.PassRmSecret(parsed, appEnv.StackName(), host); err != nil {
if err := secret.PassRmSecret(parsed, appEnv.StackName(), server); err != nil {
logrus.Fatal(err)
}
}
@ -227,9 +227,9 @@ var appSecretLsCommand = &cli.Command{
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
table := abraFormatter.CreateTable(tableCol)
host := appFiles[appName].Server
server := appFiles[appName].Server
ctx := context.Background()
cl, err := client.NewClientWithContext(host)
cl, err := client.New(server)
if err != nil {
logrus.Fatal(err)
}