juju-core

Merge lp:~niemeyer/juju-core/digest-on-charm-info into lp:~juju/juju-core/trunk

  1. digest-on-charm-info
  2. Merge into trunk
Proposed by Gustavo Niemeyer
Status: Merged
Merged at revision: 482
Proposed branch: lp:~niemeyer/juju-core/digest-on-charm-info
Merge into: lp:~juju/juju-core/trunk
Diff against target: 50 lines (+7/-4)
3 files modified
charm/repo.go (+1/-0)
store/server.go (+1/-0)
store/server_test.go (+5/-4)
To merge this branch: bzr merge lp:~niemeyer/juju-core/digest-on-charm-info
Reviewer Review Type Date Requested Status
The Go Language Gophers Pending
Review via email: mp+122950@code.launchpad.net

Description of the change

store: publish branch digest on charm-info as well

https://codereview.appspot.com/6500083/

To post a comment you must log in.
Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

Reviewers: mp+122950_code.launchpad.net,

Message:
Please take a look.

Description:
store: publish branch digest on charm-info as well

https://code.launchpad.net/~niemeyer/juju-core/digest-on-charm-info/+merge/122950

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6500083/

Affected files:
   A [revision details]
   M charm/repo.go
   M store/server.go
   M store/server_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: charm/repo.go
=== modified file 'charm/repo.go'
--- charm/repo.go 2012-06-21 20:40:39 +0000
+++ charm/repo.go 2012-09-05 21:08:26 +0000
@@ -19,6 +19,7 @@
  type InfoResponse struct {
   Revision int `json:"revision"` // Zero is valid. Can't omitempty.
   Sha256 string `json:"sha256,omitempty"`
+ Digest string `json:"digest,omitempty"`
   Errors []string `json:"errors,omitempty"`
   Warnings []string `json:"warnings,omitempty"`
  }

Index: store/server.go
=== modified file 'store/server.go'
--- store/server.go 2012-07-25 08:59:06 +0000
+++ store/server.go 2012-09-05 21:08:26 +0000
@@ -85,6 +85,7 @@
     skey = charmStatsKey(curl, "charm-info")
     c.Sha256 = info.BundleSha256()
     c.Revision = info.Revision()
+ c.Digest = info.Digest()
    } else {
     if err == ErrNotFound {
      skey = charmStatsKey(curl, "charm-missing")

Index: store/server_test.go
=== modified file 'store/server_test.go'
--- store/server_test.go 2012-06-21 20:40:39 +0000
+++ store/server_test.go 2012-09-05 21:08:26 +0000
@@ -30,10 +30,10 @@
   req, err := http.NewRequest("GET", "/charm-info", nil)
   c.Assert(err, IsNil)

- var tests = []struct{ url, sha, err string }{
- {curl.String(), fakeRevZeroSha, ""},
- {"cs:oneiric/non-existent", "", "entry not found"},
- {"cs:bad", "", `charm URL without series: "cs:bad"`},
+ var tests = []struct{ url, sha, digest, err string }{
+ {curl.String(), fakeRevZeroSha, "some-digest", ""},
+ {"cs:oneiric/non-existent", "", "", "entry not found"},
+ {"cs:bad", "", "", `charm URL without series: "cs:bad"`},
   }

   for _, t := range tests {
@@ -46,6 +46,7 @@
     expected[t.url] = map[string]interface{}{
      "revision": float64(0),
      "sha256": t.sha,
+ "digest": t.digest,
     }
    } else {
     expected[t.url] = map[string]interface{}{

Revision history for this message
William Reade (fwereade) wrote :

LGTM

https://codereview.appspot.com/6500083/

Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

*** Submitted:

store: publish branch digest on charm-info as well

R=fwereade
CC=
https://codereview.appspot.com/6500083

https://codereview.appspot.com/6500083/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charm/repo.go'
--- charm/repo.go 2012-06-21 20:40:39 +0000
+++ charm/repo.go 2012-09-05 21:10:49 +0000
@@ -19,6 +19,7 @@
19type InfoResponse struct {19type InfoResponse struct {
20 Revision int `json:"revision"` // Zero is valid. Can't omitempty.20 Revision int `json:"revision"` // Zero is valid. Can't omitempty.
21 Sha256 string `json:"sha256,omitempty"`21 Sha256 string `json:"sha256,omitempty"`
22 Digest string `json:"digest,omitempty"`
22 Errors []string `json:"errors,omitempty"`23 Errors []string `json:"errors,omitempty"`
23 Warnings []string `json:"warnings,omitempty"`24 Warnings []string `json:"warnings,omitempty"`
24}25}
2526
=== modified file 'store/server.go'
--- store/server.go 2012-07-25 08:59:06 +0000
+++ store/server.go 2012-09-05 21:10:49 +0000
@@ -85,6 +85,7 @@
85 skey = charmStatsKey(curl, "charm-info")85 skey = charmStatsKey(curl, "charm-info")
86 c.Sha256 = info.BundleSha256()86 c.Sha256 = info.BundleSha256()
87 c.Revision = info.Revision()87 c.Revision = info.Revision()
88 c.Digest = info.Digest()
88 } else {89 } else {
89 if err == ErrNotFound {90 if err == ErrNotFound {
90 skey = charmStatsKey(curl, "charm-missing")91 skey = charmStatsKey(curl, "charm-missing")
9192
=== modified file 'store/server_test.go'
--- store/server_test.go 2012-06-21 20:40:39 +0000
+++ store/server_test.go 2012-09-05 21:10:49 +0000
@@ -30,10 +30,10 @@
30 req, err := http.NewRequest("GET", "/charm-info", nil)30 req, err := http.NewRequest("GET", "/charm-info", nil)
31 c.Assert(err, IsNil)31 c.Assert(err, IsNil)
3232
33 var tests = []struct{ url, sha, err string }{33 var tests = []struct{ url, sha, digest, err string }{
34 {curl.String(), fakeRevZeroSha, ""},34 {curl.String(), fakeRevZeroSha, "some-digest", ""},
35 {"cs:oneiric/non-existent", "", "entry not found"},35 {"cs:oneiric/non-existent", "", "", "entry not found"},
36 {"cs:bad", "", `charm URL without series: "cs:bad"`},36 {"cs:bad", "", "", `charm URL without series: "cs:bad"`},
37 }37 }
3838
39 for _, t := range tests {39 for _, t := range tests {
@@ -46,6 +46,7 @@
46 expected[t.url] = map[string]interface{}{46 expected[t.url] = map[string]interface{}{
47 "revision": float64(0),47 "revision": float64(0),
48 "sha256": t.sha,48 "sha256": t.sha,
49 "digest": t.digest,
49 }50 }
50 } else {51 } else {
51 expected[t.url] = map[string]interface{}{52 expected[t.url] = map[string]interface{}{

Subscribers

People subscribed via source and target branches