[JUJU-1129] Refactor payload client facades to match standard practice #14058
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
wallyworld
force-pushed
the
payload-client-refactor
branch
from
ffa10ad
to
05e9c09
Compare
hpidcock
approved these changes
May 20, 2022
| "github.com/juju/juju/payload" | ||
| "github.com/juju/juju/payload/status" | ||
| "github.com/juju/juju/cmd/juju/payload" | ||
| corepayload "github.com/juju/juju/payload" |
There was a problem hiding this comment.
if we are going to call it core payload and it fits what is in core/ then maybe we move it out of root into juju/juju/core/
There was a problem hiding this comment.
That's scheduled for the last PR after everything else; trying to manage the size of the changes each time.
wallyworld
force-pushed
the
payload-client-refactor
branch
from
05e9c09
to
432f6dd
Compare
wallyworld
force-pushed
the
payload-client-refactor
branch
from
7f41bb6
to
5d9f9ae
Compare
|
|
jujubot
added a commit
that referenced
this pull request
May 23, 2022
#14062 This looks bigger than it is - a lot of code is moved around. The resources and payloads infrastructure is moved from the so called "component based approach" to the standard juju model. The basis of the change is that (most of the) code from the "components" package is moved to the uniter worker and remodelled as part of the hook context struct. The hook commands are also moved to live with all the others. The manifold used to make the uniter worker sets up the payload and resource facades and passes these into the runner context factory. From there hook commands have access to the necessary api calls. Where relevant, a lot of the tests were rewritten to use gomock instead of the hand crafted stubs, also adding somewhat to the bulk of the PR. ## QA steps See QA steps for these previous PRs #14058 #14049 Essentially, deploy charms with payloads and resources and run various hook commands.
Merged
jujubot
added a commit
that referenced
this pull request
May 26, 2022
#14078 Merge 2.9 #14049 [JUJU-1129] Refactor resource client api to be consistent with other juju client api #14051 [JUJU-1125] Improve error message for local OCI image resource #14048 [JUJU-1119] work around golang http proxy caching by default - add more logging #14055 Added two examples to juju status help #14058 [JUJU-1129] Refactor payload client facades to match standard practice #14059 Update add-unit help to clarify lp#1971956 #14060 Increase the number of open file descriptors #14057 [JUJU-1157] Check that an AgentStreamKey value exists #14062 Remove the componentisation of resources and payloads #14054 Update debug-log help text #14064 [JUJU-1159] Improved help model-defaults message #14066 Bump actions/upload-artifact from 3.0.0 to 3.1.0 #14070 [JUJU-1129] Move resources files to a single top level package #14071 Update the model-defaults help text Conflicts were charm and resource import paths, deleted resource files, and struct initialisations. ``` # Conflicts: # api/client/resources/client.go # api/client/resources/client/base_test.go # api/client/resources/client/client_upload_test.go # apiserver/facades/controller/caasapplicationprovisioner/provisioner_test.go # caas/kubernetes/provider/k8s.go # caas/kubernetes/provider/k8s_test.go # cmd/containeragent/initialize/package_test.go # cmd/containeragent/unit/package_test.go # cmd/juju/application/bundle_test.go # cmd/juju/application/deployer/bundlehandler.go # cmd/juju/application/deployer/deployer.go # cmd/juju/application/refresh.go # cmd/juju/commands/main.go # cmd/juju/commands/main_test.go # core/watcher/package_test.go # go.sum # payload/api/private/helpers_test.go # payload/context/base_test.go # payload/context/register_test.go # payload/context/utils.go # resource/charmhub.go # resource/charmstore.go # resource/context/context.go # resource/context/internal/content.go # resource/context/internal/content_test.go # resource/context/internal/resourcedir.go # resource/context/internal/stub_test.go # resource/context/utils.go # resource/context/utils_test.go # resource/repositories/mocks/mocks.go # resource/repositories/operations.go # resource/repositories/operations_test.go # resource/repositories/repository.go # resource/resource.go # resource/resourceadapters/interfaces.go # resource/resourceadapters/mocks/opener_mock.go # resource/resourceadapters/opener.go # resource/unit.go # snap/snapcraft.yaml # state/mocks/resources_mock.go # worker/caasapplicationprovisioner/application_test.go # worker/uniter/manifold.go # worker/uniter/runner/context/contextfactory.go # worker/uniter/runner/jujuc/mocks/context_mock.go # worker/uniter/runner/jujuc/payload-register.go # worker/uniter/runner/jujuc/restricted.go # worker/uniter/runner/jujuc/server.go # worker/uniter/uniter.go # worker/uniter/uniter_test.go # worker/uniter/util_test.go ``` ## QA steps See PRs [JUJU-1129]: https://warthogs.atlassian.net/browse/JUJU-1129?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1125]: https://warthogs.atlassian.net/browse/JUJU-1125?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1119]: https://warthogs.atlassian.net/browse/JUJU-1119?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1129]: https://warthogs.atlassian.net/browse/JUJU-1129?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1157]: https://warthogs.atlassian.net/browse/JUJU-1157?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1159]: https://warthogs.atlassian.net/browse/JUJU-1159?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-1129]: https://warthogs.atlassian.net/browse/JUJU-1129?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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.
Like what was done for resources, the payload api and cli machinery is refactored to match standard practice. API clients for cli and agents are moved to api package and cli is moved to cmd/juju.
A lot of the changes are file renames and edits.
QA steps
deploy a charm with payloads, eg