internal/assets/templates/delivery-pipeline.yaml.tmpl

@@ -357,31 +357,57 @@ spec:
     - name: manifests-repo
       default: {{ quote .ManifestsRepo }}
   workspaces:
-    - name: artifact
+    - name: source
   tasks:
-    - name: build-layer
+    - name: clone
       when:
         - input: $(params.event-action)
           operator: notin
           values: [closed]
       taskRef:
-        name: maidn-node-static-image
+        name: maidn-git-clone
       params:
         - name: url
           value: {{ quote .AppRepoURL }}
         - name: revision
           value: $(params.git-revision)
-        - name: image
-          value: $(params.image)
+      workspaces:
+        - name: source
+          workspace: source
+    - name: build-layer
+      runAfter: [clone]
+      when:
+        - input: $(params.event-action)
+          operator: notin
+          values: [closed]
+      taskRef:
+        name: maidn-node-static-build
+      params:
         - name: output-directory
           value: {{ quote .BuildOutputDirectory }}
         - name: build-configuration
           value: {{ quote .BuildConfiguration }}
       workspaces:
-        - name: artifact
-          workspace: artifact
-    - name: update-preview
+        - name: source
+          workspace: source
+    - name: push
       runAfter: [build-layer]
+      when:
+        - input: $(params.event-action)
+          operator: notin
+          values: [closed]
+      taskRef:
+        name: maidn-node-static-push
+      params:
+        - name: image
+          value: $(params.image)
+        - name: revision
+          value: $(params.git-revision)
+      workspaces:
+        - name: source
+          workspace: source
+    - name: update-preview
+      runAfter: [push]
       when:
         - input: $(params.event-type)
           operator: in
@@ -413,7 +439,7 @@ spec:
         - name: app-revision
           value: $(params.git-revision)
     - name: update-staging
-      runAfter: [build-layer]
+      runAfter: [push]
       when:
         - input: $(params.event-type)
           operator: in
@@ -439,7 +465,7 @@ spec:
         - name: environment
           value: staging
     - name: promote-production
-      runAfter: [build-layer]
+      runAfter: [push]
       when:
         - input: $(params.event-type)
           operator: in

internal/bootstrap/bootstrap.go

@@ -668,7 +668,7 @@ func renderAppDelivery(cfg config.Config) ([]byte, error) {
 	if err := tmpl.Execute(&rendered, values); err != nil {
 		return nil, err
 	}
-	return bytes.ReplaceAll(rendered.Bytes(), []byte("\r\n"), []byte("\n")), nil
+	return rendered.Bytes(), nil
 }
 
 func deliveryRepository(baseURL, repositoryURL string) (string, error) {

internal/bootstrap/bootstrap_test.go

@@ -108,7 +108,7 @@ func TestRemoveDuplicateAppDeliverySource(t *testing.T) {
 	}
 }
 
-func TestGeneratedDeliveryUsesCombinedStaticBuildArtifactContract(t *testing.T) {
+func TestGeneratedDeliveryIsGenericAndUsesSafePreviewCleanupContract(t *testing.T) {
 	cfg := config.Config{
 		Git:      config.GitConfig{BaseURL: "https://git.example.test", Owner: "platform"},
 		Flux:     config.FluxConfig{Branch: "main", ManifestsRepo: "manifests"},
@@ -118,15 +118,13 @@ func TestGeneratedDeliveryUsesCombinedStaticBuildArtifactContract(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	for _, expected := range []string{"name: build-layer", "maidn-node-static-image", "name: url\n          value: \"https://git.example.test/apps/web-ui.git\"", "name: revision\n          value: $(params.git-revision)", "name: image\n          value: $(params.image)", "name: artifact\n          workspace: artifact", "runAfter: [build-layer]", "maidn-preview-orphan-reconciler", "valid_pr_number()", "valid_commit()", "values: [promotion]", "values: [\"production\"]", "cmp -s \"$expected_marker\" \"$marker\"", "values: [closed]"} {
+	for _, expected := range []string{"maidn-git-clone", "maidn-node-static-build", "maidn-node-static-push", "runAfter: [clone]", "runAfter: [build-layer]", "maidn-preview-orphan-reconciler", "valid_pr_number()", "valid_commit()", "values: [promotion]", "values: [\"production\"]", "cmp -s \"$expected_marker\" \"$marker\"", "values: [closed]"} {
 		if !strings.Contains(string(content), expected) {
 			t.Fatalf("generated delivery does not contain %q", expected)
 		}
 	}
-	for _, unexpected := range []string{"maidn-git-clone", "maidn-node-static-build", "maidn-node-static-push", "runAfter: [clone]", "name: source", "workspace: source", "easycsr", "test-org", "git rm -r"} {
-		if strings.Contains(string(content), unexpected) {
-			t.Fatalf("generated delivery contains unexpected %q", unexpected)
-		}
+	if strings.Contains(string(content), "easycsr") || strings.Contains(string(content), "test-org") || strings.Contains(string(content), "git rm -r") {
+		t.Fatal("generated delivery contains a non-generic or unsafe literal")
 	}
 }