Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Deploy App Manifest overrides #2924

Merged
merged 19 commits into from Sep 6, 2018
Merged

Deploy App Manifest overrides #2924

merged 19 commits into from Sep 6, 2018

Conversation

nwmac
Copy link
Contributor

@nwmac nwmac commented Aug 29, 2018

This PR adds an extra (optional) step to the Deploy App flow to allow manifest overrides to be provided.

@cfdreddbot
Copy link

Hey nwmac!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you and the commit authors have already signed the CLA.

@nwmac nwmac changed the title Deploy pp overrides Deploy App Manifest overrides Aug 29, 2018
@codecov
Copy link

codecov bot commented Aug 29, 2018

Codecov Report

Merging #2924 into v2-master will decrease coverage by 0.03%.
The diff coverage is 65.21%.

@@              Coverage Diff              @@
##           v2-master    #2924      +/-   ##
=============================================
- Coverage      71.22%   71.19%   -0.04%     
=============================================
  Files            606      607       +1     
  Lines          25982    26106     +124     
  Branches        5893     5910      +17     
=============================================
+ Hits           18506    18585      +79     
- Misses          7476     7521      +45

Still need to..
- Store overrides in app env var
- Ensure redeploy flow works correctly (includes disabled state, showing original values, next button texts)
- Show drop down for domains
@@ -159,11 +168,20 @@ export class DeployApplicationDeployer {
this.inputStream.next(JSON.stringify(msg));
}

sentAppOverride = (appOverrides: OverrideAppDetails) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

send

sendEvent(clientWebSocket, OVERRIDES_REQUIRED)

// Wait for a message from the client
log.Info("Waiting for app overrides from client")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug

return err
}

log.Infof("Overrides: %v+", msgOverrides)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debugf

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check message type is OVERRIDES_SUPPLIED

@@ -100,22 +125,23 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error {
return err
}

log.Infof("%v+", msg)
log.Infof("Source %v+", msg)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debugf


var flags []string

if len(overrides.Name) != 0 {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could possible factor out to a helper function

@nwmac nwmac merged commit 116b6a0 into v2-master Sep 6, 2018
@nwmac nwmac deleted the deploy-app-overrides branch September 6, 2018 15:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants