Bug fixes for cf

Author: nwmac

electron/index.js

@@ -81,7 +81,7 @@ function createWindow() {
     jetstream = spawn(prog, [], {
       env: getEnvironment(url),
       cwd: __dirname,
-      //stdio: 'inherit'
+      stdio: 'inherit'
     });
 
     waitForBackend(`https://${url}`, () => {
@@ -144,10 +144,15 @@ function doCreateWindow(url) {
   // Open the DevTools.
   //mainWindow.webContents.openDevTools({mode:'undocked'});
 
-  // Watch for the helm repository file to change
-  const watcher = chokidar.watch(getHelmRepoFolder());
-  watcher.on('all', () => {
-    mainWindow.webContents.send('endpointsChanged', 'HELM');
+  // Watch for changed in ant of the local configuration files
+  // We will reload endpoints when these change
+  const watcher = chokidar.watch([
+    getCFConfigFile(),
+    getKubeConfigFile(),
+    getHelmRepoFolder()
+  ]);
+  watcher.on('all', (action, filePath) => {
+    mainWindow.webContents.send('endpointsChanged', action, filePath);
   });
 }
 
@@ -233,3 +238,11 @@ function getHelmRepoFolder() {
   }
   return path.join(homeDir, '.config', 'helm');
 }
+
+function getCFConfigFile() {
+  return path.join(homeDir, '.cf', 'config.json');
+}
+
+function getKubeConfigFile() {
+  return process.env.KUBECONFIG || path.join(homeDir, '.kube', 'config');
+}

src/jetstream/plugins/desktop/cloudfoundry.go

@@ -32,6 +32,11 @@ func ListCloudFoundry() ([]*interfaces.CNSIRecord, error) {
 		return nil, err
 	}
 
+	// Ignore if the api endpoint is empty
+	if len(cfg.APIEndpoint) == 0 {
+		return nil, nil
+	}
+
 	eps := make([]*interfaces.CNSIRecord, 1)
 	eps[0] = &interfaces.CNSIRecord{
 		GUID:                   getEndpointGUID(cfg.APIEndpoint),
@@ -57,6 +62,11 @@ func ListConnectedCloudFoundry() ([]*interfaces.ConnectedEndpoint, error) {
 		return nil, err
 	}
 
+	// Ignore if the api endpoint is empty
+	if len(cfg.APIEndpoint) == 0 {
+		return nil, nil
+	}
+
 	//TODO: Token expiry
 	eps := make([]*interfaces.ConnectedEndpoint, 1)
 	eps[0] = &interfaces.ConnectedEndpoint{
@@ -95,9 +105,11 @@ func readCFFile() (*CFConfigFile, *url.URL, error) {
 		return nil, url, fmt.Errorf("Can not parse Cloud Foundry config file: %s", err)
 	}
 
-	url, err = url.Parse(config.APIEndpoint)
-	if err != nil {
-		return nil, url, err
+	if len(config.APIEndpoint) > 0 {
+		url, err = url.Parse(config.APIEndpoint)
+		if err != nil {
+			return nil, url, err
+		}
 	}
 	return config, url, nil
 }

src/jetstream/plugins/desktop/endpoints.go

@@ -24,7 +24,6 @@ func (d *DesktopEndpointStore) List(encryptionKey []byte) ([]*interfaces.CNSIRec
 func (d *DesktopEndpointStore) ListByUser(userGUID string) ([]*interfaces.ConnectedEndpoint, error) {
 	local, err := ListConnectedCloudFoundry()
 	db, err := d.store.ListByUser(userGUID)
-
 	merged := mergeConnectedEndpoints(db, local)
 	return merged, err
 }
@@ -71,6 +70,15 @@ func (d *DesktopEndpointStore) SaveOrUpdate(endpoint interfaces.CNSIRecord, encr
 
 // Merge endpoints, over-riding any in first with those in second
 func mergeEndpoints(first, second []*interfaces.CNSIRecord) []*interfaces.CNSIRecord {
+
+	if first == nil {
+		return second
+	}
+
+	if second == nil {
+		return first
+	}
+
 	urls := make(map[string]bool, 0)
 	for _, endpoint := range second {
 		urls[endpoint.APIEndpoint.String()] = true
@@ -92,6 +100,15 @@ func mergeEndpoints(first, second []*interfaces.CNSIRecord) []*interfaces.CNSIRe
 
 // Merge endpoints, over-riding any in first with those in second
 func mergeConnectedEndpoints(first, second []*interfaces.ConnectedEndpoint) []*interfaces.ConnectedEndpoint {
+
+	if first == nil {
+		return second
+	}
+
+	if second == nil {
+		return first
+	}
+
 	urls := make(map[string]bool, 0)
 	for _, endpoint := range second {
 		urls[endpoint.APIEndpoint.String()] = true