fixes

Author: Crow-Control

cmd/container.go

@@ -6,11 +6,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var containerLongHelp = strings.TrimSpace(`
+var containersLongHelp = strings.TrimSpace(`
 These are all commands that can be used to test container images
 `)
 
-var containerCmd = &cobra.Command{
+var containersCmd = &cobra.Command{
 	Use:           "containers",
 	Short:         "Commands for container validation",
 	Example:       "forgetool containers test",

cmd/container_genlist.go

@@ -11,26 +11,26 @@ import (
 	"github.com/trueforge-org/forgetool/pkg/containers/website"
 )
 
-var containerGenListLongHelp = strings.TrimSpace(`
+var containersGenListLongHelp = strings.TrimSpace(`
 Generates a JSON file listing all containers found under the given path(s).
 Each container is identified by its docker-bake.hcl file.
 `)
 
-func defaultContainerGenListOptionsFactory() *website.ContainerListOptions {
+func defaultContainersGenListOptionsFactory() *website.ContainerListOptions {
 	return &website.ContainerListOptions{
 		OutputPath: "./containers.json",
 	}
 }
 
-func defaultContainerGenListGetData(opts *website.ContainerListOptions) fs.WalkDirFunc {
+func defaultContainersGenListGetData(opts *website.ContainerListOptions) fs.WalkDirFunc {
 	return opts.GetContainerData
 }
 
-func defaultContainerGenListWrite(opts *website.ContainerListOptions) error {
+func defaultContainersGenListWrite(opts *website.ContainerListOptions) error {
 	return opts.WriteContainerList()
 }
 
-var defaultContainerGenListWalk = func(paths []string, fn fs.WalkDirFunc) error {
+var defaultContainersGenListWalk = func(paths []string, fn fs.WalkDirFunc) error {
 	if len(paths) == 0 {
 		paths = []string{"./apps"}
 	}
@@ -43,29 +43,29 @@ var defaultContainerGenListWalk = func(paths []string, fn fs.WalkDirFunc) error
 }
 
 var (
-	containerGenListWalk           = defaultContainerGenListWalk
-	containerGenListOptionsFactory = defaultContainerGenListOptionsFactory
-	containerGenListGetData        = defaultContainerGenListGetData
-	containerGenListWrite          = defaultContainerGenListWrite
-	containerGenListRunner         = runContainerGenList
-	containerGenListOnError        = func(err error) { log.Fatal().Err(err).Msg("container list generation failed") }
+	containersGenListWalk           = defaultContainersGenListWalk
+	containersGenListOptionsFactory = defaultContainersGenListOptionsFactory
+	containersGenListGetData        = defaultContainersGenListGetData
+	containersGenListWrite          = defaultContainersGenListWrite
+	containersGenListRunner         = runContainersGenList
+	containersGenListOnError        = func(err error) { log.Fatal().Err(err).Msg("container list generation failed") }
 )
 
-func runContainerGenList(args []string) error {
-	opts := containerGenListOptionsFactory()
-	if err := containerGenListWalk(args, containerGenListGetData(opts)); err != nil {
+func runContainersGenList(args []string) error {
+	opts := containersGenListOptionsFactory()
+	if err := containersGenListWalk(args, containersGenListGetData(opts)); err != nil {
 		return fmt.Errorf("failed to generate container list json file: %w", err)
 	}
 
-	if err := containerGenListWrite(opts); err != nil {
+	if err := containersGenListWrite(opts); err != nil {
 		return fmt.Errorf("failed to write container list json file: %w", err)
 	}
 
 	return nil
 }
 
-var genContainerListCmd = &cobra.Command{
-	Use:     "gencontainerlist",
+var genContainersListCmd = &cobra.Command{
+	Use:     "gencontainerslist",
 	Short:   "Generate container list json file",
 	Long:    containerGenListLongHelp,
 	Example: "forgetool containers gencontainerlist <path to apps folder>",

cmd/container_testcmd.go

@@ -9,21 +9,21 @@ import (
 	"github.com/trueforge-org/forgetool/pkg/containertest"
 )
 
-var containerTestLongHelp = strings.TrimSpace(`
+var containersTestLongHelp = strings.TrimSpace(`
 Run container checks from a YAML file.
 
 Before any configured checks are executed, the container must report healthy
 via Docker HEALTHCHECK.
 `)
 
 var (
-	containerTestImage       string
-	containerTestConfigPath  string
-	containerTestEnvPairs    []string
-	containerTestRunChecksFn = containertest.RunChecksFromYAML
+	containersTestImage       string
+	containersTestConfigPath  string
+	containersTestEnvPairs    []string
+	containersTestRunChecksFn = containertest.RunChecksFromYAML
 )
 
-func parseContainerTestEnv(pairs []string) (map[string]string, error) {
+func parseContainersTestEnv(pairs []string) (map[string]string, error) {
 	env := map[string]string{}
 	for _, pair := range pairs {
 		key, value, ok := strings.Cut(pair, "=")
@@ -35,28 +35,28 @@ func parseContainerTestEnv(pairs []string) (map[string]string, error) {
 	return env, nil
 }
 
-func runContainerTest(ctx context.Context, image string, configPath string, envPairs []string) error {
+func runContainersTest(ctx context.Context, image string, configPath string, envPairs []string) error {
 	if strings.TrimSpace(image) == "" {
 		return fmt.Errorf("--image is required")
 	}
 	if strings.TrimSpace(configPath) == "" {
 		return fmt.Errorf("--config is required")
 	}
 
-	env, err := parseContainerTestEnv(envPairs)
+	env, err := parseContainersTestEnv(envPairs)
 	if err != nil {
 		return err
 	}
 
 	config := &containertest.ContainerConfig{Env: env}
-	if err := containerTestRunChecksFn(ctx, image, configPath, config); err != nil {
+	if err := containersTestRunChecksFn(ctx, image, configPath, config); err != nil {
 		return fmt.Errorf("check failed: %w", err)
 	}
 
 	return nil
 }
 
-var containerTestCmd = &cobra.Command{
+var containersTestCmd = &cobra.Command{
 	Use:     "test",
 	Short:   "Run container tests from YAML configuration",
 	Example: "forgetool containers test --image ghcr.io/trueforge-org/myimage:latest --config ./container-test.yaml",