add support for override defaults file #871

Merged
merged 4 commits into from Feb 8, 2016

Conversation

Projects
None yet
2 participants
@tpetr
Member

tpetr commented Feb 2, 2016

This PR adds support for pulling in an additional Singularity configuration file which overrides values from the default one. This is useful if you need to lock down S3 / database / LDAP credentials but would like the other settings to have looser read/write permissions.

tpetr added some commits Feb 2, 2016

+ if (oldVal == null || oldVal.isNull()) {
+ to.put(newFieldName, newVal);
+ } else if (oldVal.isArray() && newVal.isArray()) {
+ ((ArrayNode) oldVal).addAll((ArrayNode) newVal);

This comment has been minimized.

@jhaber

jhaber Feb 2, 2016

Member

For this use-case do you think the behavior should be to append or to overwrite?

@jhaber

jhaber Feb 2, 2016

Member

For this use-case do you think the behavior should be to append or to overwrite?

This comment has been minimized.

@tpetr

tpetr Feb 2, 2016

Member

good eye -- probably overwrite

@tpetr

tpetr Feb 2, 2016

Member

good eye -- probably overwrite

@tpetr tpetr added the hs_staging label Feb 2, 2016

@tpetr tpetr added this to the 0.4.9 milestone Feb 2, 2016

@hs-jenkins-bot hs-jenkins-bot changed the title from add support for override configuration file to add support for override defaults file Feb 2, 2016

@tpetr tpetr modified the milestones: 0.4.9, 0.4.10 Feb 2, 2016

@tpetr tpetr added the hs_qa label Feb 3, 2016

@tpetr tpetr added the hs_stable label Feb 3, 2016

tpetr added a commit that referenced this pull request Feb 8, 2016

Merge pull request #871 from HubSpot/override-config
add support for override defaults file

@tpetr tpetr merged commit 2f2b651 into master Feb 8, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@tpetr tpetr deleted the override-config branch Feb 8, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment