-
Notifications
You must be signed in to change notification settings - Fork 584
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement workaround for incompatible change in cloud foundry API #343
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2285a5f
Implement workaround for incompatible change in cloud foundry API
fwilhe ec569c5
Fix documentation for cf
fwilhe e369ce8
Add more tests
fwilhe a1236cd
Throw error if 'buildpacks' is not a list
fwilhe 279ee27
More docs
fwilhe 610183a
Remove debug output
fwilhe d51a683
Multiline
fwilhe d0b5a71
Merge branch 'master' into fix/cf-manifest
fwilhe 2f882aa
Update cloudFoundryDeploy.md
fwilhe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package com.sap.piper | ||
|
||
import com.cloudbees.groovy.cps.NonCPS | ||
|
||
class CfManifestUtils { | ||
@NonCPS | ||
static Map transform(Map manifest) { | ||
if (manifest.applications[0].buildpacks) { | ||
manifest['applications'].each { Map application -> | ||
def buildpacks = application['buildpacks'] | ||
if (buildpacks) { | ||
if (buildpacks instanceof List) { | ||
if (buildpacks.size > 1) { | ||
throw new RuntimeException('More than one Cloud Foundry Buildpack is not supported. Please check your manifest.yaml file.') | ||
} | ||
application['buildpack'] = buildpacks[0] | ||
application.remove('buildpacks') | ||
} else { | ||
throw new RuntimeException('"buildpacks" in manifest.yaml is not a list. Please check your manifest.yaml file.') | ||
} | ||
} | ||
} | ||
} | ||
return manifest | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package com.sap.piper | ||
|
||
import org.junit.Test | ||
|
||
import static org.junit.Assert.* | ||
|
||
class CfManifestUtilsTest { | ||
|
||
@Test | ||
void testManifestTransform() { | ||
Map testFixture = [applications: [[buildpacks: ['sap_java_buildpack']]]] | ||
Map expected = [applications: [[buildpack: 'sap_java_buildpack']]] | ||
def actual = CfManifestUtils.transform(testFixture) | ||
assertEquals(expected, actual) | ||
} | ||
|
||
@Test(expected = RuntimeException) | ||
void testManifestTransformMultipleBuildpacks() { | ||
Map testFixture = [applications: [[buildpacks: ['sap_java_buildpack', 'another_buildpack']]]] | ||
CfManifestUtils.transform(testFixture) | ||
} | ||
|
||
@Test | ||
void testManifestTransformShouldNotChange() { | ||
Map testFixture = [applications: [[buildpack: 'sap_java_buildpack']]] | ||
Map expected = [applications: [[buildpack: 'sap_java_buildpack']]] | ||
def actual = CfManifestUtils.transform(testFixture) | ||
assertEquals(expected, actual) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only in case you are using the blue green deployment