/juju

Feature resources #4408

Merged
merged 538 commits into from Feb 12, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@sinzui @jujubot @ericsnowcurrently @natefinch @kat-co
@sinzui
Contributor

sinzui commented Feb 12, 2016

This feature branch merge into master. There are two failures seen by CI
http://reports.vapour.ws/releases/3603
and we can see these regressions came from master.

There are no outstanding bugs...there were never any bugs reported against it.

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

ericsnowcurrently added some commits Jan 19, 2016

@ericsnowcurrently
GetResource -> DownloadResource.
c88608e
@ericsnowcurrently
Use os.Create() instead of os.OpenFile().
0361da8
@ericsnowcurrently
Check file size too.
1a25aa5
@ericsnowcurrently
Add a test charm for resources.
5f34eb2
@ericsnowcurrently
Return an error from newUnitFacadeClient().
208dc42
@ericsnowcurrently
Add doc comments for HTTP helper code.
4ba8bd8
@ericsnowcurrently
Add doc comments (and copyright notices) for the "private" API code.
6b9cc8a
@ericsnowcurrently
Drop a superflous file.
302ebee
@ericsnowcurrently
Add doc comments to the hook context code.
eef2685
@ericsnowcurrently
Re-organize around top-level operations.
e34e0c7
@ericsnowcurrently
Use the latest utils.
8d59d1a
@ericsnowcurrently
Download the resource into a temp dir.
332264c
@ericsnowcurrently
Adjust to the latest utils repo.
a8499b9
@ericsnowcurrently
Add resourceDirectory and use it.
37dd56f
@ericsnowcurrently
Add contextDeps.
94fe314
@ericsnowcurrently
Add the doc for the hook command.
a85d394
@ericsnowcurrently
Move the hook commands to their own package.
7f71786
@ericsnowcurrently
Add a logger.
1fc74a2
@ericsnowcurrently
Factor out an openedResource type.
f78c05b
@ericsnowcurrently
Add resourceDirectorySpec.CleanUp().
c4fa6a3
@ericsnowcurrently
Add newTempResourceDir().
9724054
@ericsnowcurrently
Add a downloader type.
9d9f0cc
@ericsnowcurrently
Use a downloader in Context.Download().
a8e97ef
@ericsnowcurrently
Move newTempResourceDir down.
4690b7a
@ericsnowcurrently
Drop resourceDirectory.move().
ec69889
@ericsnowcurrently
Drop resourceDirectory.openResource().
0334f9e
@ericsnowcurrently
Drop resource info caching in the resource dir.
1d0b66d
@ericsnowcurrently
Add tests for resource-get.
b4617a3
@ericsnowcurrently
Factor out an "internal" package.
10ac252
@ericsnowcurrently
Add tests for OpenedResource.
66f6456
@ericsnowcurrently
Add doc comments.
b284547
@ericsnowcurrently
Add tests for Download().
ac8fc21
@ericsnowcurrently
Add tests for Content and Checker.
19425a9
@ericsnowcurrently
Add resource dir tests.
43e5064
@ericsnowcurrently
Add util tests.
baf86a3
@ericsnowcurrently
Add internal context tests.
8c9b66f
@ericsnowcurrently
Fix some missed changes.
a621e4a
@ericsnowcurrently
Add tests for state.
ac8fd23
@ericsnowcurrently
Use Resource.IsPlaceholder().
ff834ee
@ericsnowcurrently
Add tests for hook context API client.
159aacb
@ericsnowcurrently
Add tests for hook context API server.
9a830a2
@ericsnowcurrently
Fix a doc comment.
0aa5c23
@ericsnowcurrently
Add a package doc comment.
4295251
@ericsnowcurrently
Add some doc comments.
eb1475e
@ericsnowcurrently
Expand a TODO comment.
2cd8326
@ericsnowcurrently
Drop an invalid empty line.
d13d3c3
@ericsnowcurrently
Fix a doc comment.
4aec1e3
@ericsnowcurrently
Add missing doc comments.
6432ef0
@ericsnowcurrently
Return early in the error case.
715ba41
@ericsnowcurrently
In-line a literal argument.
f539e25
@ericsnowcurrently
Move FacadeVersion near the code to which it applies.
529b77c
@ericsnowcurrently
Pass the os.Rename() args in the correct order.
56b06e7
@ericsnowcurrently
Create the resource directory before replacing it.
9bd95fe
@ericsnowcurrently
Drop some unnecessary return args.
a2fef5e
@ericsnowcurrently
Improve an error message.
cafccb1
@ericsnowcurrently
Replace a magic number with a constant.
dcf8a25
@ericsnowcurrently
Drop a TODO comment.
cccbb84
@ericsnowcurrently
Fix the context deps.
a285c4e
@ericsnowcurrently
Move UnitDoer implementation to the client package and add a test.
20c19b1
@ericsnowcurrently
Use path.Join() instead of fmt.Sprintf().
80b7472

