fix(provider/cf): fix environment variable definition for CF deployments

spinnaker · Oct 17, 2018 · c8fae53 · c8fae53
1 parent d6ee160
commit c8fae53
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 20 deletions.
diff --git a/...ts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts b/...ts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts
@@ -75,7 +75,7 @@ export class CloudFoundryServerGroupCommandBuilder {
         buildpack: serverGroup.droplet.buildpacks.length > 0 ? serverGroup.droplet.buildpacks[0].name : '',
         instances: serverGroup.instances.length,
         routes: serverGroup.loadBalancers,
-        env: serverGroup.env,
+        environment: [],
         services: (serverGroup.serviceInstances || []).map(serviceInstance => serviceInstance.name),
         reference: '',
         account: '',

diff --git a/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts b/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts
@@ -36,7 +36,7 @@ export interface ICloudFoundryManifestDirectSource {
   instances: number;
   buildpack: string;
   routes: string[];
-  env: ICloudFoundryEnvVar[];
+  environment: ICloudFoundryEnvVar[];
   services: string[];
 }
 

diff --git a/...dules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings.cf.tsx b/...dules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings.cf.tsx
@@ -91,7 +91,7 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
           instances: 1,
           buildpack: undefined,
           routes: [],
-          env: [],
+          environment: [],
           services: [],
         };
         break;
@@ -129,35 +129,35 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
   private addEnvironmentVariable = (): void => {
     const { manifest } = this.props.formik.values;
     if (isManifestDirectSource(manifest)) {
-      if (manifest.env === undefined) {
-        manifest.env = [];
+      if (manifest.environment === undefined) {
+        manifest.environment = [];
       }
-      manifest.env.push({ key: '', value: '' });
-      this.props.formik.setFieldValue('manifest.env', manifest.env);
+      manifest.environment.push({ key: '', value: '' });
+      this.props.formik.setFieldValue('manifest.env', manifest.environment);
     }
   };
 
   private removeEnvironmentVariable = (index: number): void => {
     const { manifest } = this.props.formik.values;
     if (isManifestDirectSource(manifest)) {
-      manifest.env.splice(index, 1);
-      this.props.formik.setFieldValue('manifest.env', manifest.env);
+      manifest.environment.splice(index, 1);
+      this.props.formik.setFieldValue('manifest.env', manifest.environment);
     }
   };
 
   private environmentKeyUpdated = (index: number, event: React.ChangeEvent<HTMLInputElement>): void => {
     const { manifest } = this.props.formik.values;
     if (isManifestDirectSource(manifest)) {
-      manifest.env[index].key = event.target.value;
-      this.props.formik.setFieldValue('manifest.env', manifest.env);
+      manifest.environment[index].key = event.target.value;
+      this.props.formik.setFieldValue('manifest.env', manifest.environment);
     }
   };
 
   private environmentValueUpdated = (index: number, event: React.ChangeEvent<HTMLInputElement>): void => {
     const { manifest } = this.props.formik.values;
     if (isManifestDirectSource(manifest)) {
-      manifest.env[index].value = event.target.value;
-      this.props.formik.setFieldValue('manifest.env', manifest.env);
+      manifest.environment[index].value = event.target.value;
+      this.props.formik.setFieldValue('manifest.env', manifest.environment);
     }
   };
 
@@ -316,15 +316,15 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
                   </tr>
                 </thead>
                 <tbody>
-                  {manifest.env &&
-                    manifest.env.map(function(env, index) {
+                  {manifest.environment &&
+                    manifest.environment.map(function(environment, index) {
                       return (
                         <tr key={index}>
                           <td>
                             <input
                               className="form-control input-sm"
                               type="text"
-                              value={env.key}
+                              value={environment.key}
                               required={true}
                               onChange={event => environmentKeyUpdated(index, event)}
                             />
@@ -333,7 +333,7 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
                             <input
                               className="form-control input-sm"
                               type="text"
-                              value={env.value}
+                              value={environment.value}
                               required={true}
                               onChange={event => environmentValueUpdated(index, event)}
                             />
@@ -650,9 +650,9 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
           existingServices[service] = service;
         });
       }
-      if (values.manifest.env) {
+      if (values.manifest.environment) {
         const existingKeys: any = {};
-        values.manifest.env.forEach(function(e) {
+        values.manifest.environment.forEach(function(e) {
           if (!e.key || !e.value) {
             errors.manifest = errors.manifest || {};
             errors.manifest.env = `An environment variable was not set`;

diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts b/app/scripts/modules/cloudfoundry/src/serverGroup/serverGroup.transformer.ts
@@ -2,7 +2,7 @@ import { module, IPromise } from 'angular';
 
 import { defaults } from 'lodash';
 
-import { ICloudFoundryServerGroup } from 'cloudfoundry/domain';
+import { ICloudFoundryServerGroup, ICloudFoundryEnvVar } from 'cloudfoundry/domain';
 
 export class CloudFoundryServerGroupTransformer {
   public constructor(private $q: ng.IQService) {
@@ -22,10 +22,26 @@ export class CloudFoundryServerGroupTransformer {
     command.cloudProvider = 'cloudfoundry';
     command.provider = 'cloudfoundry';
     command.account = command.credentials;
+
     delete command.viewState;
     delete command.selectedProvider;
+
+    if (command.manifest.type === 'direct') {
+      command.manifest.env = this.convertManifestEnv(command.manifest.environment);
+    } else {
+      command.manifest.env = command.manifest.environment;
+    }
+
     return command;
   }
+
+  private convertManifestEnv(envVars: ICloudFoundryEnvVar[]): {} {
+    const newEnv = Object.create(null);
+    for (const envVar of envVars) {
+      newEnv[envVar.key] = envVar.value;
+    }
+    return newEnv;
+  }
 }
 
 export const CLOUD_FOUNDRY_SERVER_GROUP_TRANSFORMER = 'spinnaker.cloudfoundry.serverGroup.transformer';