Merge remote-tracking branch 'origin' into kube-secrets

Author: kompotkot

.github/workflows/release.yml

@@ -0,0 +1,67 @@
+name: Prepare release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  create_release:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: "checkenv ${{ github.ref_name }}"
+          body: |
+            Version ${{ github.ref_name }} of checkenv
+          draft: true
+          prerelease: false
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+  upload_assets:
+    runs-on: ubuntu-20.04
+    needs: create_release
+    strategy:
+      fail-fast: true
+      matrix:
+        os: ["linux", "darwin", "windows"]
+        arch: ["386", "amd64", "arm64"]
+        exclude:
+          - os: "darwin"
+            arch: "arm"
+          - os: "darwin"
+            arch: "386"
+          - os: "windows"
+            arch: "arm"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ^1.16.0
+      - name: Build binary for each valid (GOOS, GOARCH) pair
+        env:
+          GOOS: ${{ matrix.os }}
+          GOARCH: ${{ matrix.arch }}
+        run: |
+          BUILD_DIR="checkenv-${{ github.ref_name }}-${GOOS}-${GOARCH}"
+          EXTENSION=""
+          if [ "$GOOS" = "windows" ]; then
+            EXTENSION=".exe"
+          fi
+          mkdir "$BUILD_DIR"
+          cp README.md "$BUILD_DIR/README.md"
+          go build -o "$BUILD_DIR/checkenv${EXTENSION}" .
+          zip -r "$BUILD_DIR.zip" "$BUILD_DIR"
+      - name: Upload release asset for each valid (GOOS, GOARH) pair
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+          asset_path: ./checkenv-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.arch }}.zip
+          asset_name: checkenv-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.arch }}.zip
+          asset_content_type: application/zip

checkenv.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-const CHECKENV_VERSION = "v0.0.3"
+const CHECKENV_VERSION = "v0.0.4"
 
 type showSpec struct {
 	loadFrom      map[string]interface{}
@@ -56,6 +56,15 @@ func VariablesFromProviderSpec(providerSpec string) (map[string]string, error) {
 	return plugin.Provider(providerArgs)
 }
 
+// Append quotes to value if needed
+func AddValueQuotes(val string, showQuotes bool) string {
+	if showQuotes {
+		return fmt.Sprintf("\"%s\"", val)
+	}
+
+	return val
+}
+
 func main() {
 	pluginsCommand := "plugins"
 	pluginsFlags := flag.NewFlagSet("plugins", flag.ExitOnError)
@@ -67,6 +76,7 @@ func main() {
 	showHelp := showFlags.Bool("h", false, "Use this flag if you want help with this command")
 	showFlags.BoolVar(showHelp, "help", false, "Use this flag if you want help with this command")
 	showExport := showFlags.Bool("export", false, "Use this flag to prepend and \"export \" before every environment variable definition")
+	showQuotes := showFlags.Bool("quotes", false, "Use this flag to put value in quotes")
 	showRaw := showFlags.Bool("raw", false, "Use this flag to prevent comments output")
 	showValue := showFlags.Bool("value", false, "Print value only")
 	showName := showFlags.Bool("name", false, "Print name only")
@@ -126,9 +136,9 @@ func main() {
 			}
 			for k, v := range providedVars[providerSpec] {
 				if !*showValue && !*showName {
-					fmt.Printf("%s%s=%s\n", exportPrefix, k, v)
+					fmt.Printf("%s%s=%s\n", exportPrefix, k, AddValueQuotes(v, *showQuotes))
 				} else if *showValue {
-					fmt.Printf("%s\n", v)
+					fmt.Printf("%s\n", AddValueQuotes(v, *showQuotes))
 				} else if *showName {
 					fmt.Printf("%s\n", k)
 				}
@@ -145,9 +155,9 @@ func main() {
 					fmt.Printf("# UNDEFINED: %s\n", k)
 				} else {
 					if !*showValue {
-						fmt.Printf("%s%s=%s\n", exportPrefix, k, v)
+						fmt.Printf("%s%s=%s\n", exportPrefix, k, AddValueQuotes(v, *showQuotes))
 					} else {
-						fmt.Printf("%s\n", v)
+						fmt.Printf("%s\n", AddValueQuotes(v, *showQuotes))
 					}
 				}
 			}

dev.sh

@@ -8,4 +8,3 @@ PROGRAM_NAME="checkenv_dev"
 go build -o "$PROGRAM_NAME" .
 
 ./"$PROGRAM_NAME" "$@"
-