fixup! feat: implicit container contributions

Author: AObuchow

pkg/library/flatten/merge.go

@@ -226,35 +226,35 @@ func mergeContainerContributions(flattenedSpec *dw.DevWorkspaceTemplateSpec) err
 //
 // If no suitable merge target is found, an error is returned.
 func findMergeTarget(flattenedSpec *dw.DevWorkspaceTemplateSpec) (mergeTargetComponentName string, err error) {
-	// First check for explicit merge contributtion attribute
+	firstComponent := ""
 	for _, component := range flattenedSpec.Components {
 		if component.Container == nil {
 			continue
 		}
 
 		if component.Attributes.Exists(constants.MergeContributionAttribute) {
+			// Check for explicit merge contributtion attribute
 			if component.Attributes.GetBoolean(constants.MergeContributionAttribute, nil) {
 				return component.Name, nil
 			}
-		}
-	}
-
-	// Then see if there's a container that can implicitly be selected as a merge target
-	for _, component := range flattenedSpec.Components {
-		if component.Container == nil {
-			continue
-		}
-
-		// Don't select components that opt out as a merge contribution target
-		if component.Attributes.Exists(constants.MergeContributionAttribute) && !component.Attributes.GetBoolean(constants.MergeContributionAttribute, nil) {
+			// Don't select components that opt out as a merge contribution target
 			continue
 		}
 
 		// The target must not have been imported by a plugin or parent.
 		if component.Attributes.Exists(constants.PluginSourceAttribute) {
 			continue
 		}
-		return component.Name, nil
+
+		// There might be other components that explicitly opt in as a merge target,
+		// so don't return immediately
+		if firstComponent == "" {
+			firstComponent = component.Name
+		}
+	}
+
+	if firstComponent != "" {
+		return firstComponent, nil
 	}
 
 	return "", fmt.Errorf("couldn't find any merge contribution target component")