Merge 0be5cbc into 12ad39d

Author: spbsoluble

.github/workflows/tests.yml

@@ -142,25 +142,6 @@ jobs:
         run: echo "Running tests for KF 11.x.x"
 
   ### Store Type Tests
-  Test_StoreTypes_KFC_11_2_0:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-      - kf_11_x_x
-    env:
-      SECRET_NAME: "command-config-1120-clean"
-      KEYFACTOR_HOSTNAME: "int1120-test-clean.kfdelivery.com"
-      KEYFACTOR_DOMAIN: "command"
-      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
-      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Run tests
-        run: |
-          unset KFUTIL_DEBUG
-          go test -v ./cmd -run "^Test_StoreTypes*"
-
   Test_StoreTypes_KFC_11_1_2:
     runs-on: ubuntu-latest
     needs:
@@ -182,15 +163,15 @@ jobs:
 
 
   ### Store Tests
-  Test_Stores_KFC_11_2_0:
+  Test_Stores_KFC_11_1_2:
     runs-on: ubuntu-latest
     needs:
       - build
       - kf_11_x_x
-      - Test_StoreTypes_KFC_11_2_0
+      - Test_StoreTypes_KFC_11_1_2
     env:
-      SECRET_NAME: "command-config-1120"
-      KEYFACTOR_HOSTNAME: "integrations1120-lab.kfdelivery.com"
+      SECRET_NAME: "command-config-1112"
+      KEYFACTOR_HOSTNAME: "integrations1112-lab.kfdelivery.com"
       KEYFACTOR_DOMAIN: "command"
       KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
       KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
@@ -199,7 +180,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Run tests
         run: go test -v ./cmd -run "^Test_Stores_*"
-  Test_Stores_KFC_11_1_2:
+
+  ### PAM Tests
+  Test_PAM_KFC_11_1_2:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -215,18 +198,50 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run tests
-        run: go test -v ./cmd -run "^Test_Stores_*"
+        run: |
+          unset KFUTIL_DEBUG
+          go test -v ./cmd -run "^Test_PAM*"
 
-  ### PAM Tests
-  Test_PAM_KFC_11_2_0:
+
+  ### PAM Tests AKV Auth Provider
+  Test_AKV_PAM_KFC_11_1_2:
+    runs-on: self-hosted
+    needs:
+      - Test_PAM_KFC_11_1_2
+    env:
+      SECRET_NAME: "command-config-1112-az"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+      - name: Install dependencies
+        run: go mod download && go mod tidy
+      - name: Get secret from Azure Key Vault
+        run: |
+          . ./examples/auth/akv/akv_auth.sh
+          cat $HOME/.keyfactor/command_config.json
+      - name: Install kfutil
+        run: |
+          make install
+      - name: Run tests
+        run: |
+          go test -v ./cmd -run "^Test_PAM*"
+
+
+
+  ## KFC 12.x.x
+  ### Store Type Tests
+  Test_StoreTypes_KFC_12_2_0:
     runs-on: ubuntu-latest
     needs:
       - build
       - kf_11_x_x
-      - Test_StoreTypes_KFC_11_2_0
     env:
-      SECRET_NAME: "command-config-1120"
-      KEYFACTOR_HOSTNAME: "integrations1120-lab.kfdelivery.com"
+      SECRET_NAME: "command-config-1220-clean"
+      KEYFACTOR_HOSTNAME: "int1220-test-clean.kfdelivery.com"
       KEYFACTOR_DOMAIN: "command"
       KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
       KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
@@ -236,64 +251,57 @@ jobs:
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
-          go test -v ./cmd -run "^Test_PAM*"
+          go test -v ./cmd -run "^Test_StoreTypes*"
 
 
-  Test_PAM_KFC_11_1_2:
+  ### Store Tests
+  Test_Stores_KFC_12_2_0:
     runs-on: ubuntu-latest
     needs:
       - build
       - kf_11_x_x
-      - Test_StoreTypes_KFC_11_1_2
+      - Test_StoreTypes_KFC_12_2_0
     env:
-      SECRET_NAME: "command-config-1112"
-      KEYFACTOR_HOSTNAME: "integrations1112-lab.kfdelivery.com"
+      SECRET_NAME: "command-config-1220"
+      KEYFACTOR_HOSTNAME: "integrations1220-lab.kfdelivery.com"
       KEYFACTOR_DOMAIN: "command"
       KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
       KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run tests
