Merge branch 'main' into reconciliation

Author: ndeloof

pkg/api/api.go

@@ -278,6 +278,8 @@ type CreateOptions struct {
 	Timeout *time.Duration
 	// QuietPull makes the pulling process quiet
 	QuietPull bool
+	// SkipProviders skips provider services during convergence (e.g. watch rebuild)
+	SkipProviders bool
 }
 
 // StartOptions group options of the Start API

pkg/compose/create.go

@@ -125,6 +125,7 @@ func (s *composeService) create(ctx context.Context, project *types.Project, opt
 		Inherit:              options.Inherit,
 		Timeout:              options.Timeout,
 		RemoveOrphans:        options.RemoveOrphans,
+		SkipProviders:        options.SkipProviders,
 	})
 	if err != nil {
 		return err

pkg/compose/plugins.go

@@ -125,10 +125,10 @@ func (s *composeService) executePlugin(cmd *exec.Cmd, command string, service ty
 		}
 		switch msg.Type {
 		case ErrorType:
-			s.events.On(newEvent(service.Name, api.Error, msg.Message))
+			s.events.On(newEvent(service.Name, api.Error, firstLine(msg.Message)))
 			return nil, errors.New(msg.Message)
 		case InfoType:
-			s.events.On(newEvent(service.Name, api.Working, msg.Message))
+			s.events.On(newEvent(service.Name, api.Working, firstLine(msg.Message)))
 		case SetEnvType:
 			key, val, found := strings.Cut(msg.Message, "=")
 			if !found {
@@ -281,3 +281,12 @@ func (c CommandMetadata) CheckRequiredParameters(provider types.ServiceProviderC
 	}
 	return nil
 }
+
+// firstLine returns the first line of s, stripping any trailing newlines.
+func firstLine(s string) string {
+	s = strings.TrimRight(s, "\n")
+	if i := strings.IndexByte(s, '\n'); i >= 0 {
+		return s[:i]
+	}
+	return s
+}

pkg/compose/reconcile.go

@@ -259,6 +259,7 @@ type ReconcileOptions struct {
 	Inherit              bool
 	Timeout              *time.Duration
 	RemoveOrphans        bool
+	SkipProviders        bool // skip provider services (e.g. watch rebuild)
 	StartContainers      bool // include OpStartContainer in the plan (true for up, false for create)
 }
 
@@ -357,6 +358,11 @@ func reconcileServices(
 		}
 
 		if service.Provider != nil {
+			// Skip provider services when the caller opted out (e.g. watch rebuild),
+			// since providers were already set up during initial "up".
+			if opts.SkipProviders {
+				continue
+			}
 			id := fmt.Sprintf("run-plugin:%s", service.Name)
 			plan.Operations[id] = &Operation{
 				ID:          id,

pkg/compose/watch.go

@@ -662,9 +662,10 @@ func (s *composeService) rebuild(ctx context.Context, project *types.Project, se
 	options.LogTo.Log(api.WatchLogger, fmt.Sprintf("service(s) %q successfully built", services))
 
 	err = s.create(ctx, project, api.CreateOptions{
-		Services: services,
-		Inherit:  true,
-		Recreate: api.RecreateForce,
+		Services:      services,
+		Inherit:       true,
+		Recreate:      api.RecreateForce,
+		SkipProviders: true,
 	})
 	if err != nil {
 		options.LogTo.Log(api.WatchLogger, fmt.Sprintf("Failed to recreate services after update. Error: %v", err))