Refactor command groups

.goreleaser.yaml

@@ -11,6 +11,7 @@ before:
 
 builds:
   - id: plural-cli
+    main: ./cmd/plural
     targets:
       - linux_amd64
       - linux_arm64

Dockerfile

@@ -15,7 +15,6 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 
@@ -30,7 +29,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
     -X "github.com/pluralsh/plural-cli/cmd/plural.Version=${APP_VSN}" \
     -X "github.com/pluralsh/plural-cli/cmd/plural.Commit=${APP_COMMIT}" \
     -X "github.com/pluralsh/plural-cli/cmd/plural.Date=${APP_DATE}"' \
-    -o plural .
+    -o plural ./cmd/plural
 
 FROM golang:1.20-alpine3.17
 

Makefile

@@ -39,15 +39,15 @@ git-push:
 
 .PHONY: install
 install:
-	go build -ldflags '$(LDFLAGS)' -o $(GOBIN)/plural .
+	go build -ldflags '$(LDFLAGS)' -o $(GOBIN)/plural ./cmd/plural
 
 .PHONY: build-cli
 build-cli: ## Build a CLI binary for the host architecture without embedded UI
-	go build -ldflags='$(LDFLAGS)' -o $(OUTFILE) .
+	go build -ldflags='$(LDFLAGS)' -o $(OUTFILE) ./cmd/plural
 
 .PHONY: build-cli-ui
 build-cli-ui: $(PRE) generate-bindings ## Build a CLI binary for the host architecture with embedded UI
-	CGO_LDFLAGS=$(CGO_LDFLAGS) go build -tags $(WAILS_TAGS) -ldflags='$(LDFLAGS)' -o $(OUTFILE) .
+	CGO_LDFLAGS=$(CGO_LDFLAGS) go build -tags $(WAILS_TAGS) -ldflags='$(LDFLAGS)' -o $(OUTFILE) ./cmd/plural
 
 .PHONY: build-web
 build-web: ## Build just the embedded UI
@@ -70,7 +70,7 @@ generate-bindings: build-web ## Generate backend bindings for the embedded UI
 
 .PHONY: release
 release:
-	GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags='$(LDFLAGS)' -o $(OUTFILE) .
+	GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags='$(LDFLAGS)' -o $(OUTFILE) ./cmd/plural
 
 .PHONY: setup
 setup: ## sets up your local env (for mac only)
@@ -159,7 +159,7 @@ setup-tests:
 
 .PHONY: test
 test: setup-tests
-	gotestsum --format testname -- -v -race ./pkg/... ./cmd/...
+	gotestsum --format testname -- -v -race ./pkg/... ./cmd/command/...
 
 .PHONY: format
 format: # formats all go code to prep for linting

cmd/plural/help.go → cmd/command/ai/help.go

