Merge pull request juju#18736 from manadart/dqlite-rename-global-mode…

…l-creation

juju#18736

This is another simple renaming in service of relocating agent version concerns to the model database.

`CreateModel` from the bootstrap service is renamed `CreateGlobalModelRecord` to make clear that it is the global record in the controller database.

agent/agentbootstrap/bootstrap.go

@@ -233,7 +233,7 @@ func (b *AgentBootstrap) Initialize(ctx stdcontext.Context) (_ *state.Controller
 		CloudRegion:  stateParams.ControllerCloudRegion,
 		Credential:   credential.KeyFromTag(cloudCredTag),
 	}
-	controllerModelCreateFunc := modelbootstrap.CreateModel(controllerModelUUID, controllerModelArgs)
+	controllerModelCreateFunc := modelbootstrap.CreateGlobalModelRecord(controllerModelUUID, controllerModelArgs)
 
 	controllerModelDefaults := modeldefaultsbootstrap.ModelDefaultsProvider(
 		stateParams.ControllerInheritedConfig,

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.GlobalModelCreationArgs{
+	modelFn := modelbootstrap.CreateGlobalModelRecord(modelUUID, domainmodel.GlobalModelCreationArgs{
 		AgentVersion: jujuversion.Current,
 		Cloud:        cloudName,
 		Credential: credential.Key{

domain/model/bootstrap/bootstrap.go

@@ -30,10 +30,10 @@ func (m modelTypeStateFunc) CloudType(c context.Context, n string) (string, erro
 	return m(c, n)
 }
 
-// CreateModel is responsible for making a new model with all of its associated
-// metadata during the bootstrap process.
-// If the GlobalModelCreationArgs does not have a credential name set then no cloud
-// credential will be associated with the model.
+// CreateGlobalModelRecord is responsible for making a new model with all of its
+// associated metadata during the bootstrap process.
+// 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
 // controller. This will be the default if no agent version is supplied.
@@ -48,12 +48,12 @@ func (m modelTypeStateFunc) CloudType(c context.Context, n string) (string, erro
 // - [secretbackenderrors.NotFound] When the secret backend for the model
 // cannot be found.
 //
-// CreateModel expects the caller to generate their own model id and pass it to
-// this function. In an ideal world we want to have this stopped and make this
-// function generate a new id and return the value. This can only be achieved
-// once we have the Juju client stop generating id's for controller models in
-// the bootstrap process.
-func CreateModel(
+// CreateGlobalModelRecord expects the caller to generate their own model id and
+// pass it to this function. In an ideal world we want to have this stopped and
+// make this function generate a new id and return the value. This can only be
+// achieved once we have the Juju client stop generating id's for controller
+// models in the bootstrap process.
+func CreateGlobalModelRecord(
 	modelID coremodel.UUID,
 	args model.GlobalModelCreationArgs,
 ) internaldatabase.BootstrapOpt {

domain/model/bootstrap/bootstrap_test.go

@@ -92,7 +92,7 @@ type bootstrapSuite struct {
 var _ = gc.Suite(&bootstrapSuite{})
 
 func (s *bootstrapSuite) TestUUIDIsRespected(c *gc.C) {
-	fn := CreateModel(
+	fn := CreateGlobalModelRecord(
 		modeltesting.GenModelUUID(c),
 		model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,
@@ -139,7 +139,7 @@ func (s *modelBootstrapSuite) TestCreateReadOnlyModel(c *gc.C) {
 	}
 
 	// Create a model and then create a read-only model from it.
-	fn := CreateModel(modelUUID, args)
+	fn := CreateGlobalModelRecord(modelUUID, args)
 	err := fn(context.Background(), s.ControllerTxnRunner(), s.NoopTxnRunner())
 	c.Assert(err, jc.ErrorIsNil)
 
@@ -179,7 +179,7 @@ func (s *modelBootstrapSuite) TestCreateModelWithDifferingBuildNumber(c *gc.C) {
 	}
 
 	// Create a model and then create a read-only model from it.
-	fn := CreateModel(modeltesting.GenModelUUID(c), args)
+	fn := CreateGlobalModelRecord(modeltesting.GenModelUUID(c), args)
 	err := fn(context.Background(), s.ControllerTxnRunner(), s.ModelTxnRunner())
 	c.Assert(err, jc.ErrorIsNil)
 }

domain/modelconfig/bootstrap/bootstrap_test.go

@@ -93,7 +93,7 @@ func (s *bootstrapSuite) SetUpTest(c *gc.C) {
 	testing.CreateInternalSecretBackend(c, s.ControllerTxnRunner())
 
 	modelUUID := modeltesting.GenModelUUID(c)
-	modelFn := modelbootstrap.CreateModel(
+	modelFn := modelbootstrap.CreateGlobalModelRecord(
 		modelUUID,
 		model.GlobalModelCreationArgs{
 			AgentVersion: jujuversion.Current,

domain/modelconfig/modelconfig_test.go

@@ -95,7 +95,7 @@ func (s *modelConfigSuite) SetUpTest(c *gc.C) {
 	testing.CreateInternalSecretBackend(c, s.ControllerTxnRunner())
 
 	modelUUID := modeltesting.GenModelUUID(c)
-	modelFn := modelbootstrap.CreateModel(modelUUID, domainmodel.GlobalModelCreationArgs{
+	modelFn := modelbootstrap.CreateGlobalModelRecord(modelUUID, domainmodel.GlobalModelCreationArgs{
 		AgentVersion: jujuversion.Current,
 		Cloud:        cloudName,
 		Credential: credential.Key{

domain/services/testing/suite.go

@@ -191,7 +191,7 @@ func (s *DomainServicesSuite) SeedModelDatabases(c *gc.C) {
 		Owner:        s.AdminUserUUID,
 	}
 
-	fn := modelbootstrap.CreateModel(s.ControllerModelUUID, controllerArgs)
+	fn := modelbootstrap.CreateGlobalModelRecord(s.ControllerModelUUID, controllerArgs)
 	c.Assert(backendbootstrap.CreateDefaultBackends(coremodel.IAAS)(
 		ctx, s.ControllerTxnRunner(), s.ModelTxnRunner(c, s.ControllerModelUUID.String())), jc.ErrorIsNil)
 	err = fn(ctx, s.ControllerTxnRunner(), s.NoopTxnRunner())
@@ -216,7 +216,7 @@ func (s *DomainServicesSuite) SeedModelDatabases(c *gc.C) {
 		Owner:        s.AdminUserUUID,
 	}
 
-	fn = modelbootstrap.CreateModel(s.DefaultModelUUID, modelArgs)
+	fn = modelbootstrap.CreateGlobalModelRecord(s.DefaultModelUUID, modelArgs)
 	err = fn(ctx, s.ControllerTxnRunner(), s.NoopTxnRunner())
 	c.Assert(err, jc.ErrorIsNil)