Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions pkg/component/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ const (
DispositionDistributed Disposition = "distributed"
DispositionCantaloupe Disposition = "cantaloupe"
DispositionTriplet Disposition = "triplet"
DispositionNested Disposition = "nested"
DispositionGitRoot Disposition = "git-root"
)

type ComposeSpec struct {
Expand Down Expand Up @@ -516,10 +518,10 @@ func normalizeState(state State) State {
func ParseDisposition(value string) (Disposition, error) {
disposition := normalizeDisposition(Disposition(value))
switch disposition {
case DispositionDisabled, DispositionSuperseded, DispositionEnabled, DispositionDistributed, DispositionCantaloupe, DispositionTriplet:
case DispositionDisabled, DispositionSuperseded, DispositionEnabled, DispositionDistributed, DispositionCantaloupe, DispositionTriplet, DispositionNested, DispositionGitRoot:
return disposition, nil
default:
return "", fmt.Errorf("invalid component disposition %q: expected one of %s, %s, %s, %s, %s, %s", value, DispositionDisabled, DispositionSuperseded, DispositionEnabled, DispositionDistributed, DispositionCantaloupe, DispositionTriplet)
return "", fmt.Errorf("invalid component disposition %q: expected one of %s, %s, %s, %s, %s, %s, %s, %s", value, DispositionDisabled, DispositionSuperseded, DispositionEnabled, DispositionDistributed, DispositionCantaloupe, DispositionTriplet, DispositionNested, DispositionGitRoot)
}
}

Expand All @@ -544,14 +546,18 @@ func normalizeDisposition(disposition Disposition) Disposition {
return DispositionCantaloupe
case string(DispositionTriplet):
return DispositionTriplet
case string(DispositionNested):
return DispositionNested
case string(DispositionGitRoot):
return DispositionGitRoot
default:
return Disposition(strings.ToLower(strings.TrimSpace(string(disposition))))
}
}

func DispositionToState(disposition Disposition) State {
switch normalizeDisposition(disposition) {
case DispositionEnabled, DispositionDistributed, DispositionTriplet:
case DispositionEnabled, DispositionDistributed, DispositionTriplet, DispositionGitRoot:
return StateOn
default:
return StateOff
Expand Down
10 changes: 10 additions & 0 deletions pkg/component/prompt.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,16 @@ func dispositionHelp(guidance StateGuidance, disposition Disposition) string {
return guidance.DisabledHelp
}
return guidance.OffHelp
case DispositionGitRoot:
if strings.TrimSpace(guidance.EnabledHelp) != "" {
return guidance.EnabledHelp
}
return guidance.OnHelp
case DispositionNested:
if strings.TrimSpace(guidance.DisabledHelp) != "" {
return guidance.DisabledHelp
}
return guidance.OffHelp
default:
return ""
}
Expand Down
20 changes: 20 additions & 0 deletions pkg/component/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,26 @@ func TestParseStateOverridesRejectsInvalidValue(t *testing.T) {
}
}

func TestParseDispositionAcceptsCodebaseLayouts(t *testing.T) {
t.Parallel()

nested, err := ParseDisposition("nested")
if err != nil {
t.Fatalf("ParseDisposition(nested) error = %v", err)
}
if nested != DispositionNested || DispositionToState(nested) != StateOff {
t.Fatalf("expected nested/off, got %q/%q", nested, DispositionToState(nested))
}

gitRoot, err := ParseDisposition("git-root")
if err != nil {
t.Fatalf("ParseDisposition(git-root) error = %v", err)
}
if gitRoot != DispositionGitRoot || DispositionToState(gitRoot) != StateOn {
t.Fatalf("expected git-root/on, got %q/%q", gitRoot, DispositionToState(gitRoot))
}
}

func TestDependenciesDrupalModulesForEnable(t *testing.T) {
t.Parallel()

Expand Down