Merge branch 'v3' of https://github.com/canonical/jimm into fix-k8s-t…

…ests

cmd/jimmctl/cmd/relation_test.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"sort"
 	"strings"
-	"time"
 
 	petname "github.com/dustinkirkland/golang-petname"
 	"github.com/google/uuid"
@@ -542,13 +541,6 @@ func (s *relationSuite) TestCheckRelationViaSuperuser(c *gc.C) {
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred.ID,
 		Life:              "alive",
-		Status: dbmodel.Status{
-			Status: "available",
-			Since: sql.NullTime{
-				Time:  time.Now().UTC().Truncate(time.Millisecond),
-				Valid: true,
-			},
-		},
 	}
 
 	err = db.AddModel(ctx, &model)

cmd/jimmsrv/service/service.go

@@ -216,17 +216,6 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	s.mux.ServeHTTP(w, req)
 }
 
-// WatchControllers connects to all controllers and starts an AllWatcher
-// monitoring all changes to models. WatchControllers finishes when the
-// given context is canceled, or there is a fatal error watching models.
-func (s *Service) WatchControllers(ctx context.Context) error {
-	w := jimm.Watcher{
-		Database: s.jimm.Database,
-		Dialer:   s.jimm.Dialer,
-	}
-	return w.Watch(ctx, 10*time.Minute)
-}
-
 // WatchModelSummaries connects to all controllers and starts a
 // ModelSummaryWatcher for all models. WatchModelSummaries finishes when
 // the given context is canceled, or there is a fatal error watching model
@@ -275,6 +264,22 @@ func (s *Service) OpenFGACleanup(ctx context.Context, trigger <-chan time.Time)
 	}
 }
 
