forked from spinnaker/halyard
-
Notifications
You must be signed in to change notification settings - Fork 3
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
Send plugin configs to deck via settings.js #26
Open
link108
wants to merge
5
commits into
master
Choose a base branch
from
send-plugin-configs-to-deck
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
204870c
feat(plugins): use an init container to download plugin resources
link108 66f3bf1
wip
link108 90c8f29
Merge branch 'master' into send-plugin-configs-to-deck
link108 072e7d2
removing unused files, wip
link108 107a206
send plugin configuration via settings.js, no init containers
link108 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
51 changes: 51 additions & 0 deletions
51
...n/java/com/netflix/spinnaker/halyard/core/resource/v1/ObjectReplaceTemplatedResource.java
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,51 @@ | ||
| /* | ||
| * Copyright 2019 Armory, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License") | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.halyard.core.resource.v1; | ||
|
|
||
| import java.util.Map; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public abstract class ObjectReplaceTemplatedResource extends TemplatedResource { | ||
| public static Logger log = LoggerFactory.getLogger(ObjectReplaceTemplatedResource.class); | ||
|
|
||
| private String formatKey(String key) { | ||
| return "'{{%" + key + "%}}'"; | ||
| } | ||
|
|
||
| private String getRegexSafeFormatKey() { | ||
| return "(?s).*\\'\\{\\{%.*%\\}\\}\\'.*"; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| String contents = getContents(); | ||
| for (Map.Entry<String, Object> binding : bindings.entrySet()) { | ||
| Object value = binding.getValue(); | ||
| contents = | ||
| contents.replace(formatKey(binding.getKey()), value != null ? value.toString() : ""); | ||
| } | ||
| if (contents.matches(getRegexSafeFormatKey())) { | ||
| log.warn( | ||
| "Found part of template that still contains a format key, likely a missing template value for a key, template: " | ||
| + contents); | ||
| } | ||
| return contents; | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
...ard-core/src/main/java/com/netflix/spinnaker/halyard/core/resource/v1/ObjectResource.java
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 @@ | ||
| /* | ||
| * Copyright 2019 Armory, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License") | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.halyard.core.resource.v1; | ||
|
|
||
| import lombok.AccessLevel; | ||
| import lombok.Getter; | ||
|
|
||
| public class ObjectResource extends ObjectReplaceTemplatedResource { | ||
| public ObjectResource(String contents) { | ||
| this.contents = contents; | ||
| } | ||
|
|
||
| @Getter(AccessLevel.PROTECTED) | ||
| private final String contents; | ||
| } |
54 changes: 54 additions & 0 deletions
54
.../com/netflix/spinnaker/halyard/core/resource/v1/ObjectReplaceTemplatedResourceSpec.groovy
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,54 @@ | ||
| /* | ||
| * Copyright 2019 Armory, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License") | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.halyard.core.resource.v1 | ||
|
|
||
| import spock.lang.Specification | ||
|
|
||
| class ObjectReplaceTemplatedResourceSpec extends Specification { | ||
| void "Attempt template with unfilled key"() { | ||
| setup: | ||
| String template = """'{{%some-unfilled-key%}}'""" | ||
| def logMock = Mock(org.slf4j.Logger) | ||
| ObjectReplaceTemplatedResource resource = (ObjectReplaceTemplatedResource)(new ObjectResource(template)) | ||
| resource.log = logMock | ||
|
|
||
| when: | ||
| 1 * logMock.warn(_) >> _ | ||
| resource.toString() | ||
|
|
||
| then: | ||
| true | ||
| } | ||
|
|
||
| void "Attempt template with unfilled key multiline"() { | ||
| setup: | ||
| String template = """foo | ||
| '{{%some-unfilled-key%}}' | ||
| bar | ||
| """ | ||
| def logMock = Mock(org.slf4j.Logger) | ||
| ObjectReplaceTemplatedResource resource = (ObjectReplaceTemplatedResource)(new ObjectResource(template)) | ||
| resource.log = logMock | ||
|
|
||
| when: | ||
| 1 * logMock.warn(_) >> _ | ||
| resource.toString() | ||
|
|
||
| then: | ||
| true | ||
| } | ||
| } |
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.
this is hacky, but since we don't control the settings.js format, this works for now