Merge pull request #149 from brendandburns/sockets

Improve loading on Windows and add tests.

Author: k8s-ci-robot

src/config.ts

@@ -14,6 +14,27 @@ import api = require('./api');
 import { Cluster, Context, newClusters, newContexts, newUsers, User } from './config_types';
 
 export class KubeConfig {
+    // Only public for testing.
+    public static findHomeDir(): string | null {
+        if (process.env.HOME) {
+            if (fs.existsSync(process.env.HOME)) {
+                return process.env.HOME;
+            }
+        }
+        if (process.platform !== 'win32') {
+            return null;
+        }
+        if (process.env.HOMEDRIVE && process.env.HOMEPATH) {
+            const dir = path.join(process.env.HOMEDRIVE, process.env.HOMEPATH);
+            if (fs.existsSync(dir)) {
+                return dir;
+            }
+        }
+        if (process.env.USERPROFILE && fs.existsSync(process.env.USERPROFILE)) {
+            return process.env.USERPROFILE;
+        }
+        return null;
+    }
 
     // Only really public for testing...
     public static findObject(list: any[], name: string, key: string) {
@@ -199,14 +220,16 @@ export class KubeConfig {
             this.loadFromFile(process.env.KUBECONFIG);
             return;
         }
-        if (process.env.HOME) {
-            const config = path.join(process.env.HOME, '.kube', 'config');
+        const home = KubeConfig.findHomeDir();
+        if (home) {
+            const config = path.join(home, '.kube', 'config');
             if (fs.existsSync(config)) {
                 this.loadFromFile(config);
                 return;
             }
         }
         if (process.platform === 'win32' && shelljs.which('wsl.exe')) {
+            // TODO: Handle if someome set $KUBECONFIG in wsl here...
             const result = shelljs.exec('wsl.exe cat $HOME/.kube/config', { silent: true });
             if (result.code === 0) {
                 this.loadFromString(result.stdout);

src/config_test.ts

@@ -322,6 +322,81 @@ describe('KubeConfig', () => {
         });
     });
 
+    describe('findHome', () => {
+        it('should load from HOME if present', () => {
+            const currentHome = process.env.HOME;
+            const expectedHome = 'foobar';
+            process.env.HOME = expectedHome;
+            const dir = join(process.env.HOME, '.kube');
+            const arg = {};
+            arg[dir] = { config: 'data' };
+            mockfs(arg);
+
+            const home = KubeConfig.findHomeDir();
+
+            mockfs.restore();
+            process.env.HOME = currentHome;
+
+            expect(home).to.equal(expectedHome);
+        });
+    });
+
+    describe('win32HomeDirTests', () => {
+        let originalPlatform: string;
+
+        before(() => {
+            originalPlatform = process.platform;
+            Object.defineProperty(process, 'platform', {
+                value: 'win32',
+            });
+        });
+
+        after(() => {
+            Object.defineProperty(process, 'platform', {
+                value: originalPlatform,
+            });
+        });
+
+        it('should load from HOMEDRIVE/HOMEPATH if present', () => {
+            const currentHome = process.env.HOME;
+
+            delete process.env.HOME;
+            process.env.HOMEDRIVE = 'foo';
+            process.env.HOMEPATH = 'bar';
+            const dir = join(process.env.HOMEDRIVE, process.env.HOMEPATH);
+            const arg = {};
+            arg[dir] = { config: 'data' };
+            mockfs(arg);
+
+            const home = KubeConfig.findHomeDir();
+
+            mockfs.restore();
+            process.env.HOME = currentHome;
+
+            expect(home).to.equal(dir);
+        });
+
+        it('should load from USERPROFILE if present', () => {
+            const currentHome = process.env.HOME;
+            const dir = 'someplace';
+
+            delete process.env.HOME;
+            process.env.HOMEDRIVE = 'foo';
+            process.env.HOMEPATH = 'bar';
+            process.env.USERPROFILE = dir;
+            const arg = {};
+            arg[dir] = { config: 'data' };
+            mockfs(arg);
+
+            const home = KubeConfig.findHomeDir();
+
+            mockfs.restore();
+            process.env.HOME = currentHome;
+
+            expect(home).to.equal(dir);
+        });
+    });
+
     describe('loadContextConfigObjects', () => {
         it('should fail if name is missing from context', () => {
             expect(() => {
@@ -562,7 +637,7 @@ describe('KubeConfig', () => {
             const data = readFileSync(kcFileName);
             const dir = join(process.env.HOME, '.kube');
             const arg = {};
-            arg[dir] = {config: data};
+            arg[dir] = { config: data };
             mockfs(arg);
 
             const kc = new KubeConfig();