-        run: |
-          unset KFUTIL_DEBUG
-          go test -v ./cmd -run "^Test_PAM*"
-
+        run: go test -v ./cmd -run "^Test_Stores_*"
 
-  ### PAM Tests AKV Auth Provider
-  Test_AKV_PAM_KFC_11_2_0:
-    runs-on: self-hosted
+  ### PAM Tests
+  Test_PAM_KFC_12_2_0:
+    runs-on: ubuntu-latest
     needs:
-      - Test_PAM_KFC_11_2_0
+      - build
+      - kf_11_x_x
+      - Test_StoreTypes_KFC_12_2_0
     env:
-      SECRET_NAME: "command-config-1120-az"
+      SECRET_NAME: "command-config-1220"
+      KEYFACTOR_HOSTNAME: "integrations1220-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.21"
-      - name: Install dependencies
-        run: go mod download && go mod tidy
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
-          cat $HOME/.keyfactor/command_config.json
-      - name: Install kfutil
-        run: |
-          make install
       - name: Run tests
         run: |
+          unset KFUTIL_DEBUG
           go test -v ./cmd -run "^Test_PAM*"
 
 
-  Test_AKV_PAM_KFC_11_1_2:
+  ### PAM Tests AKV Auth Provider
+  Test_AKV_PAM_KFC_12_2_0:
     runs-on: self-hosted
     needs:
-      - Test_PAM_KFC_11_1_2
+      - Test_PAM_KFC_12_2_0
     env:
-      SECRET_NAME: "command-config-1112-az"
+      SECRET_NAME: "command-config-1220-az"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -315,6 +323,7 @@ jobs:
           go test -v ./cmd -run "^Test_PAM*"
 
 
+
   # Tester Install Script
   Test_Install_Script:
       runs-on: ubuntu-latest

.github/workflows/update-stores.yml

@@ -152,7 +152,7 @@ jobs:
         if: ${{ env.UPDATE_FILE == 'T' && env.PR_BRANCH == 'create' }}
         uses: Keyfactor/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
         with:
           add: store_types.json --force
           message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
@@ -165,7 +165,7 @@ jobs:
         if: ${{ env.UPDATE_FILE == 'T' && env.PR_BRANCH == 'commit' }}
         uses: Keyfactor/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
         with:
           add: store_types.json --force
           message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.4.1
+## Fixes
+- `stores export --all`: Now properly exports all stores where previously it would only export the first page of stores.
+
 # v1.4.0
 ## Features
 

README.md

