fix(service): prevent image update flag from affecting service hash

yarlson · Jan 20, 2025 · 6bd17c7 · 6bd17c7
1 parent 2707202
commit 6bd17c7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -408,7 +408,9 @@ func extractNamedVolume(volRef string) string {
 }
 
 func (s *Service) Hash() (string, error) {
-	sortedService := s.sortServiceFields()
+	service := *s
+	service.ImageUpdated = false
+	sortedService := service.sortServiceFields()
 	bytes, err := json.Marshal(sortedService)
 	if err != nil {
 		return "", fmt.Errorf("failed to marshal sorted service: %w", err)

diff --git a/pkg/deployment/dependency.go b/pkg/deployment/dependency.go
@@ -58,4 +58,4 @@ func (d *Deployment) startDependency(project string, dependency *config.Dependen
 	}
 
 	return nil
-} 
+}
diff --git a/pkg/deployment/deployment.go b/pkg/deployment/deployment.go
@@ -3,11 +3,12 @@ package deployment
 import (
 	"context"
 	"fmt"
-	"github.com/yarlson/ftl/pkg/runner/local"
 	"io"
 	"path/filepath"
 	"strings"
 
+	"github.com/yarlson/ftl/pkg/runner/local"
+
 	"github.com/yarlson/ftl/pkg/config"
 	"github.com/yarlson/ftl/pkg/console"
 )

diff --git a/pkg/deployment/service.go b/pkg/deployment/service.go
@@ -3,10 +3,11 @@ package deployment
 import (
 	"context"
 	"fmt"
-	"github.com/yarlson/ftl/pkg/config"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/yarlson/ftl/pkg/config"
 )
 
 func (d *Deployment) deployServices(ctx context.Context, project string, services []config.Service) error {

diff --git a/pkg/deployment/volume.go b/pkg/deployment/volume.go
@@ -34,4 +34,4 @@ func (d *Deployment) createVolume(ctx context.Context, project, volume string) e
 	}
 
 	return nil
-} 
+}
diff --git a/pkg/tunnel/tunnel.go b/pkg/tunnel/tunnel.go
@@ -3,10 +3,11 @@ package tunnel
 import (
 	"context"
 	"fmt"
-	"github.com/yarlson/ftl/pkg/config"
 	"sync"
 	"time"
 
+	"github.com/yarlson/ftl/pkg/config"
+
 	"github.com/yarlson/ftl/pkg/ssh"
 )
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return nil
-    }
+    }