feat(provider/cf): support multiple buildpacks (#6223)

spinnaker · Dec 18, 2018 · 1bb55ac · 1bb55ac
1 parent 294df78
commit 1bb55ac
Show file tree

Hide file tree

Showing 15 changed files with 708 additions and 578 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
@@ -85,7 +85,7 @@ export class CloudFoundryServerGroupCommandBuilder {
         type: 'direct',
         memory: serverGroup.memory ? serverGroup.memory + 'M' : '1024M',
         diskQuota: serverGroup.diskQuota ? serverGroup.diskQuota + 'M' : '1024M',
-        buildpack:
+        buildpacks:
           serverGroup.droplet && serverGroup.droplet.buildpacks.length > 0
             ? serverGroup.droplet.buildpacks[0].name
             : '',

diff --git a/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts b/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts
@@ -37,7 +37,7 @@ export interface ICloudFoundryManifestDirectSource {
   memory: string;
   diskQuota: string;
   instances: number;
-  buildpack: string;
+  buildpacks: string[];
   healthCheckType: string;
   healthCheckHttpEndpoint: string;
   routes: string[];

diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/CreateServerGroupModal.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/CreateServerGroupModal.tsx
@@ -16,12 +16,12 @@ import {
 } from '@spinnaker/core';
 
 import { ICloudFoundryCreateServerGroupCommand } from '../serverGroupConfigurationModel.cf';
-import { CloudFoundryServerGroupBasicSettings } from './sections/basicSettings.cf';
-import { CloudFoundryServerGroupConfigurationSettings } from './sections/configurationSettings.cf';
-import { CloudFoundryServerGroupArtifactSettings } from './sections/artifactSettings.cf';
+import { CloudFoundryServerGroupBasicSettings } from './sections/basicSettings/BasicSettings.cf';
+import { CloudFoundryServerGroupArtifactSettings } from './sections/artifactSettings/ArtifactSettings.cf';
+import { CloudFoundryServerGroupConstantArtifactSettings } from './sections/artifactSettings/ConstantArtifactSettings.cf';
+import { CloudFoundryServerGroupConfigurationSettings } from './sections/configurationSettings/ConfigurationSettings.cf';
 import { CfDisclaimerPage } from 'cloudfoundry/common/wizard/sections/cfDisclaimer.cf';
 import { ServerGroupTemplateSelection } from 'cloudfoundry/serverGroup/configure/wizard/ServerGroupTemplateSelection';
-import { CloudFoundryServerGroupConstantArtifactSettings } from 'cloudfoundry/serverGroup/configure/wizard/sections/constantArtifactSettings.cf';
 import { ICloudFoundryServerGroup } from 'cloudfoundry/domain';
 
 import './serverGroup.less';

diff --git a/...ts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/artifactSettings.cf.tsx b/...ts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/artifactSettings.cf.tsx