Tidy up a little

This commit is contained in:
3wc
2025-09-01 14:56:50 -04:00
parent 2b1bece9b6
commit 746485cfb0
2 changed files with 12 additions and 13 deletions

View File

@ -209,15 +209,15 @@ checkout as-is. Recipe commit hashes are also supported as values for
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 {
log.Fatal(err)
}
configNames := client.GetConfigNames(configs)
configNames := client.GetConfigNames(configList)
var configInfo []string
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))
}
@ -371,16 +371,6 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App
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() {
AppDeployCommand.Flags().BoolVarP(
&internal.Chaos,

View File

@ -3,6 +3,7 @@ package client
import (
"context"
"errors"
"strings"
"coopcloud.tech/abra/pkg/i18n"
"github.com/docker/docker/api/types/filters"
@ -37,3 +38,11 @@ func RemoveConfigs(cl *client.Client, ctx context.Context, configNames []string,
}
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, ""
}