Remove params.StateServingInfo and state.StateServingInfo

Author: wallyworld

agent/agent.go

@@ -23,7 +23,7 @@ import (
 	"gopkg.in/juju/names.v3"
 
 	"github.com/juju/juju/api"
-	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/machinelock"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/network"
@@ -241,7 +241,7 @@ type Config interface {
 	// StateServingInfo returns the details needed to run
 	// a controller and reports whether those details
 	// are available
-	StateServingInfo() (params.StateServingInfo, bool)
+	StateServingInfo() (controller.StateServingInfo, bool)
 
 	// APIInfo returns details for connecting to the API server and
 	// reports whether the details are available.
@@ -317,7 +317,7 @@ type configSetterOnly interface {
 
 	// SetStateServingInfo sets the information needed
 	// to run a controller
-	SetStateServingInfo(info params.StateServingInfo)
+	SetStateServingInfo(info controller.StateServingInfo)
 
 	// SetControllerAPIPort sets the controller API port in the config.
 	SetControllerAPIPort(port int)
@@ -399,7 +399,7 @@ type configInternal struct {
 	apiDetails         *apiDetails
 	statePassword      string
 	oldPassword        string
-	servingInfo        *params.StateServingInfo
+	servingInfo        *controller.StateServingInfo
 	loggingConfig      string
 	values             map[string]string
 	mongoVersion       string
@@ -497,7 +497,7 @@ func NewAgentConfig(configParams AgentConfigParams) (ConfigSetterWriter, error)
 
 // NewStateMachineConfig returns a configuration suitable for
 // a machine running the controller.
-func NewStateMachineConfig(configParams AgentConfigParams, serverInfo params.StateServingInfo) (ConfigSetterWriter, error) {
+func NewStateMachineConfig(configParams AgentConfigParams, serverInfo controller.StateServingInfo) (ConfigSetterWriter, error) {
 	if serverInfo.Cert == "" {
 		return nil, errors.Trace(requiredError("controller cert"))
 	}
@@ -692,14 +692,14 @@ func (c *configInternal) Value(key string) string {
 	return c.values[key]
 }
 
-func (c *configInternal) StateServingInfo() (params.StateServingInfo, bool) {
+func (c *configInternal) StateServingInfo() (controller.StateServingInfo, bool) {
 	if c.servingInfo == nil {
-		return params.StateServingInfo{}, false
+		return controller.StateServingInfo{}, false
 	}
 	return *c.servingInfo, true
 }
 
-func (c *configInternal) SetStateServingInfo(info params.StateServingInfo) {
+func (c *configInternal) SetStateServingInfo(info controller.StateServingInfo) {
 	c.servingInfo = &info
 	if c.statePassword == "" && c.apiDetails != nil {
 		c.statePassword = c.apiDetails.password

agent/agent_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/api"
-	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/mongo"
 	"github.com/juju/juju/testing"
@@ -279,8 +279,8 @@ func (*suite) TestNewAgentConfig(c *gc.C) {
 	}
 }
 
-func stateServingInfo() params.StateServingInfo {
-	return params.StateServingInfo{
+func stateServingInfo() controller.StateServingInfo {
+	return controller.StateServingInfo{
 		Cert:              "cert",
 		PrivateKey:        "key",
 		CAPrivateKey:      "ca key",
@@ -296,7 +296,7 @@ func (*suite) TestNewStateMachineConfig(c *gc.C) {
 	type testStruct struct {
 		about         string
 		params        agent.AgentConfigParams
-		servingInfo   params.StateServingInfo
+		servingInfo   controller.StateServingInfo
 		checkErr      string
 		inspectConfig func(*gc.C, agent.Config)
 	}
@@ -305,28 +305,28 @@ func (*suite) TestNewStateMachineConfig(c *gc.C) {
 		checkErr: "controller cert not found in configuration",
 	}, {
 		about: "missing controller key",
-		servingInfo: params.StateServingInfo{
+		servingInfo: controller.StateServingInfo{
 			Cert: "server cert",
 		},
 		checkErr: "controller key not found in configuration",
 	}, {
 		about: "missing ca cert key",
-		servingInfo: params.StateServingInfo{
+		servingInfo: controller.StateServingInfo{
 			Cert:       "server cert",
 			PrivateKey: "server key",
 		},
 		checkErr: "ca cert key not found in configuration",
 	}, {
 		about: "missing state port",
-		servingInfo: params.StateServingInfo{
+		servingInfo: controller.StateServingInfo{
 			Cert:         "server cert",
 			PrivateKey:   "server key",
 			CAPrivateKey: "ca key",
 		},
 		checkErr: "state port not found in configuration",
 	}, {
 		about: "params api port",
-		servingInfo: params.StateServingInfo{
+		servingInfo: controller.StateServingInfo{
 			Cert:         "server cert",
 			PrivateKey:   "server key",
 			CAPrivateKey: "ca key",
@@ -391,7 +391,7 @@ func (*suite) TestStateServingInfo(c *gc.C) {
 	gotInfo, ok := conf.StateServingInfo()
 	c.Assert(ok, jc.IsTrue)
 	c.Assert(gotInfo, jc.DeepEquals, servingInfo)
-	newInfo := params.StateServingInfo{
+	newInfo := controller.StateServingInfo{
 		APIPort:           147,
 		ControllerAPIPort: 148,
 		StatePort:         169,

agent/agentbootstrap/bootstrap.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/juju/juju/agent"
 	apiagent "github.com/juju/juju/api/agent"
-	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/caas"
 	k8sprovider "github.com/juju/juju/caas/kubernetes/provider"
 	"github.com/juju/juju/cloud"
@@ -191,8 +190,7 @@ func InitializeState(
 	if err = initAPIHostPorts(st, args.BootstrapMachineAddresses, servingInfo.APIPort); err != nil {
 		return nil, err
 	}
-	ssi := paramsStateServingInfoToStateStateServingInfo(servingInfo)
-	if err := st.SetStateServingInfo(ssi); err != nil {
+	if err := st.SetStateServingInfo(servingInfo); err != nil {
 		return nil, errors.Errorf("cannot set state serving info: %v", err)
 	}
 
@@ -394,18 +392,6 @@ func getEnviron(
 	return environs.Open(provider, openParams)
 }
 
-func paramsStateServingInfoToStateStateServingInfo(i params.StateServingInfo) state.StateServingInfo {
-	return state.StateServingInfo{
-		APIPort:        i.APIPort,
-		StatePort:      i.StatePort,
-		Cert:           i.Cert,
-		PrivateKey:     i.PrivateKey,
-		CAPrivateKey:   i.CAPrivateKey,
-		SharedSecret:   i.SharedSecret,
-		SystemIdentity: i.SystemIdentity,
-	}
-}
-
 func initRaft(agentConfig agent.Config) error {
 	raftDir := filepath.Join(agentConfig.DataDir(), "raft")
 	return raft.Bootstrap(raft.Config{

agent/agentbootstrap/bootstrap_test.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/agent/agentbootstrap"
-	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/cloud"
 	"github.com/juju/juju/cloudconfig/instancecfg"
 	"github.com/juju/juju/controller"
@@ -105,7 +104,7 @@ LXC_BRIDGE="ignored"`[1:])
 		Controller:        testing.ControllerTag,
 		Model:             testing.ModelTag,
 	}
-	servingInfo := params.StateServingInfo{
+	servingInfo := controller.StateServingInfo{
 		Cert:           testing.ServerCert,
 		PrivateKey:     testing.ServerKey,
 		CAPrivateKey:   testing.CAKey,
@@ -302,7 +301,7 @@ LXC_BRIDGE="ignored"`[1:])
 	// Check that the state serving info is initialised correctly.
 	stateServingInfo, err := st.StateServingInfo()
 	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(stateServingInfo, jc.DeepEquals, state.StateServingInfo{
+	c.Assert(stateServingInfo, jc.DeepEquals, controller.StateServingInfo{
 		APIPort:        1234,
 		StatePort:      s.mgoInst.Port(),
 		Cert:           testing.ServerCert,
@@ -393,7 +392,7 @@ func (s *bootstrapSuite) TestInitializeStateFailsSecondTime(c *gc.C) {
 	}
 	cfg, err := agent.NewAgentConfig(configParams)
 	c.Assert(err, jc.ErrorIsNil)
-	cfg.SetStateServingInfo(params.StateServingInfo{
+	cfg.SetStateServingInfo(controller.StateServingInfo{
 		APIPort:        5555,
 		StatePort:      s.mgoInst.Port(),
 		Cert:           "foo",

agent/format-2.0.go

@@ -12,7 +12,7 @@ import (
 	"gopkg.in/juju/names.v3"
 	goyaml "gopkg.in/yaml.v2"
 
-	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/model"
 )
 
@@ -115,7 +115,7 @@ func (formatter_2_0) unmarshal(data []byte) (*configInternal, error) {
 		}
 	}
 	if len(format.ControllerKey) != 0 {
-		config.servingInfo = &params.StateServingInfo{
+		config.servingInfo = &controller.StateServingInfo{
 			Cert:              format.ControllerCert,
 			PrivateKey:        format.ControllerKey,
 			CAPrivateKey:      format.CAPrivateKey,

agent/format_whitebox_test.go

@@ -13,8 +13,8 @@ import (
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v3"
 
-	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/cloudconfig/cloudinit"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/testing"
 	jujuversion "github.com/juju/juju/version"
@@ -91,7 +91,7 @@ func (*formatSuite) TestRead(c *gc.C) {
 }
 
 func (*formatSuite) TestReadWriteStateConfig(c *gc.C) {
-	servingInfo := params.StateServingInfo{
+	servingInfo := controller.StateServingInfo{
 		Cert:         "some special cert",
 		PrivateKey:   "a special key",
 		CAPrivateKey: "ca special key",

agent/identity_test.go

@@ -13,7 +13,7 @@ import (
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v3"
 
-	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/testing"
 	jujuversion "github.com/juju/juju/version"
 )
@@ -37,7 +37,7 @@ var attributeParams = AgentConfigParams{
 	Model:             testing.ModelTag,
 }
 
-var servingInfo = params.StateServingInfo{
+var servingInfo = controller.StateServingInfo{
 	Cert:           "old cert",
 	PrivateKey:     "old key",
 	CAPrivateKey:   "old ca key",

api/agent/machine_test.go

@@ -17,6 +17,7 @@ import (
 	apiagent "github.com/juju/juju/api/agent"
 	apiserveragent "github.com/juju/juju/apiserver/facades/agent/agent"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/juju/testing"
@@ -40,27 +41,20 @@ var _ = gc.Suite(&servingInfoSuite{})
 func (s *servingInfoSuite) TestStateServingInfo(c *gc.C) {
 	st, _ := s.OpenAPIAsNewMachine(c, state.JobManageModel)
 
-	ssi := state.StateServingInfo{
+	ssi := controller.StateServingInfo{
 		PrivateKey:   "some key",
 		Cert:         "Some cert",
 		SharedSecret: "really, really secret",
 		APIPort:      33,
 		StatePort:    44,
 	}
-	expected := params.StateServingInfo{
-		PrivateKey:   ssi.PrivateKey,
-		Cert:         ssi.Cert,
-		SharedSecret: ssi.SharedSecret,
-		APIPort:      ssi.APIPort,
-		StatePort:    ssi.StatePort,
-	}
 	err := s.State.SetStateServingInfo(ssi)
 	c.Assert(err, jc.ErrorIsNil)
 	apiSt, err := apiagent.NewState(st)
 	c.Assert(err, jc.ErrorIsNil)
 	info, err := apiSt.StateServingInfo()
 	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(info, jc.DeepEquals, expected)
+	c.Assert(info, jc.DeepEquals, ssi)
 }
 
 func (s *servingInfoSuite) TestStateServingInfoPermission(c *gc.C) {

api/agent/state.go

@@ -13,6 +13,7 @@ import (
 	"github.com/juju/juju/api/common"
 	"github.com/juju/juju/api/common/cloudspec"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/instance"
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/model"
@@ -60,10 +61,22 @@ func (st *State) getEntity(tag names.Tag) (*params.AgentGetEntitiesResult, error
 	return &results.Entities[0], nil
 }
 
-func (st *State) StateServingInfo() (params.StateServingInfo, error) {
+func (st *State) StateServingInfo() (controller.StateServingInfo, error) {
 	var results params.StateServingInfo
 	err := st.facade.FacadeCall("StateServingInfo", nil, &results)
-	return results, err
+	if err != nil {
+		return controller.StateServingInfo{}, errors.Trace(err)
+	}
+	return controller.StateServingInfo{
+		APIPort:           results.APIPort,
+		ControllerAPIPort: results.ControllerAPIPort,
+		StatePort:         results.StatePort,
+		Cert:              results.Cert,
+		PrivateKey:        results.PrivateKey,
+		CAPrivateKey:      results.CAPrivateKey,
+		SharedSecret:      results.SharedSecret,
+		SystemIdentity:    results.SystemIdentity,
+	}, nil
 }
 
 // IsMaster reports whether the connected machine

apiserver/facades/client/backups/backups.go

@@ -35,7 +35,7 @@ type Backend interface {
 	ControllerTag() names.ControllerTag
 	ModelConfig() (*config.Config, error)
 	ControllerConfig() (controller.Config, error)
-	StateServingInfo() (state.StateServingInfo, error)
+	StateServingInfo() (controller.StateServingInfo, error)
 	RestoreInfo() *state.RestoreInfo
 	ControllerNodes() ([]state.ControllerNode, error)
 }