Skip to content

Commit

Permalink
Merge pull request #10887 from manadart/2.7
Browse files Browse the repository at this point in the history
#10887

## Description of change

- Fixes a comment typo in `add-cloud` help text.
- Removes interface and test implementation no longer used following #10886

## QA steps

No functional changes; tests pass

## Documentation changes

None.

## Bug reference

https://bugs.launchpad.net/juju/+bug/1851801
  • Loading branch information
jujubot committed Nov 8, 2019
2 parents b06dda4 + 8e9b134 commit 489b953
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 15 deletions.
2 changes: 0 additions & 2 deletions apiserver/common/addresses.go
Expand Up @@ -14,8 +14,6 @@ import (
// AddressAndCertGetter can be used to find out controller addresses
// and the CA public certificate.
type AddressAndCertGetter interface {
network.SpaceLookup

Addresses() ([]string, error)
ModelUUID() string
APIHostPortsForAgents() ([]network.SpaceHostPorts, error)
Expand Down
8 changes: 0 additions & 8 deletions apiserver/common/addresses_test.go
Expand Up @@ -122,11 +122,3 @@ func (f fakeAddresses) APIHostPortsForAgents() ([]network.SpaceHostPorts, error)
func (fakeAddresses) WatchAPIHostPortsForAgents() state.NotifyWatcher {
panic("should never be called")
}

func (fakeAddresses) SpaceIDsByName() (map[string]string, error) {
return map[string]string{}, nil
}

func (fakeAddresses) SpaceInfosByID() (map[string]network.SpaceInfo, error) {
return map[string]network.SpaceInfo{}, nil
}
2 changes: 0 additions & 2 deletions apiserver/facades/agent/caasoperator/state.go
Expand Up @@ -16,8 +16,6 @@ import (
// CAASOperatorState provides the subset of global state
// required by the CAAS operator facade.
type CAASOperatorState interface {
network.SpaceLookup

Application(string) (Application, error)
Model() (Model, error)
ModelUUID() string
Expand Down
2 changes: 0 additions & 2 deletions apiserver/facades/controller/caasoperatorprovisioner/state.go
Expand Up @@ -15,8 +15,6 @@ import (
// CAASOperatorProvisionerState provides the subset of global state
// required by the CAAS operator provisioner facade.
type CAASOperatorProvisionerState interface {
network.SpaceLookup

ControllerConfig() (controller.Config, error)
StateServingInfo() (state.StateServingInfo, error)
WatchApplications() state.StringsWatcher
Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/cloud/add.go
Expand Up @@ -105,7 +105,7 @@ clouds: # mandatory
- joyent
- oci
When a a running controller is updated, the credential for the cloud
When a running controller is updated, the credential for the cloud
is also uploaded. As with the cloud, the credential needs
to have been added to the current client, use add-credential to
do that. If there's only one credential for the cloud it will be
Expand Down

0 comments on commit 489b953

Please sign in to comment.