Merge feature resources #4805

Merged

jujubot merged 188 commits into juju:master from cherylj:merge-feature-resources

Mar 21, 2016

cherylj commented Mar 20, 2016

The feature-resources branch is ready for merging. This branch had a bless on its last CI run: http://reports.vapour.ws/releases/3782

There are no bugs open against this branch: https://bugs.launchpad.net/juju-core/feature-resources

(Review request: http://reviews.vapour.ws/r/4247/)

natefinch and others added some commits Mar 2, 2016


      now we pass up the filename and verify the extension

69714bf


      missed component/all section

dcfc47e


      missing files replaced

345d217


      code review changes

6bf8dec


      code review changes

6e9ddc9


      rename files to be slightly nicer

7018e02


      extra the filename logic into a couple helpers

56c712b


      rekajigger so the mime stuff is in an internal package

3cbc50a


      remove use of sync.pool


      Corrected tests to conform to new type signatures.

49d87a3


      Merge pull request #4683 from kat-co/check-extension

Check extension



(Review request: http://reviews.vapour.ws/r/4122/)

302dd0b


      fix build constraint

5b4b7c0


      Merge pull request #4696 from natefinch/fix-1556146

Fix bug 1556146

missing a period in the build constraint, fixes https://bugs.launchpad.net/juju-core/+bug/1556146

(Review request: http://reviews.vapour.ws/r/4135/)

58c0c09


      Add a "latest charm" handler registry.

be2de25


      Add basic charmstore.Client implementations.

35c7a5f


      Consolidate the different charm store clients.

17008a9


      Add charmstore.Client.AsRepo().

52c1c21


      Factor out charmstore.LatestCharmInfo().

1c0bae0


      Drop Client.Latest() and modelClient.

a51710a


      Drop some extraneous lines.

ff5f628


      Fix some typos.

4171f38


      NewClient() -> WrapBaseClient().

424ecd1


      Use charmstore.LatestCharmInfo() on the API server.

f2c2077


      Also retrieve the latest resources info.

b501444


      Add CharmInfo.Timestamp.

0dbee1a


      Register a LatestCharmHandler for resources.

7bd1746


      Add a TODO.

e3039e0


      Fix a test.

e501735


      CharmInfo.URL -> CharmInfo.LatestRevision.

7daf70b


      Drop the model worker registry.

1302c8e


      Drop the dedicated client.Close() implementation.


      Clean up doc comments.

41db01d


      Add tests.

b399925


      Drop the test for NewClient().

a233518


      listHandlers -> createHandlers.

a49c2b6


      Clean up an interface.

2b17f71


      Move latest-specific code down into retrieveLatestCharmInfo().

f0019e1


      uuid -> modelUUID.

1feb56c


      Split NewDefaultClient() out from NewClient().

9c08dde


      Do not handle nil closers in WrapBaseClient().

a55d3b1


      Use valid dummy values.

eeb40e5


      Clean up some error handling.

7acb9d2


      URL -> OriginalURL.

df0578e


      Add charmstore.JujuMetadata.

a48df4a


      Drop Client.AsRepo() (and add Client.WithMetadata()).

a80b0a4


      Drop the charmstore.Client interface and export the Client struct.

62ac044


      Move LatestCharmInfo() to its own file.

283ed04


      Fix dependencies.

524e9d6


      Drop an unused import.

ef06a61


      Clean up the deps.

0e362ff


      Roll back from the charmrepo changes.

bce92ba


      Add charmstore.ClientConfig and use it in charmstore.NewClient().

58787a3


      Drop usage of charmstore.WrapBaseClient().

0c7aa1d


      Drop charmstore.WrapBaseClient().

cc8af18


      Fix a test.

4cfc684


      Fix another test.

b505c31


      Fix yet another test.

983dbdb


      Patch out the client config rather than the client.


      Fix some typos.

73be8de


      Use CharmStore.WithJujuAttrs().

bcea263

ericsnowcurrently and others added some commits Mar 9, 2016


      Use a registry of cleanup handlers.

047e1c6


      Register a cleanup handler for resource blobs.

ecba8c6


      Add the CleanupHandler type and initialize the registry.

fd43ae3


      Do not check if removeResourcesOps is nil.


      Factor removeUnitResourcesOps() from removeResourcesOps().

88690ed


      Expand a doc comment.


      Merge pull request #4741 from ericsnowcurrently/resources-destroy

Add clean up resources when services are destroyed.

...and a little bit of cleanup when units are destroyed.

(Reviewed in http://reviews.vapour.ws/r/4099/.)

101d352


      Merge master into feature-resources.

Conflicts:
    cmd/juju/charmcmd/store.go
    cmd/juju/charmcmd/sub.go
    cmd/juju/service/bundle.go
    dependencies.tsv
    resource/api/client/client.go
    resource/resourceadapters/fakes.go

14d206f


      Correctly handle revisions passed in from CLI.

31baca0


      Split the filenames from the revisions.

5ef1436


      Factor CS client creation out of resourcesFromCharmstore().

ca1949a


      Pull the specified resource from the charm store.

11f9078


      Add a charmresource.Resource return to charmstore.ResourcesClient.Get…

…Resource().

d28c43b


      Add some TODOs.

3b1225a


      Fix a test.


      Merge pull request #4722 from ericsnowcurrently/resources-resource-re…

…visions-in-deploy

Support passing revisions to "juju deploy --resource".

Currently only filenames are supported.  This change is necessary to enable reproducible deployments with resources (since we don't have a unique ID for the "revision set").  "juju upgrade-charm --resource" is likewise fixed.

(Review request: http://reviews.vapour.ws/r/4160/)

ade0c17


      Corrected test to reflect new function signature.


      Added missed dependency on github.com/juju/version

a53e8c9


      Fixed failing test.

4a4937a


      Merge pull request #4744 from kat-co/feature-resources-merge-master

Merge master into feature-resources.

Conflicts:
    cmd/juju/charmcmd/store.go
    cmd/juju/charmcmd/sub.go
    cmd/juju/service/bundle.go
    dependencies.tsv
    resource/api/client/client.go
    resource/resourceadapters/fakes.go

(Review request: http://reviews.vapour.ws/r/4181/)

6c62ff3


      Store an APICmd on serviceDeployer.

33afd39


      Factor out getUpgradeResources().

6703ce6


      Handle resources in the bundle metadata.

fc0b3c9


      Add resources test.

a97d584


      Log added bundle resources.

e08c0d5


      Add resource.Sort().

fd98161


      Fix a map-ordering-related testing failure.

1d78eca


      Update deps.

a17e08d


      Clarify some comments.

e7c4144


      Do not give the output a consistent ordering.

379b09e


      resIDs -> resNames2IDs.


      Merge pull request #4758 from ericsnowcurrently/resources-bundles

Support deploying resources from a bundle.



(Review request: http://reviews.vapour.ws/r/4197/)

71dd231


      rename push-resource to attach

f160df4


      Merge pull request #4773 from natefinch/attach

rename push-resource to attach

278c0d0


      Add resource.UnitResources.DownloadProgress.

a20aa3a


      Add api.UnitResources.DownloadProgress.

f990cf1


      Add resourceDoc.DownloadProgress.

d1505dd


      Make a persistence test more correct.

c4e1f16


      Include no-resource units in resourceState.ListResources() results.

f1d9627


      Don't sort out units in the API.

0874abb


      Add unitSetter.pending.

41b5ff9


      Do not list pending unit resources.

c52a43a


      Add ResourcePersistence.SetUnitResourceProgress().

f618558


      Drop a reference to resourceadapters.DataStore.

04e6d0c


      Track download progress via unitSetter.Read().

605a48f


      Add FormattedDetailResource.Progress.

6bd6025


      Add FormattedDetailResource.progress.

b42875a


      Update the tabular output to show download progress.

2a8c1fb


      Use a clearer syntax for checking a map of bools.

d75767b


      Drop an unused import.

38e1a0c


      Merge pull request #4778 from ericsnowcurrently/resources-uniter-down…

…load-progress

Show unit download progress for resources.



(Review request: http://reviews.vapour.ws/r/4219/)

ab0877d


      Merge master into feature-resources-merge-master.

19c5594


      Add the --channel flag to "juju charm list-resources".

d363ced


      Merge pull request #4792 from ericsnowcurrently/resources-charm-list-…

…resources-channel-flag

Add the --channel flag to "juju charm list-resources".



(Review request: http://reviews.vapour.ws/r/4234/)

b5bc02a


      Merge upstream/feature-resources.

Conflicts:
    dependencies.tsv

21ec584


      Merge pull request #4794 from kat-co/feature-resources-merge-master

Merge master into feature-resources.



(Review request: http://reviews.vapour.ws/r/4236/)

0676ac3

cherylj commented Mar 21, 2016

$$JFDI$$

Contributor

jujubot commented Mar 21, 2016

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

jujubot added a commit that referenced this pull request Mar 21, 2016


      Merge pull request #4805 from cherylj/merge-feature-resources

Merge feature resources

The feature-resources branch is ready for merging.  This branch had a bless on its last CI run:  http://reports.vapour.ws/releases/3782

There are no bugs open against this branch:  https://bugs.launchpad.net/juju-core/feature-resources

(Review request: http://reviews.vapour.ws/r/4247/)

fa84738

jujubot merged commit `fa84738` into juju:master Mar 21, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can't perform that action at this time.