fix: configurable validation source

CLI is validated with the schema stored
inside the binary. Project and Module files
are still validated with the files
from the local Ansible collection.

Author: saitho

.build/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+go get github.com/markbates/pkger/cmd/pkger
+pkger
+go generate ./...
+go build -o ./bin/stackhead-cli .

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,13 @@
+# Pull Request
+
+## Requirements
+
 * **Please check if the PR fulfills these requirements**
 - [ ] The commit message follows our guidelines
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)
 
+## Details
 
 * **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
 

.github/workflows/release.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.13
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.13
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
       - name: Build
-        run: go build -v -o bin/stackhead-cli
+        run: sh ./.build/build.sh
 
   release:
     name: Release

.github/workflows/test-cli.yml

@@ -18,16 +18,15 @@ jobs:
     steps:
 
       - name: Set up Go 1.13
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.13
-        id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
       - name: Build
-        run: go build -v -o bin/stackhead-cli
+        run: sh ./.build/build.sh
 
       - uses: actions/upload-artifact@v2
         with:
@@ -40,10 +39,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.13
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.13
-        id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -66,6 +64,8 @@ jobs:
         run: pip install ansible==2.10.3
       - name: Print Ansible and Python version
         run: ansible --version && python --version
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
       - name: Download StackHead CLI artifact
         uses: actions/download-artifact@v2
         with:

.github/workflows/test-integration.yml

@@ -18,16 +18,15 @@ jobs:
     steps:
 
       - name: Set up Go 1.13
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.13
-        id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
       - name: Build
-        run: go build -v -o bin/stackhead-cli
+        run: sh ./.build/build.sh
 
       - uses: actions/upload-artifact@v2
         with:

.gitignore

@@ -2,3 +2,4 @@
 bin
 stackhead-cli
 .stackhead-cli.yml
+pkged.go

Dockerfile

@@ -1,7 +1,7 @@
 FROM golang:alpine as builder
 WORKDIR /build
 COPY . /build
-RUN go build -o ./bin/stackhead-cli .
+RUN sh /build/.build/build.sh
 
 FROM pad92/ansible-alpine:2.10.3
 COPY --from=builder /build/bin/stackhead-cli /bin/

commands/cli/cli.go

@@ -9,6 +9,7 @@ func GetCommands() *cobra.Command {
 		Use:   "cli",
 		Short: "StackHead CLI commands",
 	}
-	command.AddCommand(Validate)
+	validate := Validate()
+	command.AddCommand(validate)
 	return command
 }

commands/cli/validate.go

@@ -1,19 +1,31 @@
 package cli
 
 import (
-	"github.com/spf13/cobra"
-
 	"github.com/getstackhead/stackhead-cli/routines"
+	"github.com/spf13/cobra"
 )
 
 // Validate is a command object for Cobra that provides the validate command
-var Validate = &cobra.Command{
-	Use:     "validate [path to StackHead CLI configuration file]",
-	Example: "validate ./stackhead-module.yml",
-	Short:   "Validate a StackHead module file",
-	Long:    `validate is used to make sure your StackHead CLI configuration file meets the required syntax.`,
-	Args:    cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		routines.Validate(args[0], "cli-config.schema.json")
-	},
+func Validate() *cobra.Command {
+	var version, branch string
+	var ignoreSslCertificate bool
+	var command = &cobra.Command{
+		Use:     "validate [path to StackHead CLI configuration file]",
+		Example: "validate ./stackhead-module.yml",
+		Short:   "Validate a StackHead module file",
+		Long:    `validate is used to make sure your StackHead CLI configuration file meets the required syntax.`,
+		Args:    cobra.ExactArgs(1),
+		Run: routines.CobraValidationBase(
+			"stackhead_cli",
+			"cli-config.schema.json",
+			version,
+			branch,
+			ignoreSslCertificate,
+		),
+	}
+	command.PersistentFlags().StringVar(&version, "version", "", "Version of schema to use (requires internet connection)")
+	command.PersistentFlags().StringVar(&branch, "branch", "", "Branch of schema to use (requires internet connection)")
+	command.PersistentFlags().BoolVar(&ignoreSslCertificate, "ignore-ssl-certificate", false, "Whether to ignore the SSL certificate for Web request (when --version) is used")
+
+	return command
 }

commands/module/module.go

@@ -9,6 +9,7 @@ func GetCommands() *cobra.Command {
 		Use:   "module",
 		Short: "StackHead module commands",
 	}
-	command.AddCommand(Validate)
+	validate := Validate()
+	command.AddCommand(validate)
 	return command
 }