Wires up user correlation for models in DQlite.

Until now we haven't had any strong referential integrity for model
owners onto the user table. Now that the user DDL has been established
this sets up the checks and test to assert that when adding a model the
owner exists and is a valid user in the system (not removed).

As part of this PR I have also wired up the bootstrap process to set the
admin user as the owner of the controller model.

This PR also removes some hard coded values that were living in the
wrong place. Specifically the username we give to the admin user at
bootstrap time.

Also moved controller defaults such as controller name and controller
model user to the core package so they can be referenced properly.

agent/agentbootstrap/bootstrap.go

@@ -220,12 +220,16 @@ func (b *AgentBootstrap) Initialize(ctx stdcontext.Context) (_ *state.Controller
 		controllerModelType = modeldomain.TypeCAAS
 	}
 
+	// Add initial Admin user to the database. This will return Admin user UUID
+	// and a function to insert it into the database.
+	adminUserUUID, addAdminUser := userbootstrap.AddUserWithPassword(b.adminUser.Name(), auth.NewPassword(info.Password))
+
 	controllerUUID := modeldomain.UUID(
 		stateParams.ControllerModelConfig.UUID(),
 	)
 	controllerModelArgs := modeldomain.ModelCreationArgs{
 		Name:        stateParams.ControllerModelConfig.Name(),
-		Owner:       b.adminUser.Name(),
+		Owner:       adminUserUUID,
 		Cloud:       stateParams.ControllerCloud.Name,
 		CloudRegion: stateParams.ControllerCloudRegion,
 		Credential:  credential.IdFromTag(cloudCredTag),
@@ -237,18 +241,16 @@ func (b *AgentBootstrap) Initialize(ctx stdcontext.Context) (_ *state.Controller
 		stateParams.ControllerInheritedConfig,
 		stateParams.RegionInheritedConfig[stateParams.ControllerCloudRegion])
 
-	// Add initial Admin user to the database. This will return Admin user UUID
-	// and a function to insert it into the database.
-	_, addAdminUser := userbootstrap.AddUserWithPassword(b.adminUser.Name(), auth.NewPassword(info.Password))
-
 	databaseBootstrapConcerns := []database.BootstrapConcern{
 		database.BootstrapControllerConcern(
 			ccbootstrap.InsertInitialControllerConfig(stateParams.ControllerConfig),
+			// The admin user needs to be added before everything else that
+			// requires being owned by a Juju user.
 			cloudbootstrap.InsertCloud(stateParams.ControllerCloud),
 			credbootstrap.InsertCredential(credential.IdFromTag(cloudCredTag), cloudCred),
 			cloudbootstrap.SetCloudDefaults(stateParams.ControllerCloud.Name, stateParams.ControllerInheritedConfig),
-			modelbootstrap.CreateModel(controllerUUID, controllerModelArgs),
 			addAdminUser,
+			modelbootstrap.CreateModel(controllerUUID, controllerModelArgs),
 		),
 		database.BootstrapModelConcern(controllerUUID,
 			modelconfigbootstrap.SetModelConfig(stateParams.ControllerModelConfig, controllerModelDefaults),

api/package_test.go

@@ -46,6 +46,7 @@ func (*ImportSuite) TestImports(c *gc.C) {
 		"core/secrets",
 		"core/status",
 		"core/trace",
+		"core/user",
 		"core/watcher",
 		"domain/credential", // Imported by environs/envcontext.
 		"environs/envcontext",

cmd/containeragent/initialize/package_test.go

@@ -72,6 +72,7 @@ func (*importSuite) TestImports(c *gc.C) {
 		"core/status",
 		"core/trace",
 		"core/upgrade",
+		"core/user",
 		"core/watcher",
 		"domain/credential",
 		"environs/cloudspec",

cmd/containeragent/unit/package_test.go

@@ -115,6 +115,7 @@ func (*importSuite) TestImports(c *gc.C) {
 		"core/secrets",
 		"core/snap",
 		"core/status",
+		"core/user",
 		"core/watcher",
 		"downloader",
 		"environs",

cmd/jujud/agent/bootstrap.go

@@ -36,6 +36,7 @@ import (
 	"github.com/juju/juju/core/instance"
 	"github.com/juju/juju/core/network"
 	coreos "github.com/juju/juju/core/os"
+	coreuser "github.com/juju/juju/core/user"
 	"github.com/juju/juju/domain/credential"
 	"github.com/juju/juju/environs"
 	environscloudspec "github.com/juju/juju/environs/cloudspec"
@@ -64,8 +65,6 @@ var (
 
 type BootstrapAgentFunc func(agentbootstrap.AgentBootstrapArgs) (*agentbootstrap.AgentBootstrap, error)
 
-const adminUserName = "admin"
-
 // BootstrapCommand represents a jujud bootstrap command.
 type BootstrapCommand struct {
 	cmd.CommandBase
@@ -371,7 +370,7 @@ func (c *BootstrapCommand) Run(ctx *cmd.Context) error {
 		// We shouldn't attempt to dial peers until we have some.
 		dialOpts.Direct = true
 
-		adminTag := names.NewLocalUserTag(adminUserName)
+		adminTag := names.NewLocalUserTag(coreuser.AdminUserName)
 		bootstrap, err := c.BootstrapAgent(agentbootstrap.AgentBootstrapArgs{
 			AgentConfig:               agentConfig,
 			BootstrapEnviron:          env,

domain/model/defaults.go → core/model/defaults.go

@@ -1,17 +1,19 @@
-// Copyright 2023 Canonical Ltd.
+// Copyright 2024 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package model
 
+import "github.com/juju/juju/core/user"
+
 const (
 	// ControllerModelName is the name given to the model that hosts the Juju
 	// controller. This is a static value that we use for every Juju deployment.
 	// It provides a common reference point that we can leverage in business
 	// logic to ask questions and calculate defaults in Juju.
 	ControllerModelName = "controller"
 
-	// ControllerModelOwner is the name of the owner that is assigned to the
-	// controller model. This is a static value that we ue for every Juju
-	// deployment.
-	ControllerModelOwner = "admin"
+	// ControllerModelOwnerUsername is the user name of the owner that is
+	// assigned to the controller model. This is a static value that we use for
+	// every Juju deployment.
+	ControllerModelOwnerUsername = user.AdminUserName
 )

core/multiwatcher/package_test.go

@@ -31,6 +31,7 @@ func (*ImportTest) TestImports(c *gc.C) {
 		"core/instance",
 		"core/life",
 		"core/model",
+		"core/user",
 		"core/network",
 		"core/permission",
 		"core/status",

core/user/defaults.go

@@ -0,0 +1,10 @@
+// Copyright 2024 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package user
+
+const (
+	// AdminUsername is the default username that we give to the default admin
+	// user that is created as part of every Juju bootstrap.
+	AdminUserName = "admin"
+)

domain/cloud/state/state.go

@@ -15,10 +15,10 @@ import (
 	"github.com/juju/juju/cloud"
 	"github.com/juju/juju/core/changestream"
 	coredatabase "github.com/juju/juju/core/database"
+	coremodel "github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/watcher"
 	"github.com/juju/juju/domain"
 	clouderrors "github.com/juju/juju/domain/cloud/errors"
-	"github.com/juju/juju/domain/model"
 	"github.com/juju/juju/internal/database"
 )
 
@@ -340,9 +340,11 @@ SELECT cloud.uuid, cloud.name, cloud_type_id,
        auth_type.type, cloud_type.type,
        COALESCE((SELECT true
         FROM model_metadata
+		INNER JOIN user
+        ON user.uuid = model_metadata.owner_uuid
         WHERE cloud_uuid = cloud.uuid
-        AND name = ?
-        AND owner_uuid = ?), false) AS controller_cloud
+        AND model_metadata.name = ?
+        AND user.name = ?), false) AS controller_cloud
 FROM   cloud
        LEFT JOIN cloud_auth_type 
             ON cloud.uuid = cloud_auth_type.cloud_uuid
@@ -353,8 +355,8 @@ FROM   cloud
 `
 
 	args := []any{
-		model.ControllerModelName,
-		model.ControllerModelOwner,
+		coremodel.ControllerModelName,
+		coremodel.ControllerModelOwnerUsername,
 	}
 	if name != "" {
 		q = q + "WHERE cloud.name = ?"