Merge pull request juju#17157 from manadart/dqlite-remove-unused-charm

juju#17157

This is a simple removal of some dead code found while breaking down the charm concerns Dqlite migration.

`AllCharmURLs` was used in tests/shims/mocks, but never called in-theatre.

apiserver/facades/client/modelupgrader/shims.go

@@ -32,7 +32,6 @@ type State interface {
 	MongoCurrentStatus() (*replicaset.Status, error)
 	SetModelAgentVersion(newVersion version.Number, stream *string, ignoreAgentVersions bool, upgrader state.Upgrader) error
 	ControllerConfig() (controller.Config, error)
-	AllCharmURLs() ([]*string, error)
 }
 
 type SystemState interface {
@@ -128,10 +127,6 @@ func (s stateShim) MongoCurrentStatus() (*replicaset.Status, error) {
 	return replicaset.CurrentStatus(s.mgosession)
 }
 
-func (s stateShim) AllCharmURLs() ([]*string, error) {
-	return s.PooledState.AllCharmURLs()
-}
-
 type modelShim struct {
 	*state.Model
 }

internal/migration/interface.go

@@ -31,7 +31,6 @@ type PrecheckBackend interface {
 	AllMachines() ([]PrecheckMachine, error)
 	AllApplications() ([]PrecheckApplication, error)
 	AllRelations() ([]PrecheckRelation, error)
-	AllCharmURLs() ([]*string, error)
 	ControllerBackend() (PrecheckBackend, error)
 	HasUpgradeSeriesLocks() (bool, error)
 	MachineCountForBase(base ...state.Base) (map[string]int, error)

internal/migration/precheck_test.go

@@ -1056,10 +1056,6 @@ func (b *fakeBackend) MongoCurrentStatus() (*replicaset.Status, error) {
 	return b.mongoCurrentStatus, b.mongoCurrentStatusErr
 }
 
-func (b *fakeBackend) AllCharmURLs() ([]*string, error) {
-	return nil, errors.NotFoundf("charms")
-}
-
 type fakePool struct {
 	models []migration.PrecheckModel
 }

internal/upgrades/upgradevalidation/interfaces.go

@@ -19,7 +19,6 @@ type StatePool interface {
 
 // State represents a point of use interface for modelling a current model.
 type State interface {
-	AllCharmURLs() ([]*string, error)
 	HasUpgradeSeriesLocks() (bool, error)
 	MachineCountForBase(base ...state.Base) (map[string]int, error)
 	MongoCurrentStatus() (*replicaset.Status, error)

state/charm.go

@@ -1140,28 +1140,3 @@ func (st *State) AddCharmMetadata(info CharmInfo) (*Charm, error) {
 	}
 	return ch, nil
 }
-
-// AllCharmURLs returns a slice of strings representing charm.URLs for every
-// charm deployed in this model.
-func (st *State) AllCharmURLs() ([]*string, error) {
-	applications, closer := st.db().GetCollection(charmsC)
-	defer closer()
-
-	var docs []struct {
-		CharmURL *string `bson:"url"`
-	}
-	err := applications.Find(bson.D{}).All(&docs)
-	if err == mgo.ErrNotFound {
-		return nil, errors.NotFoundf("charms")
-	}
-	if err != nil {
-		return nil, errors.Errorf("cannot get all charm URLs")
-	}
-
-	curls := make([]*string, len(docs))
-	for i, v := range docs {
-		curls[i] = v.CharmURL
-	}
-
-	return curls, nil
-}

state/charm_test.go

@@ -767,16 +767,6 @@ func (s *CharmSuite) TestAddCharmMetadataUpdatesPlaceholder(c *gc.C) {
 	c.Check(ch2.IsPlaceholder(), jc.IsFalse)
 }
 
-func (s *CharmSuite) TestAllCharmURLs(c *gc.C) {
-	ch2 := state.AddTestingCharmhubCharmForSeries(c, s.State, "jammy", "dummy")
-	state.AddTestingApplication(c, s.State, s.objectStore, "testme-jammy", ch2)
-
-	curls, err := s.State.AllCharmURLs()
-	c.Assert(err, jc.ErrorIsNil)
-	// One application from SetUpTest
-	c.Assert(len(curls), gc.Equals, 2, gc.Commentf("%v", curls))
-}
-
 type CharmTestHelperSuite struct {
 	ConnSuite
 }