diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-02-18 18:09:24 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-02-21 09:04:11 +0100 |
commit | a294cb2b68d5989572b3a74886c8bf3be225e715 (patch) | |
tree | 4fd58b2afab7284eb6afb9f06ac1f4ca55ac14b6 /controller-api | |
parent | c7d896f7484b629aef89ebd511e715ce85ba6a30 (diff) |
Merge OktaAccessToken and OktaIdentityToken into OAuthCredentials
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java index 63212c9c200..121abc8c9e3 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java @@ -9,9 +9,7 @@ import com.yahoo.vespa.athenz.api.AthenzPolicy; import com.yahoo.vespa.athenz.api.AthenzResourceName; import com.yahoo.vespa.athenz.api.AthenzRole; import com.yahoo.vespa.athenz.api.AthenzService; -import com.yahoo.vespa.athenz.api.AthenzUser; -import com.yahoo.vespa.athenz.api.OktaAccessToken; -import com.yahoo.vespa.athenz.api.OktaIdentityToken; +import com.yahoo.vespa.athenz.api.OAuthCredentials; import com.yahoo.vespa.athenz.client.zms.RoleAction; import com.yahoo.vespa.athenz.client.zms.ZmsClient; import com.yahoo.vespa.athenz.client.zms.ZmsClientException; @@ -48,15 +46,13 @@ public class ZmsClientMock implements ZmsClient { } @Override - public void createTenancy(AthenzDomain tenantDomain, AthenzIdentity providerService, - OktaIdentityToken identityToken, OktaAccessToken accessToken) { + public void createTenancy(AthenzDomain tenantDomain, AthenzIdentity providerService, OAuthCredentials oAuthCredentials) { log("createTenancy(tenantDomain='%s')", tenantDomain); getDomainOrThrow(tenantDomain, false).isVespaTenant = true; } @Override - public void deleteTenancy(AthenzDomain tenantDomain, AthenzIdentity providerService, - OktaIdentityToken identityToken, OktaAccessToken accessToken) { + public void deleteTenancy(AthenzDomain tenantDomain, AthenzIdentity providerService, OAuthCredentials oAuthCredentials) { log("deleteTenancy(tenantDomain='%s')", tenantDomain); AthenzDbMock.Domain domain = getDomainOrThrow(tenantDomain, false); domain.isVespaTenant = false; @@ -66,7 +62,7 @@ public class ZmsClientMock implements ZmsClient { @Override public void createProviderResourceGroup(AthenzDomain tenantDomain, AthenzIdentity providerService, String resourceGroup, - Set<RoleAction> roleActions, OktaIdentityToken identityToken, OktaAccessToken accessToken) { + Set<RoleAction> roleActions, OAuthCredentials oAuthCredentials) { log("createProviderResourceGroup(tenantDomain='%s', resourceGroup='%s')", tenantDomain, resourceGroup); AthenzDbMock.Domain domain = getDomainOrThrow(tenantDomain, true); ApplicationId applicationId = new ApplicationId(resourceGroup); @@ -77,7 +73,7 @@ public class ZmsClientMock implements ZmsClient { @Override public void deleteProviderResourceGroup(AthenzDomain tenantDomain, AthenzIdentity providerService, String resourceGroup, - OktaIdentityToken identityToken, OktaAccessToken accessToken) { + OAuthCredentials oAuthCredentials) { log("deleteProviderResourceGroup(tenantDomain='%s', resourceGroup='%s')", tenantDomain, resourceGroup); getDomainOrThrow(tenantDomain, true).applications.remove(new ApplicationId(resourceGroup)); } |