From ffd6339af06f1a11d584fa937a8d7d915e242409 Mon Sep 17 00:00:00 2001 From: Jack Shaw Date: Wed, 26 Jul 2023 15:57:46 +0100 Subject: [PATCH] Remove DefaultSeries from model summary It was not used anywhere by the client anyway. It's a hangover from a previous version This requires a rev of our modelmanager facade --- api/base/types.go | 1 - api/client/modelmanager/modelmanager.go | 1 - api/facadeversions.go | 2 +- .../facades/client/modelmanager/modelmanager.go | 5 ++--- apiserver/facades/client/modelmanager/register.go | 6 +++--- apiserver/facades/schema.json | 5 +---- rpc/params/model.go | 1 - state/modelsummaries.go | 13 +++---------- 8 files changed, 10 insertions(+), 24 deletions(-) diff --git a/api/base/types.go b/api/base/types.go index bae8278ee2b1..661b02e019b8 100644 --- a/api/base/types.go +++ b/api/base/types.go @@ -125,7 +125,6 @@ type UserModelSummary struct { ControllerUUID string IsController bool ProviderType string - DefaultSeries string Cloud string CloudRegion string CloudCredential string diff --git a/api/client/modelmanager/modelmanager.go b/api/client/modelmanager/modelmanager.go index 25c1e39a944c..ca9239959a9e 100644 --- a/api/client/modelmanager/modelmanager.go +++ b/api/client/modelmanager/modelmanager.go @@ -225,7 +225,6 @@ func (c *Client) ListModelSummaries(user string, all bool) ([]base.UserModelSumm ControllerUUID: summary.ControllerUUID, IsController: summary.IsController, ProviderType: summary.ProviderType, - DefaultSeries: summary.DefaultSeries, CloudRegion: summary.CloudRegion, Life: summary.Life, ModelUserAccess: string(summary.UserAccess), diff --git a/api/facadeversions.go b/api/facadeversions.go index c1d60d96b2a0..f0f22ec7da62 100644 --- a/api/facadeversions.go +++ b/api/facadeversions.go @@ -81,7 +81,7 @@ var facadeVersions = map[string]int{ "MigrationTarget": 2, "ModelConfig": 3, "ModelGeneration": 4, - "ModelManager": 9, + "ModelManager": 10, "ModelSummaryWatcher": 1, "ModelUpgrader": 1, "NotifyWatcher": 1, diff --git a/apiserver/facades/client/modelmanager/modelmanager.go b/apiserver/facades/client/modelmanager/modelmanager.go index cf30872c6fc4..4b0d3aead215 100644 --- a/apiserver/facades/client/modelmanager/modelmanager.go +++ b/apiserver/facades/client/modelmanager/modelmanager.go @@ -688,9 +688,8 @@ func (m *ModelManagerAPI) ListModelSummaries(req params.ModelSummariesRequest) ( Owner: mi.Owner, }, - DefaultSeries: mi.DefaultSeries, - ProviderType: mi.ProviderType, - AgentVersion: mi.AgentVersion, + ProviderType: mi.ProviderType, + AgentVersion: mi.AgentVersion, Status: common.EntityStatusFromState(mi.Status), Counts: []params.ModelEntityCount{}, diff --git a/apiserver/facades/client/modelmanager/register.go b/apiserver/facades/client/modelmanager/register.go index bbbc017d05b5..8af196135b6a 100644 --- a/apiserver/facades/client/modelmanager/register.go +++ b/apiserver/facades/client/modelmanager/register.go @@ -24,13 +24,13 @@ import ( // Register is called to expose a package of facades onto a given registry. func Register(registry facade.FacadeRegistry) { - registry.MustRegister("ModelManager", 9, func(ctx facade.Context) (facade.Facade, error) { - return newFacadeV9(ctx) + registry.MustRegister("ModelManager", 10, func(ctx facade.Context) (facade.Facade, error) { + return newFacadeV10(ctx) }, reflect.TypeOf((*ModelManagerAPI)(nil))) } // newFacadeV9 is used for API registration. -func newFacadeV9(ctx facade.Context) (*ModelManagerAPI, error) { +func newFacadeV10(ctx facade.Context) (*ModelManagerAPI, error) { st := ctx.State() pool := ctx.StatePool() ctlrSt, err := pool.SystemState() diff --git a/apiserver/facades/schema.json b/apiserver/facades/schema.json index 4123fd707464..c4d9245443fd 100644 --- a/apiserver/facades/schema.json +++ b/apiserver/facades/schema.json @@ -27427,7 +27427,7 @@ { "Name": "ModelManager", "Description": "ModelManagerAPI implements the model manager interface and is\nthe concrete implementation of the api end point.", - "Version": 9, + "Version": 10, "AvailableTo": [ "controller-machine-agent", "machine-agent", @@ -28364,9 +28364,6 @@ "$ref": "#/definitions/ModelEntityCount" } }, - "default-series": { - "type": "string" - }, "is-controller": { "type": "boolean" }, diff --git a/rpc/params/model.go b/rpc/params/model.go index a15859fe787f..073f2cb818f6 100644 --- a/rpc/params/model.go +++ b/rpc/params/model.go @@ -212,7 +212,6 @@ type ModelSummary struct { ControllerUUID string `json:"controller-uuid"` IsController bool `json:"is-controller"` ProviderType string `json:"provider-type,omitempty"` - DefaultSeries string `json:"default-series,omitempty"` CloudTag string `json:"cloud-tag"` CloudRegion string `json:"cloud-region,omitempty"` CloudCredentialTag string `json:"cloud-credential-tag,omitempty"` diff --git a/state/modelsummaries.go b/state/modelsummaries.go index fe6f9713de45..0106e114a3d3 100644 --- a/state/modelsummaries.go +++ b/state/modelsummaries.go @@ -55,10 +55,9 @@ type ModelSummary struct { SLAOwner string // Needs Config() - ProviderType string - DefaultSeries string - DefaultBase series.Base - AgentVersion *version.Number + ProviderType string + DefaultBase series.Base + AgentVersion *version.Number // Needs Statuses collection Status status.StatusInfo @@ -151,12 +150,6 @@ func (p *modelSummaryProcessor) fillInFromConfig() error { detail.ProviderType = cfg.Type() detail.DefaultBase = config.PreferredBase(cfg) - // TODO(stickupkid): Ensure we fill in the default series for now, we - // can switch that out later. - if detail.DefaultSeries, err = series.GetSeriesFromBase(detail.DefaultBase); err != nil { - return errors.Trace(err) - } - if agentVersion, exists := cfg.AgentVersion(); exists { detail.AgentVersion = &agentVersion }