Skip to content

[pull] develop from IQSS:develop #769

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

Merged
pull merged 5 commits into from
Feb 23, 2026
Merged

[pull] develop from IQSS:develop #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3087780
Bump aquasecurity/setup-trivy from 0.2.4 to 0.2.5
dependabot[bot] Jan 15, 2026
3b8088c
Merge branch 'develop' into dependabot/github_actions/aquasecurity/se…
pdurbin Feb 17, 2026
80c1c63
more delays for indexing, cleanup
qqmyers Feb 20, 2026
ddd3e94
Merge pull request #12173 from GlobalDataverseCommunityConsortium/MyD…
pdurbin Feb 23, 2026
b761723
Merge pull request #12083 from IQSS/dependabot/github_actions/aquasec…
pdurbin Feb 23, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/container_maintenance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
with:
platforms: ${{ env.PLATFORMS }}
- name: Setup Trivy binary for vulnerability scanning
uses: aquasecurity/setup-trivy@v0.2.4
uses: aquasecurity/setup-trivy@v0.2.5
with:
version: v0.63.0

Expand Down
9 changes: 6 additions & 3 deletions src/test/java/edu/harvard/iq/dataverse/api/DataRetrieverApiIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ public static void setUpClass() {
}

@Test
public void testRetrieveMyDataAsJsonString() {
public void testRetrieveMyDataAsJsonString() throws InterruptedException {
// Call with bad API token
ArrayList<Long> emptyRoleIdsList = new ArrayList<>();
Response badApiTokenResponse = UtilIT.retrieveMyDataAsJsonString("bad-token", "dummy-user-identifier", emptyRoleIdsList);
badApiTokenResponse.then().assertThat().body("status", equalTo(ApiConstants.STATUS_ERROR)).body("message", equalTo(ApiKeyAuthMechanism.RESPONSE_MESSAGE_BAD_API_KEY)).statusCode(UNAUTHORIZED.getStatusCode());

// Call as superuser with invalid user identifier
Response createUserResponse = UtilIT.createRandomUser();
Response makeSuperUserResponse = UtilIT.makeSuperUser(UtilIT.getUsernameFromResponse(createUserResponse));
Response makeSuperUserResponse = UtilIT.setSuperuserStatus(UtilIT.getUsernameFromResponse(createUserResponse), true);
assertEquals(OK.getStatusCode(), makeSuperUserResponse.getStatusCode());
String superUserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);

Expand Down Expand Up @@ -87,6 +87,7 @@ public void testRetrieveMyDataAsJsonString() {
// Call as normal user with one valid dataverse role and one dataverse result
UtilIT.grantRoleOnDataverse(dataverseAlias, DataverseRole.DS_CONTRIBUTOR.toString(),
"@" + normalUserUsername, superUserApiToken);
Thread.sleep(4000);
Response oneDataverseResponse = UtilIT.retrieveMyDataAsJsonString(normalUserApiToken, "", new ArrayList<>(Arrays.asList(5L)));
oneDataverseResponse.prettyPrint();

Expand Down Expand Up @@ -118,7 +119,7 @@ public void testRetrieveMyDataCollections() throws InterruptedException {
Response retrieveMyCollectionListResponse;
// Create Superuser
Response createUserResponse = UtilIT.createRandomUser();
Response makeSuperUserResponse = UtilIT.makeSuperUser(UtilIT.getUsernameFromResponse(createUserResponse));
Response makeSuperUserResponse = UtilIT.setSuperuserStatus(UtilIT.getUsernameFromResponse(createUserResponse), true);
assertEquals(OK.getStatusCode(), makeSuperUserResponse.getStatusCode());
String superUserUsername = UtilIT.getUsernameFromResponse(createUserResponse);
String superUserApiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
Expand Down Expand Up @@ -476,6 +477,8 @@ public void testRetrieveMyDataWithCollections() {

UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode());

UtilIT.sleepForReindex(datasetPid, apiToken, 5);

// Test that the Dataverse collection that the dataset was created in is returned
Response myDataResponse = UtilIT.retrieveMyDataAsJsonString(apiToken, "", new ArrayList<>(Arrays.asList(6L)), "&show_collections=true");
myDataResponse.prettyPrint();
Expand Down
⚡