@@ -440,3 +440,4 @@ alternatively you can specify the parent command
 cobra-cli add <my-new-command> -p '<parent>Cmd'
 ```
 
+

cmd/storeTypes.go

@@ -17,15 +17,16 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/Keyfactor/keyfactor-go-client/v2/api"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 	"io"
 	"net/http"
 	"os"
 	"sort"
 	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/Keyfactor/keyfactor-go-client/v2/api"
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/cobra"
 )
 
 var storeTypesCmd = &cobra.Command{
@@ -102,6 +103,14 @@ var storesTypeCreateCmd = &cobra.Command{
 		}
 		storeTypeIsValid := false
 
+		log.Debug().Str("storeType", storeType).
+			Bool("listTypes", listTypes).
+			Str("storeTypeConfigFile", storeTypeConfigFile).
+			Bool("creatAll", creatAll).
+			Str("gitRef", gitRef).
+			Strs("validStoreTypes", validStoreTypes).
+			Msg("create command flags")
+
 		if listTypes {
 			fmt.Println("Available store types:")
 			sort.Strings(validStoreTypes)
@@ -138,12 +147,16 @@ var storesTypeCreateCmd = &cobra.Command{
 		}
 		for _, v := range validStoreTypes {
 			if strings.EqualFold(v, strings.ToUpper(storeType)) || creatAll {
-				log.Printf("[DEBUG] Valid store type: %s", storeType)
+				log.Debug().Str("storeType", storeType).Msg("Store type is valid")
 				storeTypeIsValid = true
 				break
 			}
 		}
 		if !storeTypeIsValid {
+			log.Error().
+				Str("storeType", storeType).
+				Bool("isValid", storeTypeIsValid).
+				Msg("Invalid store type")
 			fmt.Printf("ERROR: Invalid store type: %s\nValid types are:\n", storeType)
 			for _, st := range validStoreTypes {
 				fmt.Println(fmt.Sprintf("\t%s", st))
@@ -292,7 +305,10 @@ var storesTypeDeleteCmd = &cobra.Command{
 			}
 
 			if dryRun {
-				outputResult(fmt.Sprintf("dry run delete called on certificate store type (%v) with ID: %d", st, id), outputFormat)
+				outputResult(
+					fmt.Sprintf("dry run delete called on certificate store type (%v) with ID: %d", st, id),
+					outputFormat,
+				)
 			} else {
 				log.Debug().Interface("storeType", st).
 					Int("id", id).
@@ -410,7 +426,12 @@ func getStoreTypesInternet(gitRef string) (map[string]interface{}, error) {
 	//resp, err := http.Get("https://raw.githubusercontent.com/keyfactor/kfutil/main/store_types.json")
 	//resp, err := http.Get("https://raw.githubusercontent.com/keyfactor/kfctl/master/storetypes/storetypes.json")
 
-	resp, rErr := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/Keyfactor/kfutil/%s/store_types.json", gitRef))
+	resp, rErr := http.Get(
+		fmt.Sprintf(
+			"https://raw.githubusercontent.com/Keyfactor/kfutil/%s/store_types.json",
+			gitRef,
+		),
+	)
 	if rErr != nil {
 		return nil, rErr
 	}
@@ -489,7 +510,13 @@ func init() {
 
 	// GET store type templates
 	storeTypesCmd.AddCommand(fetchStoreTypesCmd)
-	fetchStoreTypesCmd.Flags().StringVarP(&gitRef, FlagGitRef, "b", "main", "The git branch or tag to reference when pulling store-types from the internet.")
+	fetchStoreTypesCmd.Flags().StringVarP(
+		&gitRef,
+		FlagGitRef,
+		"b",
+		"main",
+		"The git branch or tag to reference when pulling store-types from the internet.",
+	)
 
 	// LIST command
 	storeTypesCmd.AddCommand(storesTypesListCmd)
@@ -504,10 +531,28 @@ func init() {
 	var storeTypeName string
 	var storeTypeID int
 	storeTypesCmd.AddCommand(storesTypeCreateCmd)
-	storesTypeCreateCmd.Flags().StringVarP(&storeTypeName, "name", "n", "", "Short name of the certificate store type to get. Valid choices are: "+validTypesString)
+	storesTypeCreateCmd.Flags().StringVarP(
+		&storeTypeName,
+		"name",
+		"n",
+		"",
+		"Short name of the certificate store type to get. Valid choices are: "+validTypesString,
+	)
 	storesTypeCreateCmd.Flags().BoolVarP(&listValidStoreTypes, "list", "l", false, "List valid store types.")
-	storesTypeCreateCmd.Flags().StringVarP(&filePath, "from-file", "f", "", "Path to a JSON file containing certificate store type data for a single store.")
-	storesTypeCreateCmd.Flags().StringVarP(&gitRef, FlagGitRef, "b", "main", "The git branch or tag to reference when pulling store-types from the internet.")
+	storesTypeCreateCmd.Flags().StringVarP(
+		&filePath,
+		"from-file",
+		"f",
+		"",
+		"Path to a JSON file containing certificate store type data for a single store.",
+	)
+	storesTypeCreateCmd.Flags().StringVarP(
+		&gitRef,
+		FlagGitRef,
+		"b",
+		"main",
+		"The git branch or tag to reference when pulling store-types from the internet.",
+	)
 	storesTypeCreateCmd.Flags().BoolVarP(&createAll, "all", "a", false, "Create all store types.")
 
 	// UPDATE command
@@ -519,7 +564,13 @@ func init() {
 	var dryRun bool
 	storeTypesCmd.AddCommand(storesTypeDeleteCmd)
 	storesTypeDeleteCmd.Flags().IntVarP(&storeTypeID, "id", "i", -1, "ID of the certificate store type to delete.")
-	storesTypeDeleteCmd.Flags().StringVarP(&storeTypeName, "name", "n", "", "Name of the certificate store type to delete.")
+	storesTypeDeleteCmd.Flags().StringVarP(
+		&storeTypeName,
+		"name",
+		"n",
+		"",
+		"Name of the certificate store type to delete.",
+	)
 	storesTypeDeleteCmd.Flags().BoolVarP(&dryRun, "dry-run", "t", false, "Specifies whether to perform a dry run.")
 	storesTypeDeleteCmd.MarkFlagsMutuallyExclusive("id", "name")
 	storesTypeDeleteCmd.Flags().BoolVarP(&deleteAll, "all", "a", false, "Delete all store types.")