Skip to content

Commit d3d34d4

Browse files
committed
Revert "Set vault ID as vendor key in profile."
This reverts commit 4a5d284.
1 parent 051d8bb commit d3d34d4

File tree

4 files changed

+6
-53
lines changed

4 files changed

+6
-53
lines changed

hub/src/main/java/cloud/katta/protocols/hub/HubAwareProfile.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88
import ch.cyberduck.core.Protocol;
99

1010
import cloud.katta.client.model.ConfigDto;
11-
import cloud.katta.client.model.VaultDto;
1211
import cloud.katta.model.StorageProfileDtoWrapper;
1312
import cloud.katta.protocols.hub.serializer.HubConfigDtoDeserializer;
1413
import cloud.katta.protocols.hub.serializer.StorageProfileDtoWrapperDeserializer;
15-
import cloud.katta.protocols.hub.serializer.VaultDtoDeserializer;
1614

1715
public final class HubAwareProfile extends Profile {
1816
private final HubSession hub;
1917

20-
public HubAwareProfile(final HubSession hub, final Protocol parent, final ConfigDto configDto, final StorageProfileDtoWrapper storageProfile, final VaultDto vaultDto) {
21-
super(parent, new HubConfigDtoDeserializer(configDto, new StorageProfileDtoWrapperDeserializer(storageProfile, new VaultDtoDeserializer(vaultDto))));
18+
public HubAwareProfile(final HubSession hub, final Protocol parent, final ConfigDto configDto, final StorageProfileDtoWrapper storageProfile) {
19+
super(parent, new HubConfigDtoDeserializer(configDto, new StorageProfileDtoWrapperDeserializer(storageProfile)));
2220
this.hub = hub;
2321
}
2422

hub/src/main/java/cloud/katta/protocols/hub/HubVaultListService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public AttributedList<Path> list(final Path directory, final ListProgressListene
6767
case S3_STS:
6868
final ProtocolFactory protocols = ProtocolFactory.get();
6969
final Profile profile = new HubAwareProfile(session, protocols.forType(protocols.find(ProtocolFactory.BUNDLED_PROFILE_PREDICATE), Protocol.Type.s3),
70-
session.getConfig(), storageProfile, vaultDto);
70+
session.getConfig(), storageProfile);
7171
log.debug("Register profile {}", profile);
7272
protocols.register(profile);
7373
break;

hub/src/main/java/cloud/katta/protocols/hub/serializer/StorageProfileDtoWrapperDeserializer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ public String stringForKey(final String key) {
8080
return new S3AssumeRoleProtocol().getIdentifier();
8181
}
8282
break;
83+
case VENDOR_KEY:
84+
return dto.getId().toString();
8385
case DEFAULT_NICKNAME_KEY:
8486
return dto.getName();
8587
case SCHEME_KEY:
@@ -116,6 +118,7 @@ public List<String> keys() {
116118
final List<String> keys = new ArrayList<>(super.keys());
117119
keys.addAll(Arrays.asList(
118120
PROTOCOL_KEY,
121+
VENDOR_KEY,
119122
PROPERTIES_KEY,
120123
OAUTH_CONFIGURABLE_KEY)
121124
);

hub/src/main/java/cloud/katta/protocols/hub/serializer/VaultDtoDeserializer.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)