toolshed/abra
4
2
Fork 18
Code Issues 26 Pull Requests 3 Packages Releases 41 Activity

refactor: tidy up a little

Browse Source
This commit is contained in:
3wc
2025-09-01 14:56:50 -04:00
parent 1df0de2e65
commit 0b7c38c213
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cli/app/deploy.go
View File

@ -216,15 +216,15 @@ checkout as-is. Recipe commit hashes are also supported as values for
log.Fatal(err) log.Fatal(err)
} }
configs, err := client.GetConfigs(cl, context.Background(), app.Server, configFilters) configList, err := client.GetConfigs(cl, context.Background(), app.Server, configFilters)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
configNames := client.GetConfigNames(configs) configNames := client.GetConfigNames(configList)
var configInfo []string var configInfo []string
for _, config := range configNames { for _, config := range configNames {
name, version := extractConfigNameMetadata(config, app.StackName()) name, version := client.GetConfigNameAndVersion(config, app.StackName())
configInfo = append(configInfo, fmt.Sprintf("%s: %s", name, version)) configInfo = append(configInfo, fmt.Sprintf("%s: %s", name, version))
} }
@ -378,16 +378,6 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App
return v, nil return v, nil
} }
// extractConfigNameMetadata strips the stack name and returns
// Example: "wordpress_db_password_v1" -> "v1"
func extractConfigNameMetadata(fullName string, stackName string) (string, string) {
name := strings.TrimPrefix(fullName, stackName + "_")
if lastUnderscore := strings.LastIndex(name, "_"); lastUnderscore != -1 {
return name[0:lastUnderscore], name[lastUnderscore+1:]
}
return name, ""
}
func init() { func init() {
AppDeployCommand.Flags().BoolVarP( AppDeployCommand.Flags().BoolVarP(
&internal.Chaos, &internal.Chaos,

9
pkg/client/configs.go
View File

@ -3,6 +3,7 @@ package client
import ( import (
"context" "context"
"errors" "errors"
"strings"
"coopcloud.tech/abra/pkg/i18n" "coopcloud.tech/abra/pkg/i18n"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
@ -37,3 +38,11 @@ func RemoveConfigs(cl *client.Client, ctx context.Context, configNames []string,
} }
return nil return nil
} }
func GetConfigNameAndVersion(fullName string, stackName string) (string, string) {
name := strings.TrimPrefix(fullName, stackName + "_")
if lastUnderscore := strings.LastIndex(name, "_"); lastUnderscore != -1 {
return name[0:lastUnderscore], name[lastUnderscore+1:]
}
return name, ""
}