Adding Action Annotations #631
Merged
Conversation
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
mrutkows
reviewed
Nov 1, 2017
| reader.bindPackageInputsAndAnnotations() | ||
| reader.bindActionInputsAndAnnotations() | ||
| reader.bindTriggerInputsAndAnnotations() | ||
| if err := reader.bindPackageInputsAndAnnotations(); err != nil { |
There was a problem hiding this comment.
Thanks for surfacing these errors from the "bind" functions.
deployers/deploymentreader.go
Outdated
| } | ||
| } | ||
| if !keyExistsInManifest { | ||
| return utils.NewYAMLFormatError("Annotation key \""+name+"\" does not exist in manifest file but specified in deployment file.") |
There was a problem hiding this comment.
Is there a way we can move this string to our translatable file ?
mrutkows
reviewed
Nov 1, 2017
deployers/deploymentreader.go
Outdated
| } | ||
|
|
||
| serviceDeployPack.Package.Annotations = keyValArr |
There was a problem hiding this comment.
Is the array always allocated now?
There was a problem hiding this comment.
Yes if one or more annotations are specified ...
mrutkows
requested changes
Nov 1, 2017
| case "aaa": | ||
| assert.Equal(t, "this is an annotation", annos.Value, "Failed to get action annotations") | ||
| case "action_annotation_1": | ||
| assert.Equal(t, "this is a action annotation 1", annos.Value, "Failed to get action annotations") |
| case "action_annotation_1": | ||
| assert.Equal(t, "this is a action annotation 1", annos.Value, "Failed to get action annotations") | ||
| case "action_annotation_2": | ||
| assert.Equal(t, "this is a action annotation 2", annos.Value, "Failed to get action annotations") |
| for _, annos := range wskaction.Annotations { | ||
| switch annos.Key { | ||
| case "action_annotation_1": | ||
| assert.Equal(t, "this is a action annotation 1 from deployment", annos.Value, "Failed to get action annotations") |
| case "action_annotation_1": | ||
| assert.Equal(t, "this is a action annotation 1 from deployment", annos.Value, "Failed to get action annotations") | ||
| case "action_annotation_2": | ||
| assert.Equal(t, "this is a action annotation 2", annos.Value, "Failed to get action annotations") |
| type: string | ||
| description: a simple greeting message, Hello World! | ||
| annotations: | ||
| action_annotation_1: this is annotation 1 |
There was a problem hiding this comment.
Do we have a test for more complex (i.e., arrays/JSON) annotations? Should we open another issue (feature) to support this?
There was a problem hiding this comment.
Nope, created new issue #634
mrutkows
approved these changes
Nov 1, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #609
Please don't get scared with the number of files changed :) this number includes YAML files for unit tests and updates to YAML files of existing integration test and a new integration test directory.
Here is the list of changes:
misc.gointowebaction.goweb-exportwskdeployerrors out sayingError: wskdeploy.go [125]: [ERROR_COMMAND_FAILED]: wskdeploy: Error: deploymentreader.go [227]: [ERROR_YAML_FORMAT_ERROR]: Annotation key <key> does not exist in manifest file but specified in deployment file.wskdeployoverwrites annotation value from deployment i.e. annotation value in deployment file takes higher precedence over the value in manifest file.