ericsnowcurrently and others added some commits Feb 8, 2016

@ericsnowcurrently
ShowCommand -> ListCharmResourcesCommand.
9a29df1
@ericsnowcurrently
Drop the command wrapper.
21d17fb
@ericsnowcurrently
Simplify charmcmd.NewCommandBase().
1b03af6
@ericsnowcurrently
Register list-resources with the juju charm command.
eb55512
@ericsnowcurrently
Fix the origin column values.
0b81605
@ericsnowcurrently
Drop the FROM column.
c7cc20d
@ericsnowcurrently
Add missing Formatted fields.
b8dc35f
@ericsnowcurrently
Fix tests.
b2527f9
@ericsnowcurrently
Drop the "COMMENT" column in juju charm list-resources.
5ef681d
@ericsnowcurrently
Add a bit more commentary about sub-command registration.
128bb5c
@ericsnowcurrently
Add a bit more explanation on where code was copied from.
547a6b7
@ericsnowcurrently
Update a TODO comment.
17fbc96
@ericsnowcurrently
Make it more clear when your local host is used for the series.
a48a9ad
@ericsnowcurrently
Don't use a variadic arg.
8635542
@jujubot
Merge pull request #4334 from ericsnowcurrently/resources-charm-command 
Rename "juju resources" to "juju charm list-resources".

A key part of this is adding the "juju charm" command.

