Skip to content

Fix common prefix calculation #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix common prefix calculation #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pkg/metadata/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func New(conf config.Config) *Service {
}

type Service struct {
commonPrefix string
commonPrefix *string
namespace string
names map[string]struct{}
conf config.Config
Expand All @@ -44,7 +44,7 @@ func (a *Service) Config() config.Config {
// If no common prefix - returns name as it is.
// It is better to trim common prefix because Helm also adds release name as common prefix.
func (a *Service) TrimName(objName string) string {
trimmed := strings.TrimPrefix(objName, a.commonPrefix)
trimmed := strings.TrimPrefix(objName, *a.commonPrefix)
trimmed = strings.TrimLeft(trimmed, "-./_ ")
if trimmed == "" {
return objName
Expand All @@ -58,7 +58,8 @@ var _ helmify.AppMetadata = &Service{}
// other app meta information.
func (a *Service) Load(obj *unstructured.Unstructured) {
a.names[obj.GetName()] = struct{}{}
a.commonPrefix = detectCommonPrefix(obj, a.commonPrefix)
newCommonPrefix := detectCommonPrefix(obj, a.commonPrefix)
a.commonPrefix = &newCommonPrefix
objNs := extractAppNamespace(obj)
if objNs == "" {
return
Expand Down Expand Up @@ -106,14 +107,14 @@ func extractAppNamespace(obj *unstructured.Unstructured) string {
return obj.GetNamespace()
}

func detectCommonPrefix(obj *unstructured.Unstructured, prevName string) string {
func detectCommonPrefix(obj *unstructured.Unstructured, prevName *string) string {
if obj.GroupVersionKind() == crdGVK || obj.GroupVersionKind() == nsGVK {
return prevName
return *prevName
}
if prevName == "" {
if prevName == nil {
return obj.GetName()
}
return commonPrefix(obj.GetName(), prevName)
return commonPrefix(obj.GetName(), *prevName)
}

func commonPrefix(one, two string) string {
Expand Down