Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

refactor(rexctl): stop reading state from earlier builds

Hampusb489ce28e7df
diff --git a/fluxer_rexctl/cmd/takeover.go b/fluxer_rexctl/cmd/takeover.go
index f46444d75..7309dcb0d 100644
--- a/fluxer_rexctl/cmd/takeover.go
+++ b/fluxer_rexctl/cmd/takeover.go
@@ -138,12 +138,9 @@ func takeoverDir(ctx context.Context, app *App, dir string, opts takeoverOptions
}
func describeTakeover(u *ui.UI, r *instance.ImportReport) {
- switch r.Source {
- case instance.SourceEjected:
+ if r.Source == instance.SourceEjected {
u.Info("You manage the instance in %s yourself. rexctl takes it back with the settings in its .env file.", r.Dir)
- case instance.SourceRexctl:
- u.Info("An earlier rexctl manages the instance in %s. rexctl moves its settings out of .env.", r.Dir)
- default:
+ } else {
u.Info("Found a Fluxer instance in %s.", r.Dir)
}
u.Info("After this, rexctl manages it. Fluxer keeps running as it is, and your data and secrets stay.")
diff --git a/fluxer_rexctl/internal/checks/env_file.go b/fluxer_rexctl/internal/checks/env_file.go
index 60ec8859b..6684d009c 100644
--- a/fluxer_rexctl/internal/checks/env_file.go
+++ b/fluxer_rexctl/internal/checks/env_file.go
@@ -26,7 +26,7 @@ func (e *Env) drift() (*instance.DriftReport, error) {
}
func runEnvFile(ctx context.Context, e *Env) Result {
- if e.state() == nil || e.state().MigratedFromV1() || e.state().Ejected != nil {
+ if e.state() == nil || e.state().Ejected != nil {
return skip("")
}
r, err := e.drift()
diff --git a/fluxer_rexctl/internal/instance/drift.go b/fluxer_rexctl/internal/instance/drift.go
index e4c2c660d..9c0200513 100644
--- a/fluxer_rexctl/internal/instance/drift.go
+++ b/fluxer_rexctl/internal/instance/drift.go
@@ -171,7 +171,7 @@ func KeepEdited(inst *Instance, name string) (string, error) {
}
func SettleEnv(inst *Instance, set []string) (string, error) {
- if inst.State == nil || inst.State.MigratedFromV1() || inst.State.Ejected != nil {
+ if inst.State == nil || inst.State.Ejected != nil {
return "", nil
}
r, err := envDrift(inst)
diff --git a/fluxer_rexctl/internal/instance/import.go b/fluxer_rexctl/internal/instance/import.go
index a0d578251..24d8b5fdd 100644
--- a/fluxer_rexctl/internal/instance/import.go
+++ b/fluxer_rexctl/internal/instance/import.go
@@ -95,14 +95,11 @@ func runImport(ctx context.Context, dir string, e *engine.Engine, dry bool) (*St
if err != nil {
return nil, nil, err
}
- s, err := ParseState(data, abs, filepath.Join(abs, EnvFileName))
+ s, err := ParseState(data, abs)
if err != nil {
return nil, nil, err
}
- switch {
- case s.MigratedFromV1():
- return importRexctl(ctx, abs, e, s, dry)
- case s.Ejected != nil:
+ if s.Ejected != nil {
return importEjected(ctx, abs, e, s, dry)
}
r := &ImportReport{Source: SourceManaged, Dir: abs, Project: s.Project}
@@ -486,7 +483,7 @@ func releaseSet(dir, release string) (*stack.Set, error) {
if release != LegacyRelease {
profiles = stack.Embedded().Profiles
}
- return diskSet(filesDir, release, profiles)
+ return diskSet(dir, release, profiles)
}
func RetiredService(dir string) string {
diff --git a/fluxer_rexctl/internal/instance/instance.go b/fluxer_rexctl/internal/instance/instance.go
index 148667db7..8c0df1483 100644
--- a/fluxer_rexctl/internal/instance/instance.go
+++ b/fluxer_rexctl/internal/instance/instance.go
@@ -340,13 +340,7 @@ func (i *Instance) Save() error {
return fmt.Errorf("instance: nothing to save in %s", i.Dir)
}
i.State.UpdatedAt = time.Now().UTC().Truncate(time.Second)
- if err := i.State.Save(i.StatePath()); err != nil {
- return err
- }
- if fromV1 {
- return removeIfExists(i.Path(EnvFileName))
- }
- return nil
+ return i.State.Save(i.StatePath())
}
func removeIfExists(path string) error {
diff --git a/fluxer_rexctl/internal/instance/state.go b/fluxer_rexctl/internal/instance/state.go
index 88a3b7ca0..78e45cc88 100644
--- a/fluxer_rexctl/internal/instance/state.go
+++ b/fluxer_rexctl/internal/instance/state.go
@@ -104,10 +104,10 @@ func LoadState(path string) (*State, error) {
return nil, err
}
dir := filepath.Dir(filepath.Dir(path))
- return ParseState(data, dir, filepath.Join(dir, EnvFileName))
+ return ParseState(data, dir)
}
-func ParseState(data []byte, dir, envPath string) (*State, error) {
+func ParseState(data []byte, dir string) (*State, error) {
var head struct {
Schema int `json:"schema"`
Project string `json:"project"`
@@ -121,15 +121,7 @@ func ParseState(data []byte, dir, envPath string) (*State, error) {
if head.Project == "" {
return nil, fmt.Errorf("instance: the state in %s names no project", dir)
}
- var (
- s *State
- err error
- )
- if head.Schema < StateSchema {
- s, err = migrateV1(data, dir, envPath)
- } else {
- s, err = parseV2(data, dir)
- }
+ s, err := parseState(data, dir)
if err != nil {
return nil, err
}
@@ -143,7 +135,7 @@ var stateFields = map[string]bool{
"installed_at": true, "updated_at": true,
}
-func parseV2(data []byte, dir string) (*State, error) {
+func parseState(data []byte, dir string) (*State, error) {
var raw map[string]json.RawMessage
if err := json.Unmarshal(data, &raw); err != nil {
return nil, fmt.Errorf("instance: reading state in %s: %w", dir, err)
diff --git a/fluxer_rexctl/internal/release/files.go b/fluxer_rexctl/internal/release/files.go
index f6c77ecf6..2d05789e3 100644
--- a/fluxer_rexctl/internal/release/files.go
+++ b/fluxer_rexctl/internal/release/files.go
@@ -110,7 +110,7 @@ func HasSnapshot(inst *instance.Instance, version string) bool {
if !exists(filepath.Join(dir, snapshotState)) {
return false
}
- return exists(filepath.Join(dir, StackDirName, stack.ProfilesFile)) || exists(filepath.Join(dir, oldEnvFile))
+ return exists(filepath.Join(dir, StackDirName, stack.ProfilesFile))
}
func SnapshotState(inst *instance.Instance, version string) (*instance.State, error) {
@@ -122,27 +122,15 @@ func SnapshotState(inst *instance.Instance, version string) (*instance.State, er
if err != nil {
return nil, err
}
- return instance.ParseState(data, inst.Dir, filepath.Join(dir, oldEnvFile))
+ return instance.ParseState(data, inst.Dir)
}
func LoadSet(inst *instance.Instance, version string) (*stack.Set, error) {
set, err := stack.LoadSet(StackDir(inst, version))
- if err == nil {
- return set, nil
- }
- if !errors.Is(err, fs.ErrNotExist) {
- return nil, err
- }
- dir := Dir(inst, version)
- if !exists(filepath.Join(dir, oldEnvFile)) || !exists(filepath.Join(dir, stack.ComposeFile)) {
+ if errors.Is(err, fs.ErrNotExist) {
return nil, ErrNoSnapshot
}
- files := os.DirFS(dir)
- vars, err := stack.FilesVars(files)
- if err != nil {
- return nil, err
- }
- return &stack.Set{Release: version, Files: files, Profiles: maps.Clone(stack.Embedded().Profiles), Vars: vars}, nil
+ return set, err
}
type Restored struct {
@@ -163,7 +151,7 @@ func Restore(inst *instance.Instance, version string) (*Restored, error) {
if err != nil {
return nil, err
}
- if len(saved.Images.Refs) == 0 && Valid(version) && exists(StackDir(inst, version)) {
+ if len(saved.Images.Refs) == 0 && Valid(version) {
return nil, fmt.Errorf("release: the snapshot of %s records no images", version)
}
r, err := stack.Render(set, stack.OverlaysFor(saved.Settings), saved.Images.Refs, inst.Project(), inst.Dir)