Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add test for listartifacts v4 filter #2507

Merged
merged 4 commits into from
Oct 29, 2024
Merged

add test for listartifacts v4 filter #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0aabb4
add test for listartifacts v4 filter
ChristopherHX Oct 28, 2024
f4cf1c9
Update artifacts.yml
ChristopherHX Oct 28, 2024
81527cd
use 32bit ids after cast to double we have a loss
ChristopherHX Oct 28, 2024
d07f371
Update artifacts.yml
ChristopherHX Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/artifacts/arifacts_v4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}) {
Expand Down Expand Up @@ -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(),
Expand Down
44 changes: 44 additions & 0 deletions pkg/artifacts/testdata/v4/artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading