fix: make the unittest to be correct

Author: LinuxSuRen

.github/workflows/pull-request.yaml

@@ -23,6 +23,14 @@ jobs:
       - name: Test
         run: |
           go test ./... -coverprofile coverage.out
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: coverage.out
+          flags: unittests
+          name: codecov-umbrella
+          fail_ci_if_error: true
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2.9.1
         with:

README.md

@@ -1,2 +1,4 @@
+[![codecov](https://codecov.io/gh/LinuxSuRen/github-action-workflow/branch/master/graph/badge.svg?token=mnFyeD2IQ7)](https://codecov.io/gh/LinuxSuRen/github-action-workflow)
+
 # github-action-workflow
 GitHub Actions compatible workflows

pkg/argo-workflow.go

@@ -40,6 +40,7 @@ func (w *Workflow) ConvertToArgoWorkflow() (output string, err error) {
 			} else {
 				w.Jobs[i].Steps[j].Image = defaultImage
 			}
+			w.Jobs[i].Steps[j].Run = strings.TrimSpace(w.Jobs[i].Steps[j].Run)
 		}
 
 		// TODO currently we can only handle one job
@@ -51,7 +52,7 @@ func (w *Workflow) ConvertToArgoWorkflow() (output string, err error) {
 
 	data := bytes.NewBuffer([]byte{})
 	if err = t.Execute(data, w); err == nil {
-		output = data.String()
+		output = strings.TrimSpace(data.String())
 	}
 	return
 }
@@ -63,7 +64,6 @@ metadata:
   name: {{.Name}}
 spec:
   entrypoint: main
-
   volumeClaimTemplates:
     - metadata:
         name: work
@@ -74,38 +74,39 @@ spec:
             storage: 64Mi
 
   templates:
-  - name: main
-    steps:
-  {{- range $key, $job := .Jobs}}
-  {{- range $i, $step := $job.Steps}}
-  {{if $step.Image}}
-    - - name: {{$step.Name}}
-        template: {{$step.Name}}
-  {{end}}
-  {{- end}}
-  {{end}}
+    - name: main
+      dag:
+        tasks:
+      {{- range $key, $job := .Jobs}}
+      {{- range $i, $step := $job.Steps}}
+      {{- if $step.Image}}
+          - name: {{$step.Name}}
+            template: {{$step.Name}}
+      {{- end}}
+      {{- end}}
+      {{- end}}
 
-  {{- range $key, $job := .Jobs}}
-  {{- range $i, $step := $job.Steps}}
-  {{if $step.Image}}
-  - name: {{$step.Name}}
-    script:
-      image: {{$step.Image}}
-      command: [sh]
-      {{if $step.Env}}
-      env:
-      {{- range $k, $v := $step.Env}}
-        - name: {{$k}}
-          value: {{$v}}
-      {{end}}
-      {{end}}
-      source: |
-        {{$step.Run}}
-      volumeMounts:
-        - mountPath: /work
-          name: work
-      workingDir: /work
-  {{end}}
-  {{- end}}
-  {{end}}
+      {{- range $key, $job := .Jobs}}
+      {{- range $i, $step := $job.Steps}}
+      {{- if $step.Image}}
+    - name: {{$step.Name}}
+      script:
+        image: {{$step.Image}}
+        command: [sh]
+        {{- if $step.Env}}
+        env:
+        {{- range $k, $v := $step.Env}}
+          - name: {{$k}}
+            value: {{$v}}
+        {{- end}}
+        {{- end}}
+        source: |
+          {{$step.Run}}
+        volumeMounts:
+          - mountPath: /work
+            name: work
+        workingDir: /work
+      {{- end}}
+      {{- end}}
+      {{- end}}
 `

pkg/argo-workflow_test.go

@@ -34,10 +34,7 @@ func TestWorkflow_ConvertToArgoWorkflow(t *testing.T) {
 
 			wantData, err := os.ReadFile(tt.argoWorkflows)
 			assert.Nil(t, err)
-
-			if gotOutput != string(wantData) {
-				t.Errorf("ConvertToArgoWorkflow() gotOutput = %v, want %v", gotOutput, string(wantData))
-			}
+			assert.Equal(t, string(wantData), gotOutput)
 		})
 	}
 }

pkg/data/argo-workflows.yaml

@@ -1,26 +1,61 @@
-apiVersion: argoproj.io/v1alpha1
-kind: WorkflowTemplate
-metadata:
-  name: script
-spec:
-  entrypoint: main
-  templates:
-    - name: main
-      steps:
-        - - name: shell
-            template: shell
-          - name: python
-            template: python
-    - name: shell
-      script:
-        image: alpine
-        command: [sh]
-        source: echo 1
-    - name: python
-      script:
-        image: python:alpine3.6
-        command: [python]
-        source: |
-          import random
-          i = random.randint(1, 100)
-          print(i)
+apiVersion: argoproj.io/v1alpha1
+kind: WorkflowTemplate
+metadata:
+  name: build
+spec:
+  entrypoint: main
+  volumeClaimTemplates:
+    - metadata:
+        name: work
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: 64Mi
+
+  templates:
+    - name: main
+      dag:
+        tasks:
+          - name: clone
+            template: clone
+          - name: test
+            template: test
+          - name: goreleaser
+            template: goreleaser
+    - name: clone
+      script:
+        image: alpine/git:v2.26.2
+        command: [sh]
+        source: |
+          git clone https://gitee.com/LinuxSuRen/yaml-readme .
+        volumeMounts:
+          - mountPath: /work
+            name: work
+        workingDir: /work
+    - name: test
+      script:
+        image: golang:1.18
+        command: [sh]
+        env:
+          - name: GOPROXY
+            value: https://goproxy.io,direct
+        source: |
+          go test ./... -coverprofile coverage.out
+        volumeMounts:
+          - mountPath: /work
+            name: work
+        workingDir: /work
+    - name: goreleaser
+      script:
+        image: goreleaser/goreleaser:v1.13.1
+        command: [sh]
+        env:
+          - name: GOPROXY
+            value: https://goproxy.io,direct
+        source: |
+          goreleaser release --skip-publish --rm-dist
+        volumeMounts:
+          - mountPath: /work
+            name: work
+        workingDir: /work