(Review request: http://reviews.vapour.ws/r/3778/)
fb530c0
@ericsnowcurrently
Update the demo charm.
a6114bc
@kat-co
Merge master into feature-resources.
803ff65
@ericsnowcurrently
Correctly handle the NotFound errors in SetResource().
0d6d802
@ericsnowcurrently
Do not worry about the charm series in the metadata.
3c88d3d
@ericsnowcurrently
resourceexternal -> resourceadapters.
c55ef17
@ericsnowcurrently
Correctly handle the case where resources already exist.
3dfb62d
@ericsnowcurrently
Use a separate resource for the install hook.
730ff0d
@ericsnowcurrently
Use more informative error messages.
08baa35
@ericsnowcurrently
Preserve the pending ID with a new resourceState.UpdatePendingResourc… 
…e() method.
b4cb949
@ericsnowcurrently
Downgrade a log entry.
1426fed
@jujubot
Merge pull request #4365 from ericsnowcurrently/resources-fix-demo-1605 
Fixes to get demo working.

While prepping the moonstone 1605 demo I found a few bugs.  This patch fixes them.

(Review request: http://reviews.vapour.ws/r/3808/)
f4d4f40
@natefinch
rename show-service-resources to list-resources and remove the show-c… 
…harm-resources command since it's being written in a different commit and conflicts with the alias for list-resources
b32d3a2
@natefinch
formatting changes for list-resourcesincluding timestamp format chang… 
…e and

change origin charm to charmstore, and remove used column.
Also slightly changed code for the RevisionString and wrote some tests for it (oops).
2221b5f
@natefinch
support units in list-resources
34466ff
@natefinch
fix revisionstring so it only uses - for upload placeholder resources
7087d21
@natefinch
fix missing field
92c588f
@jujubot
Merge pull request #4333 from natefinch/rename-list-service-resources 
rename show-service-resources to list-resources

and remove the show-charm-resources command since it's being written in a different commit and conflicts with the alias for list-resources

(Review request: http://reviews.vapour.ws/r/3777/)
7024e57
@natefinch
change description to comment and remove comment from the tabular out… 
…put.
6401da0
@natefinch
remove some demo code that happened to not compile anymore
243d88d
@jujubot
Merge pull request #4370 from natefinch/rename-comment-description 
change description to comment and remove comment from tabular output

note that this updates the dependencies, so you'll need to rerun godeps when this lands

(Review request: http://reviews.vapour.ws/r/3813/)
a3e8245
@kat-co
Merge latest changes from feature-resources.
51f277b
@kat-co
Merge latest changes from feature-resources.
eaf91d5
@kat-co
Merge remote-tracking branch 'upstream/master' into feature-resources… 
…-merge-master
27f2ddb
@jujubot
Merge pull request #4356 from kat-co/feature-resources-merge-master 
Merge master into feature-resources.



(Review request: http://reviews.vapour.ws/r/3801/)
624e672
@kat-co
Merge master into feature-resources. 
Conflicts:
    api/service/client.go
    api/service/client_test.go
    apiserver/params/params.go
    apiserver/service/service.go
    cmd/juju/service/deploy.go
    dependencies.tsv
    juju/deploy.go
    juju/deploy_test.go
    state/state.go
4c59ccd
@jujubot
Merge pull request #4394 from kat-co/feature-resources-merge-master 
Merge master into feature-resources.



(Review request: http://reviews.vapour.ws/r/3836/)
e440bb3
@kat-co
Merge remote-tracking branch 'upstream/master' into feature-resources… 
…-merge-master
431e5d8
@jujubot
Merge pull request #4406 from kat-co/feature-resources-merge-master 
Merge master into feature-resources.



(Review request: http://reviews.vapour.ws/r/3847/)
dad26b1
@natefinch
rename show-service-resources to list-resources and remove the show-c… 
…harm-resources command since it's being written in a different commit and conflicts with the alias for list-resources
f7f61bd
@natefinch
add details flag
bb26864
@natefinch
handle unit resources that haven't been retrieved with resource-get
2583cb9
@natefinch
rename debug to details in-code, and start writing tests
824a30e
@natefinch
fixes after rebase
861a8f3
@jujubot @natefinch
Merge pull request #4334 from ericsnowcurrently/resources-charm-command 
Rename "juju resources" to "juju charm list-resources".

A key part of this is adding the "juju charm" command.

(Review request: http://reviews.vapour.ws/r/3778/)
5512950
@natefinch
fix merge problem
9884bba
@natefinch
update tests so they pass and add table headers to match spec
2b86c52
@natefinch
make single unit details have header [Unit]
a820ca2
@natefinch
put back test that shouldn't have been deleted
b269bfe
@natefinch
unexport details flag var
0267497
@natefinch
couple sanity check tests for formatting. Also tweaked the output for… 
… juju resources <unit> --details, since it was useless printing out the unit number.
922cf5e
@jujubot
Merge pull request #4374 from natefinch/list-resources-debug 
Implement juju resources --details flag

This adds a --details flag that does a diff of the expected resources on each unit, and the actual resources.

(Review request: http://reviews.vapour.ws/r/3818/)
f0e1848
@sinzui
Contributor

sinzui commented Feb 12, 2016

$$merge$$ JFDI
@jujubot
Contributor

jujubot commented Feb 12, 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 Feb 12, 2016

@jujubot
Merge pull request #4408 from juju/feature-resources 
Feature resources

This feature branch merge into master. There are two failures seen by CI
    http://reports.vapour.ws/releases/3603
and we can see these regressions came from master.

There are no outstanding bugs...there were never any bugs reported against it.

(Review request: http://reviews.vapour.ws/r/3849/)
3f98d44

@jujubot jujubot merged commit 3f98d44 into master Feb 12, 2016

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