func (s *UpgradeCharmResourceSuite) TestUpgradeWithResources(c *gc.C) {
myriakPath := testcharms.Repo.ClonedDir(c.MkDir(), "riak")
err := ioutil.WriteFile(path.Join(myriakPath.Path, "metadata.yaml"), riakResourceMeta, 0644)
c.Assert(err, jc.ErrorIsNil)
data := []byte("some-data")
fp, err := charmresource.GenerateFingerprint(bytes.NewReader(data))
c.Assert(err, jc.ErrorIsNil)
resourceFile := path.Join(c.MkDir(), "data.lib")
err = ioutil.WriteFile(resourceFile, data, 0644)
c.Assert(err, jc.ErrorIsNil)
_, err = testing.RunCommand(c, service.NewUpgradeCharmCommand(),
"riak", "--path="+myriakPath.Path, "--resource", "data="+resourceFile)
c.Assert(err, jc.ErrorIsNil)
resources, err := s.State.Resources()
c.Assert(err, jc.ErrorIsNil)
sr, err := resources.ListResources("riak")
c.Assert(err, jc.ErrorIsNil)
c.Check(sr.Resources, gc.HasLen, 1)
c.Check(sr.Resources[0].ServiceID, gc.Equals, "riak")
// Most of this is just a sanity check... this is all tested elsewhere.
c.Check(sr.Resources[0].PendingID, gc.Equals, "")
c.Check(sr.Resources[0].Username, gc.Not(gc.Equals), "")
c.Check(sr.Resources[0].ID, gc.Not(gc.Equals), "")
c.Check(sr.Resources[0].Timestamp.IsZero(), jc.IsFalse)
// Ensure we get the data we passed in from the metadata.yaml.
c.Check(sr.Resources[0].Resource, gc.DeepEquals, charmresource.Resource{
Meta: charmresource.Meta{
Name: "data",
Type: charmresource.TypeFile,
Path: "foo.lib",
Description: "some comment",
},
Origin: charmresource.OriginUpload,
Fingerprint: fp,
Size: int64(len(data)),
})
}
// registerCommands registers commands in the specified registry.
func registerCommands(r commandRegistry, ctx *cmd.Context) {
// Creation commands.
r.Register(newBootstrapCommand())
r.Register(service.NewAddRelationCommand())
// Destruction commands.
r.Register(service.NewRemoveRelationCommand())
r.Register(service.NewRemoveServiceCommand())
r.Register(service.NewRemoveUnitCommand())
// Reporting commands.
r.Register(status.NewStatusCommand())
r.Register(newSwitchCommand())
r.Register(newEndpointCommand())
r.Register(newAPIInfoCommand())
r.Register(status.NewStatusHistoryCommand())
// Error resolution and debugging commands.
r.Register(newRunCommand())
r.Register(newSCPCommand())
r.Register(newSSHCommand())
r.Register(newResolvedCommand())
r.Register(newDebugLogCommand())
r.Register(newDebugHooksCommand())
// Configuration commands.
r.Register(newInitCommand())
r.Register(model.NewModelGetConstraintsCommand())
r.Register(model.NewModelSetConstraintsCommand())
r.Register(newSyncToolsCommand())
r.Register(newUpgradeJujuCommand(nil))
r.Register(service.NewUpgradeCharmCommand())
// Charm publishing commands.
r.Register(newPublishCommand())
// Charm tool commands.
r.Register(newHelpToolCommand())
// Manage backups.
r.Register(backups.NewSuperCommand())
r.RegisterSuperAlias("create-backup", "backups", "create", nil)
r.RegisterSuperAlias("restore-backup", "backups", "restore", nil)
// Manage authorized ssh keys.
r.Register(newAuthorizedKeysCommand())
// Manage users and access
r.Register(user.NewAddCommand())
r.Register(user.NewChangePasswordCommand())
r.Register(user.NewCredentialsCommand())
r.Register(user.NewShowUserCommand())
r.Register(user.NewListCommand())
r.Register(user.NewEnableCommand())
r.Register(user.NewDisableCommand())
// Manage cached images
r.Register(cachedimages.NewSuperCommand())
// Manage machines
r.Register(machine.NewSuperCommand())
r.RegisterSuperAlias("add-machine", "machine", "add", nil)
r.RegisterSuperAlias("remove-machine", "machine", "remove", nil)
r.RegisterSuperAlias("destroy-machine", "machine", "remove", nil)
r.RegisterSuperAlias("terminate-machine", "machine", "remove", nil)
// Manage model
r.Register(model.NewGetCommand())
r.Register(model.NewSetCommand())
r.Register(model.NewUnsetCommand())
r.Register(model.NewRetryProvisioningCommand())
r.Register(model.NewDestroyCommand())
r.Register(model.NewShareCommand())
r.Register(model.NewUnshareCommand())
r.Register(model.NewUsersCommand())
// Manage and control actions
r.Register(action.NewSuperCommand())
r.RegisterSuperAlias("run-action", "action", "do", nil)
r.RegisterSuperAlias("list-actions", "action", "defined", nil)
r.RegisterSuperAlias("show-action-output", "action", "fetch", nil)
r.RegisterSuperAlias("show-action-status", "action", "status", nil)
// Manage state server availability
r.Register(newEnableHACommand())
// Manage and control services
r.Register(service.NewSuperCommand())
r.Register(service.NewDeployCommand())
r.Register(service.NewExposeCommand())
r.Register(service.NewUnexposeCommand())
r.RegisterSuperAlias("add-unit", "service", "add-unit", nil)
r.RegisterSuperAlias("get-config", "service", "get", nil)
r.RegisterSuperAlias("set-config", "service", "set", nil)
r.RegisterSuperAlias("get-constraints", "service", "get-constraints", nil)
r.RegisterSuperAlias("set-constraints", "service", "set-constraints", nil)
r.RegisterSuperAlias("unset", "service", "unset", nil)
// Operation protection commands
r.Register(block.NewSuperBlockCommand())
r.Register(block.NewUnblockCommand())
// Manage storage
r.Register(storage.NewSuperCommand())
r.RegisterSuperAlias("list-storage", "storage", "list", nil)
r.RegisterSuperAlias("show-storage", "storage", "show", nil)
r.RegisterSuperAlias("add-storage", "storage", "add", nil)
// Manage spaces
r.Register(space.NewSuperCommand())
r.RegisterSuperAlias("add-space", "space", "create", nil)
r.RegisterSuperAlias("list-spaces", "space", "list", nil)
// Manage subnets
r.Register(subnet.NewSuperCommand())
r.RegisterSuperAlias("add-subnet", "subnet", "add", nil)
// Manage controllers
r.Register(controller.NewCreateModelCommand())
r.Register(controller.NewDestroyCommand())
r.Register(controller.NewModelsCommand())
r.Register(controller.NewKillCommand())
r.Register(controller.NewListCommand())
r.Register(controller.NewListBlocksCommand())
r.Register(controller.NewLoginCommand())
r.Register(controller.NewRemoveBlocksCommand())
r.Register(controller.NewUseModelCommand())
// Commands registered elsewhere.
for _, newCommand := range registeredCommands {
command := newCommand()
r.Register(command)
}
for _, newCommand := range registeredEnvCommands {
command := newCommand()
r.Register(modelcmd.Wrap(command))
}
}
// registerCommands registers commands in the specified registry.
func registerCommands(r commandRegistry, ctx *cmd.Context) {
// Creation commands.
r.Register(newBootstrapCommand())
r.Register(service.NewAddRelationCommand())
// Destruction commands.
r.Register(service.NewRemoveRelationCommand())
r.Register(service.NewRemoveServiceCommand())
r.Register(service.NewRemoveUnitCommand())
// Reporting commands.
r.Register(status.NewStatusCommand())
r.Register(newSwitchCommand())
r.Register(status.NewStatusHistoryCommand())
// Error resolution and debugging commands.
r.Register(newRunCommand())
r.Register(newSCPCommand())
r.Register(newSSHCommand())
r.Register(newResolvedCommand())
r.Register(newDebugLogCommand())
r.Register(newDebugHooksCommand())
// Configuration commands.
r.Register(model.NewModelGetConstraintsCommand())
r.Register(model.NewModelSetConstraintsCommand())
r.Register(newSyncToolsCommand())
r.Register(newUpgradeJujuCommand(nil))
r.Register(service.NewUpgradeCharmCommand())
// Charm publishing commands.
r.Register(newPublishCommand())
// Charm tool commands.
r.Register(newHelpToolCommand())
r.Register(charmcmd.NewSuperCommand())
// Manage backups.
r.Register(backups.NewCreateCommand())
r.Register(backups.NewDownloadCommand())
r.Register(backups.NewShowCommand())
r.Register(backups.NewListCommand())
r.Register(backups.NewRemoveCommand())
r.Register(backups.NewRestoreCommand())
r.Register(backups.NewUploadCommand())
// Manage authorized ssh keys.
r.Register(NewAddKeysCommand())
r.Register(NewRemoveKeysCommand())
r.Register(NewImportKeysCommand())
r.Register(NewListKeysCommand())
// Manage users and access
r.Register(user.NewAddCommand())
r.Register(user.NewChangePasswordCommand())
r.Register(user.NewShowUserCommand())
r.Register(user.NewListCommand())
r.Register(user.NewEnableCommand())
r.Register(user.NewDisableCommand())
r.Register(user.NewLoginCommand())
r.Register(user.NewLogoutCommand())
// Manage cached images
r.Register(cachedimages.NewRemoveCommand())
r.Register(cachedimages.NewListCommand())
// Manage machines
r.Register(machine.NewAddCommand())
r.Register(machine.NewRemoveCommand())
r.Register(machine.NewListMachinesCommand())
r.Register(machine.NewShowMachineCommand())
// Manage model
r.Register(model.NewGetCommand())
r.Register(model.NewSetCommand())
r.Register(model.NewUnsetCommand())
r.Register(model.NewRetryProvisioningCommand())
r.Register(model.NewDestroyCommand())
r.Register(model.NewUsersCommand())
r.Register(model.NewGrantCommand())
r.Register(model.NewRevokeCommand())
r.Register(model.NewShowCommand())
if featureflag.Enabled(feature.Migration) {
r.Register(newMigrateCommand())
}
// Manage and control actions
r.Register(action.NewStatusCommand())
r.Register(action.NewRunCommand())
r.Register(action.NewShowOutputCommand())
r.Register(action.NewListCommand())
// Manage controller availability
r.Register(newEnableHACommand())
// Manage and control services
r.Register(service.NewAddUnitCommand())
r.Register(service.NewGetCommand())
r.Register(service.NewSetCommand())
r.Register(service.NewDeployCommand())
r.Register(service.NewExposeCommand())
r.Register(service.NewUnexposeCommand())
r.Register(service.NewServiceGetConstraintsCommand())
r.Register(service.NewServiceSetConstraintsCommand())
// Operation protection commands
r.Register(block.NewSuperBlockCommand())
r.Register(block.NewUnblockCommand())
// Manage storage
r.Register(storage.NewAddCommand())
r.Register(storage.NewListCommand())
r.Register(storage.NewPoolCreateCommand())
r.Register(storage.NewPoolListCommand())
r.Register(storage.NewShowCommand())
// Manage spaces
r.Register(space.NewAddCommand())
r.Register(space.NewListCommand())
if featureflag.Enabled(feature.PostNetCLIMVP) {
r.Register(space.NewRemoveCommand())
r.Register(space.NewUpdateCommand())
r.Register(space.NewRenameCommand())
}
// Manage subnets
r.Register(subnet.NewAddCommand())
r.Register(subnet.NewListCommand())
if featureflag.Enabled(feature.PostNetCLIMVP) {
r.Register(subnet.NewCreateCommand())
r.Register(subnet.NewRemoveCommand())
}
// Manage controllers
r.Register(controller.NewAddModelCommand())
r.Register(controller.NewDestroyCommand())
r.Register(controller.NewListModelsCommand())
r.Register(controller.NewKillCommand())
r.Register(controller.NewListControllersCommand())
r.Register(controller.NewListBlocksCommand())
r.Register(controller.NewRegisterCommand())
r.Register(controller.NewRemoveBlocksCommand())
r.Register(controller.NewShowControllerCommand())
// Debug Metrics
r.Register(metricsdebug.New())
r.Register(metricsdebug.NewCollectMetricsCommand())
r.Register(setmeterstatus.New())
// Manage clouds and credentials
r.Register(cloud.NewUpdateCloudsCommand())
r.Register(cloud.NewListCloudsCommand())
r.Register(cloud.NewShowCloudCommand())
r.Register(cloud.NewAddCloudCommand())
r.Register(cloud.NewListCredentialsCommand())
r.Register(cloud.NewDetectCredentialsCommand())
r.Register(cloud.NewSetDefaultRegionCommand())
r.Register(cloud.NewSetDefaultCredentialCommand())
r.Register(cloud.NewAddCredentialCommand())
r.Register(cloud.NewRemoveCredentialCommand())
// Juju GUI commands.
r.Register(gui.NewGUICommand())
r.Register(gui.NewUpgradeGUICommand())
// Commands registered elsewhere.
for _, newCommand := range registeredCommands {
command := newCommand()
r.Register(command)
}
for _, newCommand := range registeredEnvCommands {
command := newCommand()
r.Register(modelcmd.Wrap(command))
}
rcmd.RegisterAll(r)
}
func (s *UpgradeCharmStoreResourceSuite) TestDeployStarsaySuccess(c *gc.C) {
testcharms.UploadCharm(c, s.client, "trusty/starsay-1", "starsay")
// let's make a fake resource file to upload
data := []byte("some-data")
fp, err := charmresource.GenerateFingerprint(bytes.NewReader(data))
c.Assert(err, jc.ErrorIsNil)
resourceFile := path.Join(c.MkDir(), "data.xml")
err = ioutil.WriteFile(resourceFile, data, 0644)
c.Assert(err, jc.ErrorIsNil)
ctx, err := testing.RunCommand(c, service.NewDeployCommand(), "trusty/starsay", "--resource", "upload-resource="+resourceFile)
c.Assert(err, jc.ErrorIsNil)
output := testing.Stderr(ctx)
expectedOutput := `Added charm "cs:trusty/starsay-1" to the model.
Deploying charm "cs:trusty/starsay-1" with the charm series "trusty".
`
c.Assert(output, gc.Equals, expectedOutput)
s.assertCharmsUploaded(c, "cs:trusty/starsay-1")
s.assertServicesDeployed(c, map[string]serviceInfo{
"starsay": {charm: "cs:trusty/starsay-1"},
})
_, err = s.State.Unit("starsay/0")
c.Assert(err, jc.ErrorIsNil)
res, err := s.State.Resources()
c.Assert(err, jc.ErrorIsNil)
svcres, err := res.ListResources("starsay")
c.Assert(err, jc.ErrorIsNil)
sort.Sort(byname(svcres.Resources))
c.Assert(svcres.Resources, gc.HasLen, 3)
c.Check(svcres.Resources[2].Timestamp, gc.Not(gc.Equals), time.Time{})
svcres.Resources[2].Timestamp = time.Time{}
expectedResources := []resource.Resource{
{
Resource: charmresource.Resource{
Meta: charmresource.Meta{
Name: "install-resource",
Type: charmresource.TypeFile,
Path: "gotta-have-it.txt",
Description: "get things started",
},
Origin: charmresource.OriginStore,
Revision: -1,
},
ID: "starsay/install-resource",
ServiceID: "starsay",
},
{
Resource: charmresource.Resource{
Meta: charmresource.Meta{
Name: "store-resource",
Type: charmresource.TypeFile,
Path: "filename.tgz",
Description: "One line that is useful when operators need to push it.",
},
Origin: charmresource.OriginStore,
Revision: -1,
},
ID: "starsay/store-resource",
ServiceID: "starsay",
},
{
Resource: charmresource.Resource{
Meta: charmresource.Meta{
Name: "upload-resource",
Type: charmresource.TypeFile,
Path: "somename.xml",
Description: "Who uses xml anymore?",
},
Origin: charmresource.OriginUpload,
Revision: 0,
Fingerprint: fp,
Size: int64(len(data)),
},
ID: "starsay/upload-resource",
ServiceID: "starsay",
Username: "******",
// Timestamp is checked above
},
}
c.Check(svcres.Resources, jc.DeepEquals, expectedResources)
oldCharmStoreResources := make([]charmresource.Resource, len(svcres.CharmStoreResources))
copy(oldCharmStoreResources, svcres.CharmStoreResources)
sort.Sort(csbyname(oldCharmStoreResources))
testcharms.UploadCharm(c, s.client, "trusty/starsay-2", "starsay")
_, err = testing.RunCommand(c, service.NewUpgradeCharmCommand(), "starsay")
c.Assert(err, jc.ErrorIsNil)
s.assertServicesDeployed(c, map[string]serviceInfo{
"starsay": {charm: "cs:trusty/starsay-2"},
})
res, err = s.State.Resources()
c.Assert(err, jc.ErrorIsNil)
svcres, err = res.ListResources("starsay")
c.Assert(err, jc.ErrorIsNil)
sort.Sort(byname(svcres.Resources))
c.Assert(svcres.Resources, gc.HasLen, 3)
c.Check(svcres.Resources[2].Timestamp, gc.Not(gc.Equals), time.Time{})
svcres.Resources[2].Timestamp = time.Time{}
// ensure that we haven't overridden the previously uploaded resource.
c.Check(svcres.Resources, jc.DeepEquals, expectedResources)
sort.Sort(csbyname(svcres.CharmStoreResources))
c.Check(oldCharmStoreResources, gc.DeepEquals, svcres.CharmStoreResources)
}