Skip to content

Commit

Permalink
fix(cf): Filter by provider type when deciding which accounts to dele…
Browse files Browse the repository at this point in the history
…te (#3755)
  • Loading branch information
Jon Schneider authored and Jammy Louie committed Jun 6, 2019
1 parent f41af2c commit a9a8b2a
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ private List<String> getDeletedAccountNames(
CloudFoundryConfigurationProperties cloudFoundryConfigurationProperties) {
List<String> existingNames =
accountCredentialsRepository.getAll().stream()
.filter(c -> CloudFoundryProvider.PROVIDER_ID.equals(c.getCloudProvider()))
.map(AccountCredentials::getName)
.collect(Collectors.toList());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,45 @@ void setUp() {
provider, configurationProperties, repository, catsModule, registry);
}

private class StaticOtherProviderCredentials implements AccountCredentials<Void> {
@Override
public String getName() {
return "unchanged-other-provider";
}

@Override
public String getEnvironment() {
return null;
}

@Override
public String getAccountType() {
return null;
}

@Override
public Void getCredentials() {
return null;
}

@Override
public String getCloudProvider() {
return "other";
}

@Override
public List<String> getRequiredGroupMembership() {
return null;
}
}

@Test
void synchronize() {
repository.save("to-be-changed", createCredentials("to-be-changed"));
repository.save("unchanged2", createCredentials("unchanged2"));
repository.save("unchanged3", createCredentials("unchanged3"));
repository.save("to-be-deleted", createCredentials("to-be-deleted"));
repository.save("unchanged-other-provider", new StaticOtherProviderCredentials());

loadProviderFromRepository();

Expand All @@ -91,7 +124,8 @@ void synchronize() {

assertThat(repository.getAll())
.extracting(AccountCredentials::getName)
.containsExactlyInAnyOrder("unchanged2", "unchanged3", "added", "to-be-changed");
.containsExactlyInAnyOrder(
"unchanged2", "unchanged3", "added", "to-be-changed", "unchanged-other-provider");

assertThat(ProviderUtils.getScheduledAccounts(provider))
.containsExactlyInAnyOrder("unchanged2", "unchanged3", "added", "to-be-changed");
Expand Down

0 comments on commit a9a8b2a

Please sign in to comment.