chore: Resolve conflicts with incoming branch

.github/workflows/tests.yml

@@ -381,4 +381,32 @@ jobs:
 #          unset KFUTIL_DEBUG
 #          kfutil logout || true
 #          printenv | grep -i keyfactor
-#          go test -v ./cmd -run "^Test_PAM*"
+#          go test -v ./cmd -run "^Test_PAM*"
+
+  Test_Kfutil_pkg:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      # Checkout code
+      # https://github.com/actions/checkout
+      - name: Checkout code
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      # Setup GoLang build environment
+      # https://github.com/actions/setup-go
+      - name: Set up Go 1.x
+        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+        with:
+          go-version-file: 'go.mod'
+          cache: true
+
+      # Install dependencies
+      - name: Install dependencies
+        run: go mod download
+
+      # Run the tests with coverage found in the pkg directory
+      - name: Run tests
+        run: go test -v -cover ./pkg/...

cmd/helm_uo.go

@@ -145,17 +145,14 @@ func (f *HelmUoFlags) ToOptions(cmd *cobra.Command, args []string) (*HelmUoOptio
 	flags.GetDebugFlag(cmd)
 
 	// Determine if feature is enabled
-	expEnabled, _ := cmd.Flags().GetBool("exp")
-	_, err := IsExperimentalFeatureEnabled(expEnabled, true)
+	expEnabled, _ = cmd.Flags().GetBool("exp")
+	_, err := isExperimentalFeatureEnabled(expEnabled, true)
 	if err != nil {
 		return nil, fmt.Errorf("feature gate check failed: %s", err)
 	}
 
 	// Get the command config entry from global flags
-	noPrompt := flags.GetNoPromptFlag(cmd)
-	profile := flags.GetProfileFlag(cmd)
-	configFile := flags.GetConfigFlag(cmd)
-	commandConfig, _ := authConfigFile(configFile, profile, noPrompt, false)
+	commandConfig, _ := authConfigFile(configFile, profile, "", noPrompt, false)
 
 	// Get the hostname from the command config
 	entry, ok := commandConfig.Servers[profile]

pkg/cmdutil/extensions/extension_installer_test.go

@@ -266,6 +266,7 @@ func TestExtensionInstaller_cacheExtensionsDir(t *testing.T) {
 func TestExtensionInstaller_applyUpgradesToExtensionsToInstall(t *testing.T) {
 	builder := NewExtensionInstallerBuilder()
 	builder.currentlyInstalled = make(Extensions)
+	builder.Token(GetGithubToken())
 
 	// Get an extension
 	extension, err := NewGithubReleaseFetcher("", GetGithubToken()).GetFirstExtension()

pkg/helm/uo_test.go

@@ -170,6 +170,7 @@ func TestNewUniversalOrchestratorHelmValueBuilder(t *testing.T) {
 		}
 
 		builder := NewUniversalOrchestratorHelmValueBuilder().
+			Token(GetGithubToken()).
 			InteractiveMode(false).
 			Extensions([]string{string(extension)})