@@ -1,9 +1,11 @@
-package plural
+package ai
 
 import (
 	"fmt"
 	"time"
 
+	"github.com/pluralsh/plural-cli/pkg/client"
+
 	"github.com/briandowns/spinner"
 	"github.com/fatih/color"
 	"github.com/pluralsh/plural-cli/pkg/api"
@@ -13,6 +15,22 @@ import (
 
 const intro = "What can we do to help you with Plural, using open source, or kubernetes?"
 
+type Plural struct {
+	client.Plural
+}
+
+func Command(clients client.Plural) cli.Command {
+	p := Plural{
+		Plural: clients,
+	}
+	return cli.Command{
+		Name:     "ai",
+		Usage:    "utilize openai to get help with your setup",
+		Action:   p.aiHelp,
+		Category: "Debugging",
+	}
+}
+
 func (p *Plural) aiHelp(c *cli.Context) error {
 	p.InitPluralClient()
 	chat := []*api.ChatMessage{{Role: "system", Content: intro}}

cmd/plural/api.go → cmd/command/api/api.go

@@ -1,13 +1,30 @@
-package plural
+package api
 
 import (
-	"github.com/pluralsh/polly/algorithms"
-	"github.com/urfave/cli"
-
 	"github.com/pluralsh/plural-cli/pkg/api"
+	"github.com/pluralsh/plural-cli/pkg/client"
+	"github.com/pluralsh/plural-cli/pkg/common"
 	"github.com/pluralsh/plural-cli/pkg/utils"
+	"github.com/pluralsh/polly/algorithms"
+	"github.com/urfave/cli"
 )
 
+type Plural struct {
+	client.Plural
+}
+
+func Command(clients client.Plural) cli.Command {
+	plural := Plural{
+		Plural: clients,
+	}
+	return cli.Command{
+		Name:        "api",
+		Usage:       "inspect the plural api",
+		Subcommands: plural.apiCommands(),
+		Category:    "API",
+	}
+}
+
 func (p *Plural) apiCommands() []cli.Command {
 	return []cli.Command{
 		{
@@ -18,45 +35,45 @@ func (p *Plural) apiCommands() []cli.Command {
 					Name:      "installations",
 					Usage:     "lists your installations",
 					ArgsUsage: "",
-					Action:    latestVersion(p.handleInstallations),
+					Action:    common.LatestVersion(p.handleInstallations),
 				},
 				{
 					Name:      "charts",
 					Usage:     "lists charts for a repository",
 					ArgsUsage: "REPO_ID",
-					Action:    latestVersion(requireArgs(p.handleCharts, []string{"REPO_ID"})),
+					Action:    common.LatestVersion(common.RequireArgs(p.handleCharts, []string{"REPO_ID"})),
 				},
 				{
 					Name:      "terraform",
 					Usage:     "lists terraform modules for a repository",
 					ArgsUsage: "REPO_ID",
-					Action:    latestVersion(requireArgs(p.handleTerraforma, []string{"REPO_ID"})),
+					Action:    common.LatestVersion(common.RequireArgs(p.handleTerraforma, []string{"REPO_ID"})),
 				},
 				{
 					Name:      "versions",
 					Usage:     "lists versions of a chart",
 					ArgsUsage: "CHART_ID",
-					Action:    latestVersion(requireArgs(p.handleVersions, []string{"CHART_ID"})),
+					Action:    common.LatestVersion(common.RequireArgs(p.handleVersions, []string{"CHART_ID"})),
 				},
 				{
 					Name:      "chartinstallations",
 					Aliases:   []string{"ci"},
 					Usage:     "lists chart installations for a repository",
 					ArgsUsage: "REPO_ID",
-					Action:    latestVersion(requireArgs(p.handleChartInstallations, []string{"REPO_ID"})),
+					Action:    common.LatestVersion(common.RequireArgs(p.handleChartInstallations, []string{"REPO_ID"})),
 				},
 				{
 					Name:      "terraforminstallations",
 					Aliases:   []string{"ti"},
 					Usage:     "lists terraform installations for a repository",
 					ArgsUsage: "REPO_ID",
-					Action:    latestVersion(requireArgs(p.handleTerraformInstallations, []string{"REPO_ID"})),
+					Action:    common.LatestVersion(common.RequireArgs(p.handleTerraformInstallations, []string{"REPO_ID"})),
 				},
 				{
 					Name:      "artifacts",
 					Usage:     "Lists artifacts for a repository",
 					ArgsUsage: "REPO_ID",
-					Action:    latestVersion(requireArgs(p.handleArtifacts, []string{"REPO_ID"})),
+					Action:    common.LatestVersion(common.RequireArgs(p.handleArtifacts, []string{"REPO_ID"})),
 				},
 			},
 		},
@@ -68,7 +85,7 @@ func (p *Plural) apiCommands() []cli.Command {
 					Name:      "domain",
 					Usage:     "creates a new domain for your account",
 					ArgsUsage: "DOMAIN",
-					Action:    latestVersion(p.handleCreateDomain),
+					Action:    common.LatestVersion(p.handleCreateDomain),
 				},
 			},
 		},