Skip to content

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

TypeScript fluxerfluxerapp

refactor(rexctl): drop unused takeover conversion fields

Hampus1442f3b5bfba
diff --git a/fluxer_rexctl/cmd/upgrade.go b/fluxer_rexctl/cmd/upgrade.go
index 2ba9ed04b..a52479d70 100644
--- a/fluxer_rexctl/cmd/upgrade.go
+++ b/fluxer_rexctl/cmd/upgrade.go
@@ -621,7 +621,7 @@ func nextState(inst *instance.Instance, set *stack.Set, images stack.ImageSet, t
}
var pins []string
if cur.Release == stack.LegacyRelease {
- pins = slices.Sorted(maps.Keys(instance.ConvertLegacy(&next, set, next.Images.Refs).Pins))
+ pins = slices.Sorted(maps.Keys(instance.ConvertLegacy(&next, set, next.Images.Refs)))
}
if _, err := secrets.Mint(next.Secrets, true); err != nil {
return nil, nil, err
diff --git a/fluxer_rexctl/internal/instance/adopt.go b/fluxer_rexctl/internal/instance/adopt.go
index be7e2302a..0a2c9ef98 100644
--- a/fluxer_rexctl/internal/instance/adopt.go
+++ b/fluxer_rexctl/internal/instance/adopt.go
@@ -347,7 +347,7 @@ func (p *AdoptPlan) classify(name, shipped string) {
if err != nil {
return
}
- if !isShipped(shipped, data, p.rendered) {
+ if !isShipped(shipped, data) {
p.keepMine(name)
}
}
@@ -527,7 +527,7 @@ func overlayFor(path, dir string) string {
return ""
}
-func isShipped(name string, data []byte, extra map[string]string) bool {
+func isShipped(name string, data []byte) bool {
sum := sha256.Sum256(normalizeLF(data))
h := hex.EncodeToString(sum[:])
if slices.Contains(shippedHashes[name], h) {
diff --git a/fluxer_rexctl/internal/instance/convert.go b/fluxer_rexctl/internal/instance/convert.go
index 80e3a995e..c12c7764b 100644
--- a/fluxer_rexctl/internal/instance/convert.go
+++ b/fluxer_rexctl/internal/instance/convert.go
@@ -11,13 +11,10 @@ import (
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/stack"
)
-func ConvertLegacy(s *State, next *stack.Set, nextImages map[string]string) *LegacyConversion {
- c := &LegacyConversion{Pins: map[string]string{}}
+func ConvertLegacy(s *State, next *stack.Set, nextImages map[string]string) map[string]string {
+ pins := map[string]string{}
for _, k := range legacyImageVars {
- if _, ok := s.Settings[k]; ok {
- delete(s.Settings, k)
- c.Dropped = append(c.Dropped, k)
- }
+ delete(s.Settings, k)
}
infra := map[string]string{}
for svc, v := range settings.ImageVars {
@@ -38,14 +35,14 @@ func ConvertLegacy(s *State, next *stack.Set, nextImages map[string]string) *Leg
continue
}
s.Settings[settings.ImagesPrefix+svc] = v
- c.Pins[svc] = v
+ pins[svc] = v
}
if v, ok := s.Settings[tunnelBindVar]; ok && s.Settings[settings.EdgeMode] == settings.EdgeTunnel && slices.Contains(next.Vars, edgeBindVar) {
delete(s.Settings, tunnelBindVar)
s.Settings[settings.EdgeBind] = v
}
stack.ConvertLegacySettings(s.Settings)
- return c
+ return pins
}
const (