Merge pull request juju#18720 from manadart/dqlite-rename-model-creat…

…ion-arg juju#18720 This is a non-functional change aimed at disambiguation. `ModelCreationArgs` is renamed `GlobalModelCreationArgs` to indicate clearly that this is the global model record that ends up the the controller database. This work is in service of moving agent version from the controller database to the model database.
manadart · Jan 28, 2025 · 07c439d · 07c439d
2 parents e1ca09d + 132fddd
commit 07c439d
Show file tree

Hide file tree

Showing 23 changed files with 105 additions and 105 deletions.
diff --git a/agent/agentbootstrap/bootstrap.go b/agent/agentbootstrap/bootstrap.go
@@ -225,7 +225,7 @@ func (b *AgentBootstrap) Initialize(ctx stdcontext.Context) (_ *state.Controller
 		},
 	)
 
-	controllerModelArgs := modeldomain.ModelCreationArgs{
+	controllerModelArgs := modeldomain.GlobalModelCreationArgs{
 		AgentVersion: stateParams.AgentVersion,
 		Name:         stateParams.ControllerModelConfig.Name(),
 		Owner:        adminUserUUID,

diff --git a/apiserver/facades/client/modelmanager/mocks/service_mock.go b/apiserver/facades/client/modelmanager/mocks/service_mock.go
diff --git a/apiserver/facades/client/modelmanager/modelmanager.go b/apiserver/facades/client/modelmanager/modelmanager.go
@@ -207,7 +207,7 @@ func (m *ModelManagerAPI) createModelNew(
 	// if there was an error. If a failure to rollback occurs, then the endpoint
 	// should at least be somewhat idempotent.
 
-	creationArgs := model.ModelCreationArgs{
+	creationArgs := model.GlobalModelCreationArgs{
 		CloudRegion: args.CloudRegion,
 		Name:        args.Name,
 	}

diff --git a/apiserver/facades/client/modelmanager/modelmanager_test.go b/apiserver/facades/client/modelmanager/modelmanager_test.go
@@ -335,7 +335,7 @@ func (s *modelManagerSuite) expectCreateModel(
 	).Return(user.User{UUID: ownerUUID}, nil)
 
 	// Create model in controller database.
-	s.modelService.EXPECT().CreateModel(gomock.Any(), domainmodel.ModelCreationArgs{
+	s.modelService.EXPECT().CreateModel(gomock.Any(), domainmodel.GlobalModelCreationArgs{
 		Name:        modelCreateArgs.Name,
 		Owner:       ownerUUID,
 		Cloud:       expectedCloudName,
@@ -576,7 +576,7 @@ func (s *modelManagerSuite) TestCreateModelNoDefaultCredentialNonAdmin(c *gc.C)
 //	//s.accessService.EXPECT().GetUserByName(
 //	//	gomock.Any(), ownerName,
 //	//).Return(user.User{UUID: ownerUUID}, nil)
-//	//s.modelService.EXPECT().CreateModel(gomock.Any(), model.ModelCreationArgs{
+//	//s.modelService.EXPECT().CreateModel(gomock.Any(), model.GlobalModelCreationArgs{
 //	//	Name:        "existing-ns",
 //	//	Owner:       ownerUUID,
 //	//	Cloud:       "k8s-cloud",
@@ -1111,7 +1111,7 @@ func (s *modelManagerStateSuite) expectCreateModelStateSuite(
 	).Return(user.User{UUID: ownerUUID}, nil)
 
 	// Create model in controller database.
-	s.modelService.EXPECT().CreateModel(gomock.Any(), domainmodel.ModelCreationArgs{
+	s.modelService.EXPECT().CreateModel(gomock.Any(), domainmodel.GlobalModelCreationArgs{
 		Name:        modelCreateArgs.Name,
 		Owner:       ownerUUID,
 		Cloud:       "dummy",

diff --git a/apiserver/facades/client/modelmanager/services.go b/apiserver/facades/client/modelmanager/services.go
@@ -77,7 +77,7 @@ type ModelConfigService interface {
 // ModelService defines an interface for interacting with the model service.
 type ModelService interface {
 	// CreateModel creates a model returning the resultant model's new id.
-	CreateModel(context.Context, model.ModelCreationArgs) (coremodel.UUID, func(context.Context) error, error)
+	CreateModel(context.Context, model.GlobalModelCreationArgs) (coremodel.UUID, func(context.Context) error, error)
 
 	// DefaultModelCloudNameAndCredential returns the default cloud name and
 	// credential that should be used for newly created models that haven't had

diff --git a/domain/cloud/state/state_test.go b/domain/cloud/state/state_test.go
@@ -349,7 +349,7 @@ func (s *stateSuite) TestCloudIsControllerCloud(c *gc.C) {
 		context.Background(),
 		modelUUID,
 		coremodel.IAAS,
-		model.ModelCreationArgs{
+		model.GlobalModelCreationArgs{
 			Cloud:         testCloud.Name,
 			Name:          coremodel.ControllerModelName,
 			Owner:         user.UUID(s.adminUUID.String()),

diff --git a/domain/keyupdater/keyupdater_test.go b/domain/keyupdater/keyupdater_test.go
@@ -90,7 +90,7 @@ func (s *keyUpdaterSuite) SetUpTest(c *gc.C) {
 	testing.CreateInternalSecretBackend(c, s.ControllerTxnRunner())
 
 	modelUUID := modeltesting.GenModelUUID(c)
-	modelFn := modelbootstrap.CreateModel(modelUUID, domainmodel.ModelCreationArgs{
+	modelFn := modelbootstrap.CreateModel(modelUUID, domainmodel.GlobalModelCreationArgs{
 		AgentVersion: jujuversion.Current,
 		Cloud:        cloudName,
 		Credential: credential.Key{

diff --git a/domain/model/bootstrap/bootstrap.go b/domain/model/bootstrap/bootstrap.go
@@ -32,7 +32,7 @@ func (m modelTypeStateFunc) CloudType(c context.Context, n string) (string, erro
 
 // CreateModel is responsible for making a new model with all of its associated
 // metadata during the bootstrap process.
-// If the ModelCreationArgs does not have a credential name set then no cloud
+// If the GlobalModelCreationArgs does not have a credential name set then no cloud
 // credential will be associated with the model.
 //
 // The only supported agent version during bootstrap is that of the current
@@ -55,7 +55,7 @@ func (m modelTypeStateFunc) CloudType(c context.Context, n string) (string, erro
 // the bootstrap process.
 func CreateModel(
 	modelID coremodel.UUID,
-	args model.ModelCreationArgs,
+	args model.GlobalModelCreationArgs,
 ) internaldatabase.BootstrapOpt {
 	return func(ctx context.Context, controller, model database.TxnRunner) error {
 		if err := args.Validate(); err != nil {

diff --git a/domain/model/bootstrap/bootstrap_test.go b/domain/model/bootstrap/bootstrap_test.go
@@ -94,7 +94,7 @@ var _ = gc.Suite(&bootstrapSuite{})
 func (s *bootstrapSuite) TestUUIDIsRespected(c *gc.C) {
 	fn := CreateModel(
 		modeltesting.GenModelUUID(c),
-		model.ModelCreationArgs{
+		model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,
 			Cloud:        s.cloudName,
 			Credential: credential.Key{
@@ -126,7 +126,7 @@ func (s *modelBootstrapSuite) TestCreateReadOnlyModel(c *gc.C) {
 	controllerUUID := uuid.MustNewUUID()
 	modelUUID := modeltesting.GenModelUUID(c)
 
-	args := model.ModelCreationArgs{
+	args := model.GlobalModelCreationArgs{
 		AgentVersion: jujuversion.Current,
 		Cloud:        s.cloudName,
 		Credential: credential.Key{
@@ -166,7 +166,7 @@ func (s *modelBootstrapSuite) TestCreateModelWithDifferingBuildNumber(c *gc.C) {
 	v := jujuversion.Current
 	v.Build++
 
-	args := model.ModelCreationArgs{
+	args := model.GlobalModelCreationArgs{
 		AgentVersion: v,
 		Cloud:        s.cloudName,
 		Credential: credential.Key{

diff --git a/domain/model/modelmigration/import.go b/domain/model/modelmigration/import.go
@@ -185,7 +185,7 @@ func (i *importOperation) Execute(ctx context.Context, model description.Model)
 	}
 
 	args := domainmodel.ModelImportArgs{
-		ModelCreationArgs: domainmodel.ModelCreationArgs{
+		GlobalModelCreationArgs: domainmodel.GlobalModelCreationArgs{
 			AgentVersion: agentVersion,
 			Cloud:        model.Cloud(),
 			CloudRegion:  model.CloudRegion(),

diff --git a/domain/model/modelmigration/import_test.go b/domain/model/modelmigration/import_test.go
@@ -134,7 +134,7 @@ func (i *importSuite) TestModelCreate(c *gc.C) {
 	i.controllerConfigService.EXPECT().ControllerConfig(gomock.Any()).Return(testing.FakeControllerConfig(), nil)
 
 	args := model.ModelImportArgs{
-		ModelCreationArgs: model.ModelCreationArgs{
+		GlobalModelCreationArgs: model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,
 			Cloud:        "AWS",
 			CloudRegion:  "region1",
@@ -210,7 +210,7 @@ func (i *importSuite) TestModelCreateRollbacksOnFailure(c *gc.C) {
 	i.controllerConfigService.EXPECT().ControllerConfig(gomock.Any()).Return(testing.FakeControllerConfig(), nil)
 
 	args := model.ModelImportArgs{
-		ModelCreationArgs: model.ModelCreationArgs{
+		GlobalModelCreationArgs: model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,
 			Cloud:        "AWS",
 			CloudRegion:  "region1",
@@ -297,7 +297,7 @@ func (i *importSuite) TestModelCreateRollbacksOnFailureIgnoreNotFoundModel(c *gc
 	i.controllerConfigService.EXPECT().ControllerConfig(gomock.Any()).Return(testing.FakeControllerConfig(), nil)
 
 	args := model.ModelImportArgs{
-		ModelCreationArgs: model.ModelCreationArgs{
+		GlobalModelCreationArgs: model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,
 			Cloud:        "AWS",
 			CloudRegion:  "region1",
@@ -383,7 +383,7 @@ func (i *importSuite) TestModelCreateRollbacksOnFailureIgnoreNotFoundReadOnlyMod
 	}
 
 	args := model.ModelImportArgs{
-		ModelCreationArgs: model.ModelCreationArgs{
+		GlobalModelCreationArgs: model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,
 			Cloud:        "AWS",
 			CloudRegion:  "region1",

diff --git a/domain/model/service/service.go b/domain/model/service/service.go
@@ -46,7 +46,7 @@ type State interface {
 	ModelTypeState
 
 	// Create creates a new model with all of its associated metadata.
-	Create(context.Context, coremodel.UUID, coremodel.ModelType, model.ModelCreationArgs) error
+	Create(context.Context, coremodel.UUID, coremodel.ModelType, model.GlobalModelCreationArgs) error
 
 	// Activate is responsible for setting a model as fully constructed and
 	// indicates the final system state for the model is ready for use.
@@ -205,7 +205,7 @@ func (s *Service) DefaultModelCloudNameAndCredential(
 
 // CreateModel is responsible for creating a new model from start to finish with
 // its associated metadata. The function will return the created model's id.
-// If the ModelCreationArgs does not have a credential name set then no cloud
+// If the GlobalModelCreationArgs does not have a credential name set then no cloud
 // credential will be associated with model.
 //
 // If the caller has not prescribed a specific agent version to use for the
@@ -229,7 +229,7 @@ func (s *Service) DefaultModelCloudNameAndCredential(
 // cannot be found.
 func (s *Service) CreateModel(
 	ctx context.Context,
-	args model.ModelCreationArgs,
+	args model.GlobalModelCreationArgs,
 ) (coremodel.UUID, func(context.Context) error, error) {
 	if err := args.Validate(); err != nil {
 		return "", nil, fmt.Errorf(
@@ -251,7 +251,7 @@ func (s *Service) CreateModel(
 // createModel is responsible for creating a new model from start to finish with
 // its associated metadata. The function takes the model id to be used as part
 // of the creation. This helps serve both new model creation and model
-// importing. If the ModelCreationArgs does not have a credential name set then
+// importing. If the GlobalModelCreationArgs does not have a credential name set then
 // no cloud credential will be associated with model.
 //
 // If the caller has not prescribed a specific agent version to use for the
@@ -277,7 +277,7 @@ func (s *Service) CreateModel(
 func (s *Service) createModel(
 	ctx context.Context,
 	id coremodel.UUID,
-	args model.ModelCreationArgs,
+	args model.GlobalModelCreationArgs,
 ) (func(context.Context) error, error) {
 	modelType, err := ModelTypeForCloud(ctx, s.st, args.Cloud)
 	if err != nil {
@@ -359,7 +359,7 @@ func (s *Service) ImportModel(
 		)
 	}
 
-	return s.createModel(ctx, args.ID, args.ModelCreationArgs)
+	return s.createModel(ctx, args.ID, args.GlobalModelCreationArgs)
 }
 
 // ControllerModel returns the model used for housing the Juju controller.