Skip to content

Commit de98a6f

Browse files
anastasiamacanastasiamac
committed
Use juju public key for image metadata from streams.canonical.
1 parent 24ceb17 commit de98a6f

29 files changed

+67
-62
lines changed

‎cmd/juju/cloud/updateclouds.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"golang.org/x/crypto/openpgp/clearsign"
2121

2222
jujucloud "github.com/juju/juju/cloud"
23-
"github.com/juju/juju/juju"
23+
"github.com/juju/juju/juju/keys"
2424
)
2525

2626
type updateCloudsCommand struct {
@@ -45,7 +45,7 @@ See also: clouds
4545
// NewUpdateCloudsCommand returns a command to update cloud information.
4646
func NewUpdateCloudsCommand() cmd.Command {
4747
return &updateCloudsCommand{
48-
publicSigningKey: juju.JujuPublicKey,
48+
publicSigningKey: keys.JujuPublicKey,
4949
publicCloudURL: "https://streams.canonical.com/juju/public-clouds.syaml",
5050
}
5151
}

‎cmd/juju/commands/bootstrap_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
envtools "github.com/juju/juju/environs/tools"
3939
toolstesting "github.com/juju/juju/environs/tools/testing"
4040
"github.com/juju/juju/instance"
41-
"github.com/juju/juju/juju"
41+
"github.com/juju/juju/juju/keys"
4242
"github.com/juju/juju/juju/osenv"
4343
"github.com/juju/juju/jujuclient"
4444
"github.com/juju/juju/jujuclient/jujuclienttesting"
@@ -72,7 +72,7 @@ func init() {
7272
func (s *BootstrapSuite) SetUpSuite(c *gc.C) {
7373
s.FakeJujuXDGDataHomeSuite.SetUpSuite(c)
7474
s.MgoSuite.SetUpSuite(c)
75-
s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
75+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
7676
}
7777

7878
func (s *BootstrapSuite) SetUpTest(c *gc.C) {

‎cmd/jujud/bootstrap_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import (
4848
envtesting "github.com/juju/juju/environs/testing"
4949
envtools "github.com/juju/juju/environs/tools"
5050
"github.com/juju/juju/instance"
51-
"github.com/juju/juju/juju"
51+
"github.com/juju/juju/juju/keys"
5252
jujutesting "github.com/juju/juju/juju/testing"
5353
"github.com/juju/juju/mongo"
5454
"github.com/juju/juju/mongo/mongotest"
@@ -815,7 +815,7 @@ func (s *BootstrapSuite) makeTestModel(c *gc.C) {
815815
env, err := provider.PrepareForBootstrap(nullContext(), cfg)
816816
c.Assert(err, jc.ErrorIsNil)
817817

818-
s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
818+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
819819
envtesting.MustUploadFakeTools(s.toolsStorage, cfg.AgentStream(), cfg.AgentStream())
820820
inst, _, _, err := jujutesting.StartInstance(env, testing.FakeControllerConfig().ControllerUUID(), "0")
821821
c.Assert(err, jc.ErrorIsNil)

‎cmd/plugins/juju-metadata/toolsmetadata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/juju/juju/environs/simplestreams"
1717
"github.com/juju/juju/environs/storage"
1818
envtools "github.com/juju/juju/environs/tools"
19-
"github.com/juju/juju/juju"
19+
"github.com/juju/juju/juju/keys"
2020
"github.com/juju/juju/juju/osenv"
2121
coretools "github.com/juju/juju/tools"
2222
)
@@ -147,7 +147,7 @@ func toolsDataSources(urls ...string) []simplestreams.DataSource {
147147
dataSources[i] = simplestreams.NewURLSignedDataSource(
148148
"local source",
149149
url,
150-
juju.JujuPublicKey,
150+
keys.JujuPublicKey,
151151
utils.VerifySSLHostnames,
152152
simplestreams.CUSTOM_CLOUD_DATA,
153153
false)

‎cmd/plugins/juju-metadata/toolsmetadata_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/juju/juju/environs/config"
2424
"github.com/juju/juju/environs/tools"
2525
toolstesting "github.com/juju/juju/environs/tools/testing"
26-
"github.com/juju/juju/juju"
26+
"github.com/juju/juju/juju/keys"
2727
"github.com/juju/juju/juju/osenv"
2828
"github.com/juju/juju/jujuclient/jujuclienttesting"
2929
"github.com/juju/juju/provider/dummy"
@@ -375,5 +375,5 @@ func (s *ToolsMetadataSuite) TestToolsDataSourceHasKey(c *gc.C) {
375375
// we want to be able to try to read this signed data
376376
// with public key with Juju-known public key for tools.
377377
// Bugs #1542127, #1542131
378-
c.Assert(ds[0].PublicSigningKey(), gc.DeepEquals, juju.JujuPublicKey)
378+
c.Assert(ds[0].PublicSigningKey(), gc.DeepEquals, keys.JujuPublicKey)
379379
}

‎environs/bootstrap/bootstrap_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"github.com/juju/juju/environs/sync"
3838
envtesting "github.com/juju/juju/environs/testing"
3939
envtools "github.com/juju/juju/environs/tools"
40-
"github.com/juju/juju/juju"
40+
"github.com/juju/juju/juju/keys"
4141
"github.com/juju/juju/provider/dummy"
4242
coretesting "github.com/juju/juju/testing"
4343
"github.com/juju/juju/tools"
@@ -60,7 +60,7 @@ func (s *bootstrapSuite) SetUpTest(c *gc.C) {
6060
s.BaseSuite.SetUpTest(c)
6161
s.ToolsFixture.SetUpTest(c)
6262

63-
s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
63+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
6464
storageDir := c.MkDir()
6565
s.PatchValue(&envtools.DefaultBaseURL, storageDir)
6666
stor, err := filestorage.NewFileStorageWriter(storageDir)

‎environs/gui/simplestreams.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/juju/version"
1313

1414
"github.com/juju/juju/environs/simplestreams"
15-
"github.com/juju/juju/juju"
15+
"github.com/juju/juju/juju/keys"
1616
jujuversion "github.com/juju/juju/version"
1717
)
1818

@@ -41,7 +41,7 @@ func NewDataSource(baseURL string) simplestreams.DataSource {
4141
return simplestreams.NewURLSignedDataSource(
4242
sourceDescription,
4343
baseURL,
44-
juju.JujuPublicKey,
44+
keys.JujuPublicKey,
4545
utils.VerifySSLHostnames,
4646
simplestreams.DEFAULT_CLOUD_DATA,
4747
requireSigned)

‎environs/gui/simplestreams_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/juju/juju/environs/gui"
1515
"github.com/juju/juju/environs/simplestreams"
1616
sstesting "github.com/juju/juju/environs/simplestreams/testing"
17-
"github.com/juju/juju/juju"
17+
"github.com/juju/juju/juju/keys"
1818
coretesting "github.com/juju/juju/testing"
1919
jujuversion "github.com/juju/juju/version"
2020
)
@@ -53,7 +53,7 @@ func (s *simplestreamsSuite) TestNewDataSource(c *gc.C) {
5353
c.Assert(url, gc.Equals, "https://1.2.3.4/streams//my/path")
5454

5555
c.Assert(source.RequireSigned(), jc.IsTrue)
56-
c.Assert(source.PublicSigningKey(), gc.Equals, juju.JujuPublicKey)
56+
c.Assert(source.PublicSigningKey(), gc.Equals, keys.JujuPublicKey)
5757
}
5858

5959
var fetchMetadataTests = []struct {

‎environs/imagemetadata/simplestreams.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/juju/utils"
1414

1515
"github.com/juju/juju/environs/simplestreams"
16+
"github.com/juju/juju/juju/keys"
1617
"github.com/juju/utils/arch"
1718
"github.com/juju/utils/series"
1819
)
@@ -99,7 +100,7 @@ const (
99100
// public consumption.
100101
UbuntuCloudImagesURL = "http://cloud-images.ubuntu.com"
101102

102-
// The ;ocation of juju specific image metadata including non-Ubuntu images
103+
// The location of juju specific image metadata including non-Ubuntu images
103104
// in public clouds.
104105
JujuStreamsImagesURL = "https://streams.canonical.com/juju/images"
105106

@@ -109,7 +110,6 @@ const (
109110

110111
// This needs to be a var so we can override it for testing and in bootstrap.
111112
var (
112-
//
113113
DefaultUbuntuBaseURL = UbuntuCloudImagesURL
114114
DefaultJujuBaseURL = JujuStreamsImagesURL
115115
)
@@ -130,7 +130,7 @@ func OfficialDataSources(stream string) ([]simplestreams.DataSource, error) {
130130
return nil, err
131131
}
132132
if publicKey == "" {
133-
publicKey = SimplestreamsImagesPublicKey
133+
publicKey = keys.JujuPublicKey
134134
}
135135
result = append(
136136
result,

‎environs/imagemetadata/simplestreams_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/juju/juju/environs/imagemetadata"
2020
"github.com/juju/juju/environs/simplestreams"
2121
sstesting "github.com/juju/juju/environs/simplestreams/testing"
22+
"github.com/juju/juju/juju/keys"
2223
)
2324

2425
var live = flag.Bool("live", false, "Include live simplestreams tests")
@@ -110,6 +111,7 @@ func (s *simplestreamsSuite) TearDownSuite(c *gc.C) {
110111
}
111112

112113
func (s *simplestreamsSuite) TestOfficialSources(c *gc.C) {
114+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
113115
origKey := imagemetadata.SetSigningPublicKey(sstesting.SignedMetadataPublicKey)
114116
defer func() {
115117
imagemetadata.SetSigningPublicKey(origKey)

‎environs/imagemetadata_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/juju/juju/environs/simplestreams"
1515
sstesting "github.com/juju/juju/environs/simplestreams/testing"
1616
envtesting "github.com/juju/juju/environs/testing"
17+
"github.com/juju/juju/juju/keys"
1718
"github.com/juju/juju/jujuclient/jujuclienttesting"
1819
"github.com/juju/juju/provider/dummy"
1920
"github.com/juju/juju/testing"
@@ -62,7 +63,7 @@ func (s *ImageMetadataSuite) TestImageMetadataURLsNoConfigURL(c *gc.C) {
6263
sources, err := environs.ImageMetadataSources(env)
6364
c.Assert(err, jc.ErrorIsNil)
6465
sstesting.AssertExpectedSources(c, sources, []sstesting.SourceDetails{
65-
{"https://streams.canonical.com/juju/images/releases/", imagemetadata.SimplestreamsImagesPublicKey},
66+
{"https://streams.canonical.com/juju/images/releases/", keys.JujuPublicKey},
6667
{"http://cloud-images.ubuntu.com/releases/", imagemetadata.SimplestreamsImagesPublicKey},
6768
})
6869
}
@@ -73,7 +74,7 @@ func (s *ImageMetadataSuite) TestImageMetadataURLs(c *gc.C) {
7374
c.Assert(err, jc.ErrorIsNil)
7475
sstesting.AssertExpectedSources(c, sources, []sstesting.SourceDetails{
7576
{"config-image-metadata-url/", ""},
76-
{"https://streams.canonical.com/juju/images/releases/", imagemetadata.SimplestreamsImagesPublicKey},
77+
{"https://streams.canonical.com/juju/images/releases/", keys.JujuPublicKey},
7778
{"http://cloud-images.ubuntu.com/releases/", imagemetadata.SimplestreamsImagesPublicKey},
7879
})
7980
}
@@ -103,7 +104,7 @@ func (s *ImageMetadataSuite) TestImageMetadataURLsRegisteredFuncs(c *gc.C) {
103104
{"config-image-metadata-url/", ""},
104105
{"foobar/", ""},
105106
{"betwixt/releases/", ""},
106-
{"https://streams.canonical.com/juju/images/releases/", imagemetadata.SimplestreamsImagesPublicKey},
107+
{"https://streams.canonical.com/juju/images/releases/", keys.JujuPublicKey},
107108
{"http://cloud-images.ubuntu.com/releases/", imagemetadata.SimplestreamsImagesPublicKey},
108109
})
109110
}
@@ -124,7 +125,7 @@ func (s *ImageMetadataSuite) TestImageMetadataURLsNonReleaseStream(c *gc.C) {
124125
sources, err := environs.ImageMetadataSources(env)
125126
c.Assert(err, jc.ErrorIsNil)
126127
sstesting.AssertExpectedSources(c, sources, []sstesting.SourceDetails{
127-
{"https://streams.canonical.com/juju/images/daily/", imagemetadata.SimplestreamsImagesPublicKey},
128+
{"https://streams.canonical.com/juju/images/daily/", keys.JujuPublicKey},
128129
{"http://cloud-images.ubuntu.com/daily/", imagemetadata.SimplestreamsImagesPublicKey},
129130
})
130131
}

‎environs/jujutest/livetests.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
envtoolstesting "github.com/juju/juju/environs/tools/testing"
3535
"github.com/juju/juju/instance"
3636
"github.com/juju/juju/juju"
37+
"github.com/juju/juju/juju/keys"
3738
jujutesting "github.com/juju/juju/juju/testing"
3839
"github.com/juju/juju/jujuclient"
3940
"github.com/juju/juju/jujuclient/jujuclienttesting"
@@ -102,7 +103,7 @@ func (t *LiveTests) SetUpSuite(c *gc.C) {
102103
t.CleanupSuite.SetUpSuite(c)
103104
t.TestDataSuite.SetUpSuite(c)
104105
t.ControllerStore = jujuclienttesting.NewMemStore()
105-
t.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
106+
t.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
106107
}
107108

108109
func (t *LiveTests) SetUpTest(c *gc.C) {

‎environs/open_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
sstesting "github.com/juju/juju/environs/simplestreams/testing"
1919
envtesting "github.com/juju/juju/environs/testing"
2020
envtools "github.com/juju/juju/environs/tools"
21-
"github.com/juju/juju/juju"
21+
"github.com/juju/juju/juju/keys"
2222
"github.com/juju/juju/jujuclient"
2323
"github.com/juju/juju/jujuclient/jujuclienttesting"
2424
"github.com/juju/juju/provider/dummy"
@@ -36,7 +36,7 @@ var _ = gc.Suite(&OpenSuite{})
3636
func (s *OpenSuite) SetUpTest(c *gc.C) {
3737
s.FakeJujuXDGDataHomeSuite.SetUpTest(c)
3838
s.ToolsFixture.SetUpTest(c)
39-
s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
39+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
4040
}
4141

4242
func (s *OpenSuite) TearDownTest(c *gc.C) {

‎environs/simplestreams/fetchdata_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/juju/juju/environs/simplestreams"
1515
"github.com/juju/juju/environs/simplestreams/testing"
16-
"github.com/juju/juju/juju"
16+
"github.com/juju/juju/juju/keys"
1717
)
1818

1919
type fetchDataSuite struct {
@@ -44,7 +44,7 @@ func (s *fetchDataSuite) TestFetchSignedDataWithRequireSignedDataSourceWithWrong
4444
s.expectedCalls = []string{"Fetch", "PublicSigningKey", "Description"}
4545
s.readerData = signedData
4646
s.expectedData = unsignedData[1:]
47-
s.setupDataSource(juju.JujuPublicKey)
47+
s.setupDataSource(keys.JujuPublicKey)
4848
s.assertFetchDataFail(c, `cannot read data for source "" at URL this.path.doesnt.matter.for.test.either: openpgp: signature made by unknown entity`)
4949
}
5050

‎environs/sync/sync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/juju/juju/environs/simplestreams"
2222
"github.com/juju/juju/environs/storage"
2323
envtools "github.com/juju/juju/environs/tools"
24-
"github.com/juju/juju/juju"
24+
"github.com/juju/juju/juju/keys"
2525
coretools "github.com/juju/juju/tools"
2626
jujuversion "github.com/juju/juju/version"
2727
)
@@ -161,7 +161,7 @@ func selectSourceDatasource(syncContext *SyncContext) (simplestreams.DataSource,
161161
return nil, err
162162
}
163163
logger.Infof("using sync tools source: %v", sourceURL)
164-
return simplestreams.NewURLSignedDataSource("sync tools source", sourceURL, juju.JujuPublicKey, utils.VerifySSLHostnames, simplestreams.CUSTOM_CLOUD_DATA, false), nil
164+
return simplestreams.NewURLSignedDataSource("sync tools source", sourceURL, keys.JujuPublicKey, utils.VerifySSLHostnames, simplestreams.CUSTOM_CLOUD_DATA, false), nil
165165
}
166166

167167
// copyTools copies a set of tools from the source to the target.

‎environs/tools/simplestreams_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/juju/juju/environs/storage"
3232
"github.com/juju/juju/environs/tools"
3333
toolstesting "github.com/juju/juju/environs/tools/testing"
34-
"github.com/juju/juju/juju"
34+
"github.com/juju/juju/juju/keys"
3535
coretesting "github.com/juju/juju/testing"
3636
coretools "github.com/juju/juju/tools"
3737
)
@@ -1049,7 +1049,7 @@ func (s *signedSuite) SetUpSuite(c *gc.C) {
10491049
c.Assert(err, jc.ErrorIsNil)
10501050
imageData["/signed/streams/v1/tools_metadata.sjson"] = string(signedData)
10511051
sstesting.SetRoundTripperFiles(imageData, map[string]int{"signedtest://unauth": http.StatusUnauthorized})
1052-
s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
1052+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
10531053
}
10541054

10551055
func (s *signedSuite) TearDownSuite(c *gc.C) {

‎environs/tools/tools_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
envtesting "github.com/juju/juju/environs/testing"
2121
envtools "github.com/juju/juju/environs/tools"
2222
toolstesting "github.com/juju/juju/environs/tools/testing"
23-
"github.com/juju/juju/juju"
23+
"github.com/juju/juju/juju/keys"
2424
"github.com/juju/juju/jujuclient/jujuclienttesting"
2525
"github.com/juju/juju/provider/dummy"
2626
coretesting "github.com/juju/juju/testing"
@@ -45,7 +45,7 @@ func (s *SimpleStreamsToolsSuite) SetUpSuite(c *gc.C) {
4545
s.BaseSuite.SetUpSuite(c)
4646
s.customToolsDir = c.MkDir()
4747
s.publicToolsDir = c.MkDir()
48-
s.PatchValue(&juju.JujuPublicKey, sstesting.SignedMetadataPublicKey)
48+
s.PatchValue(&keys.JujuPublicKey, sstesting.SignedMetadataPublicKey)
4949
}
5050

5151
func (s *SimpleStreamsToolsSuite) SetUpTest(c *gc.C) {

‎environs/tools/urls.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/juju/juju/environs/simplestreams"
1515
"github.com/juju/juju/environs/storage"
1616
envutils "github.com/juju/juju/environs/utils"
17-
"github.com/juju/juju/juju"
17+
"github.com/juju/juju/juju/keys"
1818
)
1919

2020
type toolsDatasourceFuncId struct {
@@ -77,7 +77,7 @@ func GetMetadataSources(env environs.Environ) ([]simplestreams.DataSource, error
7777
if !config.SSLHostnameVerification() {
7878
verify = utils.NoVerifySSLHostnames
7979
}
80-
sources = append(sources, simplestreams.NewURLSignedDataSource(conf.AgentMetadataURLKey, userURL, juju.JujuPublicKey, verify, simplestreams.SPECIFIC_CLOUD_DATA, false))
80+
sources = append(sources, simplestreams.NewURLSignedDataSource(conf.AgentMetadataURLKey, userURL, keys.JujuPublicKey, verify, simplestreams.SPECIFIC_CLOUD_DATA, false))
8181
}
8282

8383
envDataSources, err := environmentDataSources(env)
@@ -93,7 +93,7 @@ func GetMetadataSources(env environs.Environ) ([]simplestreams.DataSource, error
9393
}
9494
if defaultURL != "" {
9595
sources = append(sources,
96-
simplestreams.NewURLSignedDataSource("default simplestreams", defaultURL, juju.JujuPublicKey, utils.VerifySSLHostnames, simplestreams.DEFAULT_CLOUD_DATA, true))
96+
simplestreams.NewURLSignedDataSource("default simplestreams", defaultURL, keys.JujuPublicKey, utils.VerifySSLHostnames, simplestreams.DEFAULT_CLOUD_DATA, true))
9797
}
9898
return sources, nil
9999
}

0 commit comments

Comments
 (0)