From a74ddbeb74db71b01a41973c99cf03bad780cb24 Mon Sep 17 00:00:00 2001 From: Joseph Phillips Date: Fri, 8 Nov 2019 15:21:56 +0100 Subject: [PATCH 1/4] Fixes typo in add-cloud help text. --- cmd/juju/cloud/add.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/juju/cloud/add.go b/cmd/juju/cloud/add.go index bb842ac1db1..f0a8c35b325 100644 --- a/cmd/juju/cloud/add.go +++ b/cmd/juju/cloud/add.go @@ -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 From 87b7619a00816d0956ef0acb96a7d596212d01da Mon Sep 17 00:00:00 2001 From: Joseph Phillips Date: Fri, 8 Nov 2019 15:23:33 +0100 Subject: [PATCH 2/4] Removes now-unused network.SpaceLookup from AddressAndCertGetter. --- apiserver/common/addresses.go | 2 -- apiserver/common/addresses_test.go | 8 -------- 2 files changed, 10 deletions(-) diff --git a/apiserver/common/addresses.go b/apiserver/common/addresses.go index ee3e54413c5..a1b7fee5a17 100644 --- a/apiserver/common/addresses.go +++ b/apiserver/common/addresses.go @@ -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) diff --git a/apiserver/common/addresses_test.go b/apiserver/common/addresses_test.go index 7ad50222d16..ca6802902d1 100644 --- a/apiserver/common/addresses_test.go +++ b/apiserver/common/addresses_test.go @@ -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 -} From fd8d63fd5fae5fd2eb861dd3ab77022eea367f55 Mon Sep 17 00:00:00 2001 From: Joseph Phillips Date: Fri, 8 Nov 2019 16:02:19 +0100 Subject: [PATCH 3/4] Removes now-unused SpaceLookup from CAASOperatorProvisionerState indirection. --- apiserver/facades/controller/caasoperatorprovisioner/state.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/apiserver/facades/controller/caasoperatorprovisioner/state.go b/apiserver/facades/controller/caasoperatorprovisioner/state.go index 1589729b544..78de7faf90b 100644 --- a/apiserver/facades/controller/caasoperatorprovisioner/state.go +++ b/apiserver/facades/controller/caasoperatorprovisioner/state.go @@ -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 From 8e9b134c7a08dd9220d79f40e31fad471613f22c Mon Sep 17 00:00:00 2001 From: Joseph Phillips Date: Fri, 8 Nov 2019 16:26:06 +0100 Subject: [PATCH 4/4] Removes now-unused SpaceLookup from CAASOperatorState indirection. --- apiserver/facades/agent/caasoperator/state.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/apiserver/facades/agent/caasoperator/state.go b/apiserver/facades/agent/caasoperator/state.go index a2c0c89edaf..a9d83c5df07 100644 --- a/apiserver/facades/agent/caasoperator/state.go +++ b/apiserver/facades/agent/caasoperator/state.go @@ -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