add null check for empty kube-config in connectedk8s proxy scenario

src/connectedk8s/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+1.10.4
+++++++
+* Fixed the issue where the 'connectedk8s proxy' command would fail if the kubeconfig file was empty.
+
 1.10.3
 ++++++
 * Fixed linting and styling issues, and added type annotations.

src/connectedk8s/azext_connectedk8s/custom.py

@@ -3372,11 +3372,14 @@ def merge_kubernetes_configurations(
                 break
         except (KeyError, TypeError):
             continue
-
-    handle_merge(existing, addition, "clusters", replace)
-    handle_merge(existing, addition, "users", replace)
-    handle_merge(existing, addition, "contexts", replace)
-    existing["current-context"] = addition["current-context"]
+
+    if existing is None:
+        existing = addition
+    else:
+        handle_merge(existing, addition, "clusters", replace)
+        handle_merge(existing, addition, "users", replace)
+        handle_merge(existing, addition, "contexts", replace)
+        existing["current-context"] = addition["current-context"]
 
     # check that ~/.kube/config is only read- and writable by its owner
     if platform.system() != "Windows":

src/connectedk8s/setup.py

@@ -13,7 +13,7 @@
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
 
-VERSION = "1.10.3"
+VERSION = "1.10.4"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

testing/pipeline/k8s-custom-pipelines.yml

@@ -48,6 +48,10 @@ stages:
     parameters:
       jobName: TroubleshootTest
       path: ./test/configurations/Troubleshoot.Tests.ps1
+  - template: ./templates/run-test.yml
+    parameters:
+      jobName: Connectedk8sProxyTest
+      path: ./test/configurations/ConnectProxy.Tests.ps1
   - job: BuildPublishExtension
     pool:
       vmImage: 'ubuntu-20.04'

testing/test/configurations/ConnectProxy.Tests.ps1

@@ -0,0 +1,62 @@
+Describe 'Connectedk8s Proxy Scenario' {
+    BeforeAll {
+        . $PSScriptRoot/../helper/Constants.ps1
+    }
+
+    It 'Check if basic onboarding works correctly' {
+        az connectedk8s connect -n $ENVCONFIG.arcClusterName -g $ENVCONFIG.resourceGroup -l $ARC_LOCATION --no-wait
+        $? | Should -BeTrue
+        Start-Sleep -Seconds 10
+
+        # Loop and retry until the configuration installs
+        $n = 0
+        do 
+        {
+            $output = az connectedk8s show -n $ENVCONFIG.arcClusterName -g $ENVCONFIG.resourceGroup
+            $provisioningState = ($output | ConvertFrom-Json).provisioningState
+            Write-Host "Provisioning State: $provisioningState"
+            if ($provisioningState -eq $SUCCEEDED) {
+                break
+            }
+            Start-Sleep -Seconds 10
+            $n += 1
+        } while ($n -le $MAX_RETRY_ATTEMPTS)
+        $n | Should -BeLessOrEqual $MAX_RETRY_ATTEMPTS
+    }
+
+    It 'Connectedk8s proxy test with non-empty kubeconfig' {
+        # Start the proxy command as a background job
+        $proxyJob = Start-Job -ScriptBlock {
+            param($ClusterName, $ResourceGroup)
+
+            # Capture output and errors
+            try {
+                $output = az connectedk8s proxy -n $ClusterName -g $ResourceGroup 2>&1
+                return @{ Success = $LASTEXITCODE -eq 0; Output = $output }
+            } catch {
+                return @{ Success = $false; Output = $_.Exception.Message }
+            }
+        } -ArgumentList $ENVCONFIG.arcClusterName, $ENVCONFIG.resourceGroup
+
+        # Wait for a certain amount of time (e.g., 30 seconds)
+        Start-Sleep -Seconds 30
+
+        # Display the output
+        Write-Host "Proxy Job State: $($proxyJob.State)"
+
+        # Check if the job ran successfully
+        $proxyJob.State | Should -Be 'Running'
+
+        Stop-Job -Job $proxyJob
+        Remove-Job -Job $proxyJob
+    }
+
+    It "Delete the connected instance" {
+        az connectedk8s delete -n $ENVCONFIG.arcClusterName -g $ENVCONFIG.resourceGroup --force -y
+        $? | Should -BeTrue
+
+        # Configuration should be removed from the resource model
+        az connectedk8s show -n $ENVCONFIG.arcClusterName -g $ENVCONFIG.resourceGroup
+        $? | Should -BeFalse
+    }
+}