+// CleanupDyingModels triggers every `trigger` time and calls the jimm methods to cleanup dying models.
+func (s *Service) CleanupDyingModels(ctx context.Context, trigger <-chan time.Time) error {
+	for {
+		select {
+		case <-trigger:
+			err := s.jimm.CleanupDyingModels(ctx)
+			if err != nil {
+				zapctx.Error(ctx, "dying models cleanup", zap.Error(err))
+				continue
+			}
+		case <-ctx.Done():
+			return nil
+		}
+	}
+}
+
 // Cleanup cleans up resources that need to be released on shutdown.
 func (s *Service) Cleanup() {
 	// Iterating over clean up function in reverse-order to avoid early clean ups.
@@ -498,11 +503,6 @@ func NewService(ctx context.Context, p Params) (*Service, error) {
 func (s *Service) StartServices(ctx context.Context, svc *service.Service) {
 	// on the leader unit we start additional routines
 	if s.isLeader {
-		// the leader unit connects to all controllers' AllWatcher
-		svc.Go(func() error {
-			return s.WatchControllers(ctx)
-		})
-
 		// audit log cleanup routine
 		if s.auditLogCleanupPeriod != 0 {
 			svc.Go(func() error {
@@ -524,6 +524,11 @@ func (s *Service) StartServices(ctx context.Context, svc *service.Service) {
 		svc.Go(func() error {
 			return s.OpenFGACleanup(ctx, time.NewTicker(6*time.Hour).C)
 		})
+
+		// CleanupDyingModels cleanup - cleans up all dying models
+		svc.Go(func() error {
+			return s.CleanupDyingModels(ctx, time.NewTicker(time.Minute).C)
+		})
 	}
 
 	// all units periodically update their controller/model metrics

internal/db/applicationoffer_test.go

@@ -7,7 +7,6 @@ import (
 	"database/sql"
 	"sort"
 	"testing"
-	"time"
 
 	qt "github.com/frankban/quicktest"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -82,16 +81,7 @@ func initTestEnvironment(c *qt.C, db *db.Database) testEnvironment {
 		Controller:      env.controller,
 		CloudRegion:     env.cloud.Regions[0],
 		CloudCredential: env.cred,
-		Type:            "iaas",
-		IsController:    false,
 		Life:            state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since: sql.NullTime{
-				Time:  time.Now(),
-				Valid: true,
-			},
-		},
 	}
 	c.Assert(db.DB.Create(&env.model).Error, qt.IsNil)
 
@@ -105,16 +95,7 @@ func initTestEnvironment(c *qt.C, db *db.Database) testEnvironment {
 		Controller:      env.controller,
 		CloudRegion:     env.cloud.Regions[0],
 		CloudCredential: env.cred,
-		Type:            "iaas",
-		IsController:    false,
 		Life:            state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since: sql.NullTime{
-				Time:  time.Now(),
-				Valid: true,
-			},
-		},
 	}
 	c.Assert(db.DB.Create(&env.model1).Error, qt.IsNil)
 

internal/db/model_test.go

@@ -7,7 +7,6 @@ import (
 	"database/sql"
 	"sort"
 	"testing"
-	"time"
 
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/juju/state"
@@ -72,16 +71,7 @@ func (s *dbSuite) TestAddModel(c *qt.C) {
 		ControllerID:      controller.ID,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 	m1 := model
 	err = s.Database.AddModel(context.Background(), &model)
@@ -147,16 +137,7 @@ func (s *dbSuite) TestGetModel(c *qt.C) {
 		CloudRegion:       cloud.Regions[0],
 		CloudCredentialID: cred.ID,
 		CloudCredential:   cred,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 	model.CloudCredential.Cloud = dbmodel.Cloud{}
 	// We don't care about the cloud credential owner when
@@ -240,16 +221,7 @@ func (s *dbSuite) TestUpdateModel(c *qt.C) {
 		ControllerID:      controller.ID,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 	err = s.Database.AddModel(context.Background(), &model)
 	c.Assert(err, qt.Equals, nil)
@@ -317,16 +289,7 @@ func (s *dbSuite) TestDeleteModel(c *qt.C) {
 		Controller:        controller,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 
 	// model does not exist
@@ -400,16 +363,7 @@ func (s *dbSuite) TestGetModelsUsingCredential(c *qt.C) {
 		ControllerID:      controller.ID,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred1.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 	err = s.Database.AddModel(context.Background(), &model1)
 	c.Assert(err, qt.Equals, nil)
@@ -424,16 +378,7 @@ func (s *dbSuite) TestGetModelsUsingCredential(c *qt.C) {
 		ControllerID:      controller.ID,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred2.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 	err = s.Database.AddModel(context.Background(), &model2)
 	c.Assert(err, qt.Equals, nil)
@@ -454,13 +399,7 @@ func (s *dbSuite) TestGetModelsUsingCredential(c *qt.C) {
 		Controller:        controller,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred1.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status:            model1.Status,
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}})
 
 	models, err = s.Database.GetModelsUsingCredential(context.Background(), 0)
@@ -683,20 +622,7 @@ func (s *dbSuite) TestGetModelsByController(c *qt.C) {
 		Controller:      controller,
 		CloudRegion:     cloud.Regions[0],
 		CloudCredential: cred,
-		Type:            "iaas",
-		IsController:    true,
-		DefaultSeries:   "focal",
 		Life:            state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since: sql.NullTime{
-				Time:  time.Now(),
-				Valid: true,
-			},
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}, {
 		Name: "test-model-2",
 		UUID: sql.NullString{
@@ -707,20 +633,7 @@ func (s *dbSuite) TestGetModelsByController(c *qt.C) {
 		Controller:      controller,
 		CloudRegion:     cloud.Regions[0],
 		CloudCredential: cred,
-		Type:            "iaas",
-		IsController:    false,
-		DefaultSeries:   "focal",
 		Life:            state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since: sql.NullTime{
-				Time:  time.Now(),
-				Valid: true,
-			},
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}}
 	for _, m := range models {
 		c.Assert(s.Database.DB.Create(&m).Error, qt.IsNil)

internal/db/resource_test.go

@@ -53,16 +53,7 @@ func SetupDB(c *qt.C, database *db.Database) (dbmodel.Model, dbmodel.Controller,
 		ControllerID:      controller.ID,
 		CloudRegionID:     cloud.Regions[0].ID,
 		CloudCredentialID: cred.ID,
-		Type:              "iaas",
-		DefaultSeries:     "warty",
 		Life:              state.Alive.String(),
-		Status: dbmodel.Status{
-			Status: "available",
-			Since:  db.Now(),
-		},
-		SLA: dbmodel.SLA{
-			Level: "unsupported",
-		},
 	}
 	err = database.AddModel(context.Background(), &model)
 	c.Assert(err, qt.Equals, nil)

internal/dbmodel/applicationoffer_test.go

@@ -43,9 +43,6 @@ func TestApplicationOfferUniqueConstraint(t *testing.T) {
 		Controller:      ctl,
 		CloudRegion:     cl.Regions[0],
 		CloudCredential: cred,
-		Type:            "iaas",
-		IsController:    false,
-		DefaultSeries:   "warty",
 		Life:            state.Alive.String(),
 	}
 	c.Assert(db.Create(&m).Error, qt.IsNil)