Fix unit tests and rename common facade helper

sdg0919 · Oct 20, 2020 · a3ce027 · a3ce027
1 parent cf261d7
commit a3ce027
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git a/apiserver/common/caas/caas.go → apiserver/common/unitcommon/accessor.go b/apiserver/common/caas/caas.go → apiserver/common/unitcommon/accessor.go
@@ -1,7 +1,7 @@
 // Copyright 2020 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package caas
+package unitcommon
 
 import (
 	"github.com/juju/errors"
@@ -38,9 +38,9 @@ func (b backend) ApplicationExists(name string) error {
 	return err
 }
 
-// CAASUnitAccessor returns an auth function which determines if the
+// UnitAccessor returns an auth function which determines if the
 // authenticated entity can access a unit or application.
-func CAASUnitAccessor(authorizer facade.Authorizer, st ApplicationGetter) common.GetAuthFunc {
+func UnitAccessor(authorizer facade.Authorizer, st ApplicationGetter) common.GetAuthFunc {
 	return func() (common.AuthFunc, error) {
 		switch tag := authorizer.GetAuthTag().(type) {
 		case names.ApplicationTag:

diff --git a/apiserver/common/caas/caas_test.go → apiserver/common/unitcommon/accessor_test.go b/apiserver/common/caas/caas_test.go → apiserver/common/unitcommon/accessor_test.go
@@ -1,7 +1,7 @@
 // Copyright 2020 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package caas_test
+package unitcommon_test
 
 import (
 	"github.com/juju/errors"
@@ -10,15 +10,15 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/juju/apiserver/common/caas"
+	"github.com/juju/juju/apiserver/common/unitcommon"
 	apiservertesting "github.com/juju/juju/apiserver/testing"
 )
 
-type CaasSuite struct {
+type UnitAccessorSuite struct {
 	testing.IsolationSuite
 }
 
-var _ = gc.Suite(&CaasSuite{})
+var _ = gc.Suite(&UnitAccessorSuite{})
 
 type appGetter struct {
 	exits bool
@@ -31,11 +31,11 @@ func (a appGetter) ApplicationExists(name string) error {
 	return errors.NotFoundf("application %q", name)
 }
 
-func (s *CaasSuite) TestApplicationAgent(c *gc.C) {
+func (s *UnitAccessorSuite) TestApplicationAgent(c *gc.C) {
 	auth := apiservertesting.FakeAuthorizer{
 		Tag: names.NewApplicationTag("gitlab"),
 	}
-	getAuthFunc := caas.CAASUnitAccessor(auth, appGetter{true})
+	getAuthFunc := unitcommon.UnitAccessor(auth, appGetter{true})
 	authFunc, err := getAuthFunc()
 	c.Assert(err, jc.ErrorIsNil)
 	ok := authFunc(names.NewUnitTag("gitlab/0"))
@@ -44,20 +44,20 @@ func (s *CaasSuite) TestApplicationAgent(c *gc.C) {
 	c.Assert(ok, jc.IsFalse)
 }
 
-func (s *CaasSuite) TestApplicationNotFound(c *gc.C) {
+func (s *UnitAccessorSuite) TestApplicationNotFound(c *gc.C) {
 	auth := apiservertesting.FakeAuthorizer{
 		Tag: names.NewApplicationTag("gitlab"),
 	}
-	getAuthFunc := caas.CAASUnitAccessor(auth, appGetter{false})
+	getAuthFunc := unitcommon.UnitAccessor(auth, appGetter{false})
 	_, err := getAuthFunc()
 	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 }
 
-func (s *CaasSuite) TestUnitAgent(c *gc.C) {
+func (s *UnitAccessorSuite) TestUnitAgent(c *gc.C) {
 	auth := apiservertesting.FakeAuthorizer{
 		Tag: names.NewUnitTag("gitlab/0"),
 	}
-	getAuthFunc := caas.CAASUnitAccessor(auth, appGetter{true})
+	getAuthFunc := unitcommon.UnitAccessor(auth, appGetter{true})
 	authFunc, err := getAuthFunc()
 	c.Assert(err, jc.ErrorIsNil)
 	ok := authFunc(names.NewUnitTag("gitlab/0"))

diff --git a/apiserver/common/caas/package_test.go → apiserver/common/unitcommon/package_test.go b/apiserver/common/caas/package_test.go → apiserver/common/unitcommon/package_test.go
@@ -1,7 +1,7 @@
 // Copyright 2020 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package caas_test
+package unitcommon_test
 
 import (
 	"testing"

diff --git a/apiserver/facades/agent/caasoperator/operator.go b/apiserver/facades/agent/caasoperator/operator.go
@@ -9,7 +9,7 @@ import (
 	"github.com/juju/names/v4"
 
 	"github.com/juju/juju/apiserver/common"
-	caasapi "github.com/juju/juju/apiserver/common/caas"
+	"github.com/juju/juju/apiserver/common/unitcommon"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/caas"
@@ -57,7 +57,7 @@ func NewStateFacade(ctx facade.Context) (*Facade, error) {
 	}
 	return NewFacade(resources, authorizer,
 		stateShim{ctx.State()},
-		caasapi.Backend(ctx.State()),
+		unitcommon.Backend(ctx.State()),
 		caasBroker, leadershipRevoker)
 }
 
@@ -66,7 +66,7 @@ func NewFacade(
 	resources facade.Resources,
 	authorizer facade.Authorizer,
 	st CAASOperatorState,
-	appGetter caasapi.ApplicationGetter,
+	appGetter unitcommon.ApplicationGetter,
 	broker CAASBrokerInterface,
 	leadershipRevoker leadership.Revoker,
 ) (*Facade, error) {
@@ -81,7 +81,7 @@ func NewFacade(
 		common.AuthFuncForTagKind(names.ApplicationTagKind),
 		common.AuthFuncForTagKind(names.UnitTagKind),
 	)
-	accessUnit := caasapi.CAASUnitAccessor(authorizer, appGetter)
+	accessUnit := unitcommon.UnitAccessor(authorizer, appGetter)
 	return &Facade{
 		LifeGetter:         common.NewLifeGetter(st, canRead),
 		APIAddresser:       common.NewAPIAddresser(st, resources),

diff --git a/apiserver/facades/agent/meterstatus/meterstatus.go b/apiserver/facades/agent/meterstatus/meterstatus.go
@@ -10,7 +10,7 @@ import (
 	"github.com/juju/names/v4"
 
 	"github.com/juju/juju/apiserver/common"
-	caasapi "github.com/juju/juju/apiserver/common/caas"
+	"github.com/juju/juju/apiserver/common/unitcommon"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/controller"
@@ -86,7 +86,7 @@ func NewMeterStatusAPI(
 		return nil, common.ErrPerm
 	}
 
-	accessUnit := caasapi.CAASUnitAccessor(authorizer, caasapi.Backend(st))
+	accessUnit := unitcommon.UnitAccessor(authorizer, unitcommon.Backend(st))
 	return &MeterStatusAPI{
 		state:      st,
 		accessUnit: accessUnit,

diff --git a/apiserver/facades/agent/uniter/uniter.go b/apiserver/facades/agent/uniter/uniter.go
@@ -16,8 +16,8 @@ import (
 	"github.com/juju/names/v4"
 
 	"github.com/juju/juju/apiserver/common"
-	caasapi "github.com/juju/juju/apiserver/common/caas"
 	"github.com/juju/juju/apiserver/common/cloudspec"
+	"github.com/juju/juju/apiserver/common/unitcommon"
 	"github.com/juju/juju/apiserver/facade"
 	leadershipapiserver "github.com/juju/juju/apiserver/facades/agent/leadership"
 	"github.com/juju/juju/apiserver/facades/agent/meterstatus"
@@ -179,7 +179,7 @@ func NewUniterAPI(context facade.Context) (*UniterAPI, error) {
 		return nil, errors.Trace(err)
 	}
 
-	accessUnit := caasapi.CAASUnitAccessor(authorizer, caasapi.Backend(st))
+	accessUnit := unitcommon.UnitAccessor(authorizer, unitcommon.Backend(st))
 	accessApplication := applicationAccessor(authorizer, st)
 	accessMachine := machineAccessor(authorizer, st)
 	accessCloudSpec := cloudSpecAccessor(authorizer, st)
@@ -304,7 +304,7 @@ func NewUniterAPIV11(context facade.Context) (*UniterAPIV11, error) {
 	authorizer := context.Auth()
 	st := context.State()
 	resources := context.Resources()
-	accessUnit := caasapi.CAASUnitAccessor(authorizer, caasapi.Backend(st))
+	accessUnit := unitcommon.UnitAccessor(authorizer, unitcommon.Backend(st))
 	return &UniterAPIV11{
 		LXDProfileAPI: NewExternalLXDProfileAPI(st, resources, authorizer, accessUnit, logger),
 		UniterAPIV12:  *uniterAPI,

diff --git a/apiserver/facades/client/client/status_test.go b/apiserver/facades/client/client/status_test.go
@@ -872,7 +872,7 @@ func (s *CAASStatusSuite) TestStatusOperatorNotReady(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(status.Applications, gc.HasLen, 1)
 	clearSinceTimes(status)
-	s.assertUnitStatus(c, status.Applications[s.app.Name()], "waiting", "agent initializing")
+	s.assertUnitStatus(c, status.Applications[s.app.Name()], "waiting", "installing agent")
 }
 
 func (s *CAASStatusSuite) TestStatusPodSpecNotSet(c *gc.C) {
@@ -885,7 +885,7 @@ func (s *CAASStatusSuite) TestStatusPodSpecNotSet(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(status.Applications, gc.HasLen, 1)
 	clearSinceTimes(status)
-	s.assertUnitStatus(c, status.Applications[s.app.Name()], "waiting", "agent initializing")
+	s.assertUnitStatus(c, status.Applications[s.app.Name()], "waiting", "installing agent")
 }
 
 func (s *CAASStatusSuite) TestStatusPodSpecSet(c *gc.C) {
@@ -938,7 +938,7 @@ func (s *CAASStatusSuite) TestStatusCloudContainerSet(c *gc.C) {
 func (s *CAASStatusSuite) assertUnitStatus(c *gc.C, appStatus params.ApplicationStatus, status, info string) {
 	curl, _ := s.app.CharmURL()
 	workloadVersion := ""
-	if info != "agent initializing" && info != "blocked" {
+	if info != "installing agent" && info != "blocked" {
 		workloadVersion = "gitlab/latest"
 	}
 	c.Assert(appStatus, jc.DeepEquals, params.ApplicationStatus{

diff --git a/core/cache/application_test.go b/core/cache/application_test.go
@@ -181,7 +181,7 @@ func (s *ApplicationSuite) TestDisplayStatusOperatorWaiting(c *gc.C) {
 		Name: "test",
 	})
 	expected := s.status(status.Waiting, time.Now())
-	expected.Message = status.MessageInitializingAgent
+	expected.Message = status.MessageInstallingAgent
 	model.UpdateApplication(cache.ApplicationChange{
 		Name:           "app",
 		Status:         s.status(status.Active, time.Now()),

diff --git a/core/status/caas.go b/core/status/caas.go
@@ -70,7 +70,7 @@ func ApplicationDisplayStatus(applicationStatus, operatorStatus StatusInfo, expe
 	}
 
 	if operatorStatus.Status == Waiting && !expectWorkload {
-		operatorStatus.Message = MessageInitializingAgent
+		operatorStatus.Message = MessageInstallingAgent
 	}
 	return operatorStatus
 

diff --git a/core/status/caas_test.go b/core/status/caas_test.go
@@ -280,7 +280,7 @@ func (s *UnitCloudStatusSuite) TestApplicatoinOpeartorStatusChoice(c *gc.C) {
 				Message: "unit",
 			},
 			expectWorkload: false,
-			messageCheck:   "agent initializing",
+			messageCheck:   "installing agent",
 		},
 		{
 			operatorStatus: status.StatusInfo{

diff --git a/state/unit.go b/state/unit.go
@@ -688,7 +688,7 @@ func (op *DestroyUnitOperation) destroyOps() ([]txn.Op, error) {
 		}
 		// For CAAS models, check to see if the unit agent has started.
 		if agentStatusInfo.Status != status.Allocating {
-			return false
+			return true
 		}
 		// If the agent is still allocating, it may still be queued to run the install hook
 		// so check that the unit agent has started.