Skip to content

OSIS-167: contract test that OSIS keeps deactivated S3 credentials in the listing #165

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
anurag4DSB merged 2 commits into from
Jun 29, 2026
Merged

OSIS-167: contract test that OSIS keeps deactivated S3 credentials in the listing #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f4a11
OSIS-167: contract test that OSIS keeps deactivated S3 credentials in…
anurag4DSB Jun 25, 2026
675ab59
OSIS-167: declare loop variable final to satisfy PMD LocalVariableCou…
anurag4DSB Jun 26, 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
51 changes: 51 additions & 0 deletions osis-core/src/test/java/com/scality/osis/utils/ScalityModelConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,57 @@ void testToPageOfS3Credentials() {
assertEquals(TEST_SECRET_KEY, result.getSecretKey());
}

@Test
void testToPageOfS3CredentialsKeepsInactiveCredential() {
// OSIS must keep deactivated (Inactive) access keys in the credential listing as
// active=false, never filter them out. Verified live against an OSE 3.1 / VCD lab
// (OSIS returns the inactive key in both GET and LIST); this locks the mapping so a
// future change cannot start hiding inactive keys on the OSIS side.
final AccessKeyMetadata activeKey = new AccessKeyMetadata()
.withAccessKeyId(TEST_ACCESS_KEY)
.withCreateDate(new Date())
.withStatus(StatusType.Active)
.withUserName(TEST_USER_ID);
final AccessKeyMetadata inactiveKey = new AccessKeyMetadata()
.withAccessKeyId(TEST_ACCESS_KEY_2)
.withCreateDate(new Date())
.withStatus(StatusType.Inactive)
.withUserName(TEST_USER_ID);

final List<AccessKeyMetadata> accessKeyMetadataList = new ArrayList<>();
accessKeyMetadataList.add(activeKey);
accessKeyMetadataList.add(inactiveKey);

final ListAccessKeysResult listAccessKeysResult = new ListAccessKeysResult()
.withAccessKeyMetadata(accessKeyMetadataList);

final Map<String, String> secretKeyMap = new HashMap<>();
secretKeyMap.put(TEST_ACCESS_KEY, TEST_SECRET_KEY);

final OsisTenant osisTenant = new OsisTenant();
osisTenant.tenantId(SAMPLE_TENANT_ID);
osisTenant.name(SAMPLE_TENANT_NAME);
osisTenant.cdTenantIds(SAMPLE_CD_TENANT_IDS);
osisTenant.active(true);

// Run the test
final PageOfS3Credentials pageOfS3Credentials = ScalityModelConverter
.toPageOfS3Credentials(listAccessKeysResult, 0, 1000, osisTenant, secretKeyMap);

// Verify: both keys are returned (the inactive one is not dropped)
assertEquals(2, pageOfS3Credentials.getItems().size());

final Map<String, Boolean> activeByKey = new HashMap<>();
for (final OsisS3Credential cred : pageOfS3Credentials.getItems()) {
activeByKey.put(cred.getAccessKey(), cred.getActive());
}
assertTrue(activeByKey.containsKey(TEST_ACCESS_KEY_2),
"deactivated key must still appear in the listing");
assertEquals(Boolean.TRUE, activeByKey.get(TEST_ACCESS_KEY));
assertEquals(Boolean.FALSE, activeByKey.get(TEST_ACCESS_KEY_2),
"deactivated key must be active=false, not hidden");
}

@Test
void testToPageOfS3CredentialsNotAvailableKey() {
// Setup
Expand Down
Loading