add test for listartifacts v4 filter (#2507)

* add test for listartifacts v4 filter * fixes a defect of last change * Update artifacts.yml * use 32bit ids after cast to double we have a loss * Update artifacts.yml
nektos · Oct 29, 2024 · e3b4e3a · e3b4e3a
1 parent 2c0e3fe
commit e3b4e3a
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/pkg/artifacts/arifacts_v4.go b/pkg/artifacts/arifacts_v4.go
@@ -121,9 +121,9 @@ type ArtifactContext struct {
 }
 
 func artifactNameToID(s string) int64 {
-	h := fnv.New64a()
+	h := fnv.New32a()
 	h.Write([]byte(s))
-	return int64(h.Sum64())
+	return int64(h.Sum32())
 }
 
 func (c ArtifactContext) Error(status int, _ ...interface{}) {
@@ -376,7 +376,7 @@ func (r *artifactV4Routes) listArtifacts(ctx *ArtifactContext) {
 
 	for _, entry := range entries {
 		id := artifactNameToID(entry.Name())
-		if (req.NameFilter == nil || req.NameFilter.Value == entry.Name()) || (req.IdFilter == nil || req.IdFilter.Value == id) {
+		if (req.NameFilter == nil || req.NameFilter.Value == entry.Name()) && (req.IdFilter == nil || req.IdFilter.Value == id) {
 			data := &ListArtifactsResponse_MonolithArtifact{
 				Name:                    entry.Name(),
 				CreatedAt:               timestamppb.Now(),

diff --git a/pkg/artifacts/testdata/v4/artifacts.yml b/pkg/artifacts/testdata/v4/artifacts.yml
@@ -17,16 +17,29 @@ jobs:
         strategy:
         ${{ tojson(strategy) }}            
       shell: cp {0} context.txt
+    - run: echo Artifact2 > data.txt
+
     - uses: actions/upload-artifact@v4
       with:
         name: test
         path: context.txt
 
+    - uses: actions/upload-artifact@v4
+      with:
+        name: test2
+        path: data.txt
+
     - uses: actions/download-artifact@v4
       with:
         name: test
         path: out
     - run: cat out/context.txt
+
+    - name: assert
+      run: |
+        [[ "$(cat context.txt)" = "$(cat out/context.txt)" ]] || exit 1
+      shell: bash
+
     - run: |
         No content        
       shell: cp {0} context.txt
@@ -41,3 +54,34 @@ jobs:
         name: test
         path: out2
     - run: cat out2/context.txt
+
+    - name: assert 2
+      run: |
+        [[ "$(cat context.txt)" = "$(cat out2/context.txt)" ]] || exit 1
+      shell: bash
+
+    - uses: actions/download-artifact@v4
+      with:
+        name: test2
+        path: out3
+    - run: cat out3/data.txt
+
+    - name: assert 3
+      run: |
+        [[ "$(cat data.txt)" = "$(cat out3/data.txt)" ]] || exit 1
+      shell: bash
+
+    - uses: actions/download-artifact@v4
+      with:
+        pattern: "test*"
+        path: out4
+        merge-multiple: true
+
+    - run: cat out4/data.txt
+    - run: cat out4/context.txt
+
+    - name: assert 4
+      run: |
+        [[ "$(cat context.txt)" = "$(cat out4/context.txt)" ]] || exit 1
+        [[ "$(cat data.txt)" = "$(cat out4/data.txt)" ]] || exit 1
+      shell: bash