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 support for artifacts uploaded by actions/upload-artifact@v4 #1791

Merged
merged 10 commits into from
Mar 9, 2024
Merged

Add support for artifacts uploaded by actions/upload-artifact@v4 #1791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31028a2
Add support for artifacts uploaded by actions/upload-artifact@v4
gsmet Feb 13, 2024
e5d19b8
Add support for Git longpaths on Windows CI
gsmet Feb 13, 2024
c3b1be4
Update src/main/java11/org/kohsuke/github/extras/HttpClientGitHubConn…
bitwiseman Feb 20, 2024
773391b
Merge branch 'main' into support-upload-artifact-v4
bitwiseman Feb 20, 2024
1d303f7
Move redirect handling to GitHubClient
bitwiseman Feb 21, 2024
e22a29d
WIP
bitwiseman Feb 21, 2024
926998e
Make snapshot file names based on mapping file information
bitwiseman Feb 22, 2024
5b75ade
For redirect host is only same if ports are also same
bitwiseman Feb 23, 2024
5557e97
Delete .vscode/launch.json
bitwiseman Feb 23, 2024
07acfde
Verify removal of header when redirecting
bitwiseman Mar 8, 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
4 changes: 4 additions & 0 deletions src/test/java/org/kohsuke/github/GHWorkflowRunTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,10 @@ public void testLogs() throws IOException {
@SuppressWarnings("resource")
@Test
public void testArtifacts() throws IOException {
// Recorded with Authorization, then manually updated
snapshotNotAllowed();

mockGitHub.customizeRecordSpec(recordSpecBuilder -> recordSpecBuilder.captureHeader("Authorization"));
GHWorkflow workflow = repo.getWorkflow(ARTIFACTS_WORKFLOW_PATH);

long latestPreexistingWorkflowRunId = getLatestPreexistingWorkflowRunId();
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ void renameFiles() throws IOException {
if (!filePath.equals(renamedFilePath)) {
Files.move(filePath, renamedFilePath);
}
if (bodyPath != null && !bodyPath.equals(renamedFilePath)) {
Files.move(filePath, renamedFilePath);
if (bodyPath != null && !bodyPath.equals(renamedBodyPath)) {
Files.move(bodyPath, renamedBodyPath);
}
}

Expand Down
3 changes: 3 additions & 0 deletions ...uke/github/GHWorkflowRunTest/wiremock/testArtifacts/mappings/1-r_h_ghworkflowruntest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...orkflowRunTest/wiremock/testArtifacts/mappings/10-r_h_g_actions_artifacts_1242831517.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions .../github/GHWorkflowRunTest/wiremock/testArtifacts/mappings/11-r_h_g_actions_artifacts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...orkflowRunTest/wiremock/testArtifacts/mappings/12-r_h_g_actions_artifacts_1242831742.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...orkflowRunTest/wiremock/testArtifacts/mappings/13-r_h_g_actions_artifacts_1242831742.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...Test/wiremock/testArtifacts/mappings/2-r_h_g_actions_workflows_artifacts-workflowyml.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...ohsuke/github/GHWorkflowRunTest/wiremock/testArtifacts/mappings/3-r_h_g_actions_runs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...RunTest/wiremock/testArtifacts/mappings/4-r_h_g_actions_workflows_7433027_dispatches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
},
"bodyPatterns": [
Expand Down
3 changes: 3 additions & 0 deletions ...ohsuke/github/GHWorkflowRunTest/wiremock/testArtifacts/mappings/5-r_h_g_actions_runs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...lowRunTest/wiremock/testArtifacts/mappings/6-r_h_g_actions_runs_7892624040_artifacts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...flowRunTest/wiremock/testArtifacts/mappings/7-r_h_g_actions_artifacts_1242831742_zip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...flowRunTest/wiremock/testArtifacts/mappings/8-r_h_g_actions_artifacts_1242831517_zip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...WorkflowRunTest/wiremock/testArtifacts/mappings/9-r_h_g_actions_artifacts_1242831742.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"equalTo": "Basic cGxhY2Vob2xkZXItdXNlcjpwbGFjZWhvbGRlci1wYXNzd29yZA=="
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...testArtifacts_actions-user-content/mappings/1-u_a_p_1_runs_75_signedartifactscontent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"absent" : true
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions ...est/wiremock/testArtifacts_blob-core-windows-net/mappings/1-a_9_w_artifacts_41e13e58.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"headers": {
"Accept": {
"equalTo": "application/vnd.github.v3+json"
},
"Authorization": {
"absent" : true
Copy link
Member

@bitwiseman bitwiseman Mar 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gsmet Verified that the header is removed for the redirected requests!

}
}
},
Expand Down