Merge lp:~axwalk/juju-core/cmd-juju-unset-env into lp:~go-bot/juju-core/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andrew Wilkins | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2484 | ||||
Proposed branch: | lp:~axwalk/juju-core/cmd-juju-unset-env | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
295 lines (+198/-2) 8 files modified
cmd/juju/environment.go (+62/-0) cmd/juju/environment_test.go (+72/-0) cmd/juju/main.go (+1/-0) cmd/juju/main_test.go (+2/-0) state/api/client.go (+6/-0) state/api/params/params.go (+6/-0) state/apiserver/client/client.go (+8/-2) state/apiserver/client/client_test.go (+41/-0) |
||||
To merge this branch: | bzr merge lp:~axwalk/juju-core/cmd-juju-unset-env | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+212771@code.launchpad.net |
Commit message
Introduce unset-environment subcommand
A new juju subcommand, unset-environment (with unset-env alias)
is introduced. This subcommand will take the existing environment
config, remove the specified keys, and update it in state. If
the specified keys have associated defaults, then they will be
assigned.
This is necessary for removing configuration for which an empty
value is not permitted, e.g. for string attributes which are
omitted by default, such as http-proxy.
Fixes lp:1295372
Description of the change
Introduce unset-environment subcommand
A new juju subcommand, unset-environment (with unset-env alias)
is introduced. This subcommand will take the existing environment
config, remove the specified keys, and update it in state. If
the specified keys have associated defaults, then they will be
assigned.
This is necessary for removing configuration for which an empty
value is not permitted, e.g. for string attributes which are
omitted by default, such as http-proxy.
Fixes lp:1295372
Reviewers: mp+212771_ code.launchpad. net,
Message:
Please take a look.
Description:
Introduce unset-environment subcommand
A new juju subcommand, unset-environment (with unset-env alias)
is introduced. This subcommand will take the existing environment
config, remove the specified keys, and update it in state. If
the specified keys have associated defaults, then they will be
assigned.
This is necessary for removing configuration for which an empty
value is not permitted, e.g. for string attributes which are
omitted by default, such as http-proxy.
Fixes lp:1295372
https:/ /code.launchpad .net/~axwalk/ juju-core/ cmd-juju- unset-env/ +merge/ 212771
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/80380043/
Affected files (+196, -2 lines): environment. go environment_ test.go main_test. go params/ params. go /client/ client. go /client/ client_ test.go
A [revision details]
M cmd/juju/
M cmd/juju/
M cmd/juju/main.go
M cmd/juju/
M state/api/client.go
M state/api/
M state/apiserver
M state/apiserver