Skip to content
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

Action set #858

Merged
merged 9 commits into from Sep 29, 2014
Merged

Action set #858

merged 9 commits into from Sep 29, 2014

Conversation

binary132
Copy link
Contributor

action-set permits action hooks to define an arbitrary map of params
which will be returned to the state server at the end of the Action.

This is a reopen of #415. 415 failed to
land due to too many pages of comments.

action-set permits action hooks to define an arbitrary map of params
which will be returned to the state server at the end of the Action.
This commit moves the Action results update method into the Context
implementation, so that client code is not changing the results map
on its own.
Addressed:
 - need to keep Action results map segregated from jujuc
 - testing Context interface mock to support this change
 - removed old Context methods
 - changed actionResults inner "error" type to string rather than error
action-set now has a test in worker/uniter/uniter.  This test
demonstrates how action-set overwrites existing values in the
results map.
This commit revises action-set behavior to interact correctly with new
ActionFinish logic on worker uniter.
This commit wraps up the changes to `action-set` now that ActionFinish
has landed in core.
@binary132
Copy link
Contributor Author

$$shipit$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 29, 2014

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Sep 29, 2014

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/837

@johnweldon
Copy link
Contributor

$$sorry-for-cutting$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 29, 2014

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Sep 29, 2014
Action set

action-set permits action hooks to define an arbitrary map of params
which will be returned to the state server at the end of the Action.

This is a reopen of #415.  415 failed to
land due to too many pages of comments.
@jujubot jujubot merged commit efc4a27 into juju:master Sep 29, 2014
@binary132 binary132 deleted the action-set branch September 29, 2014 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants