Skip to content

Commit 5393554

Browse files
chenkinschenkins
authored
Merge pull request #203 from shift7-ch/update-storage-profile
Update storage profile.
2 parents b67a8cc + 940dbb9 commit 5393554

27 files changed

+443
-375
lines changed

‎hub/src/main/java/cloud/katta/model/StorageProfileDtoWrapper.java‎

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import java.util.List;
88
import java.util.UUID;
99

10-
import cloud.katta.client.model.S3STORAGECLASSES;
1110
import cloud.katta.client.model.Protocol;
11+
import cloud.katta.client.model.S3STORAGECLASSES;
1212
import cloud.katta.client.model.StorageProfileDto;
13-
import cloud.katta.client.model.StorageProfileS3Dto;
1413
import cloud.katta.client.model.StorageProfileS3STSDto;
14+
import cloud.katta.client.model.StorageProfileS3StaticDto;
1515

1616
/**
1717
* openapi-generator does not generate sub-classes
@@ -32,8 +32,8 @@ public Class getType() {
3232
}
3333

3434
public Protocol getProtocol() {
35-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
36-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getProtocol();
35+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
36+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getProtocol();
3737
}
3838
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
3939
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getProtocol();
@@ -42,8 +42,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
4242
}
4343

4444
public UUID getId() {
45-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
46-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getId();
45+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
46+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getId();
4747
}
4848
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
4949
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getId();
@@ -52,8 +52,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
5252
}
5353

5454
public String getName() {
55-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
56-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getName();
55+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
56+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getName();
5757
}
5858
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
5959
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getName();
@@ -62,8 +62,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
6262
}
6363

6464
public String getHostname() {
65-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
66-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getHostname();
65+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
66+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getHostname();
6767
}
6868
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
6969
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getHostname();
@@ -72,8 +72,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
7272
}
7373

7474
public String getScheme() {
75-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
76-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getScheme();
75+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
76+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getScheme();
7777
}
7878
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
7979
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getScheme();
@@ -82,8 +82,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
8282
}
8383

8484
public Integer getPort() {
85-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
86-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getPort();
85+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
86+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getPort();
8787
}
8888
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
8989
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getPort();
@@ -92,7 +92,7 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
9292
}
9393

9494
public String getStsEndpoint() {
95-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
95+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
9696
// only STS
9797
return null;
9898
}
@@ -103,7 +103,7 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
103103
}
104104

105105
public Boolean getBucketAcceleration() {
106-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
106+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
107107
// only STS
108108
return null;
109109
}
@@ -114,9 +114,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
114114
}
115115

116116
public String getBucketPrefix() {
117-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
118-
// only STS
119-
return null;
117+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
118+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getBucketPrefix();
120119
}
121120
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
122121
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getBucketPrefix();
@@ -125,9 +124,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
125124
}
126125

127126
public String getRegion() {
128-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
129-
// only STS
130-
return null;
127+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
128+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getRegion();
131129
}
132130
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
133131
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getRegion();
@@ -136,51 +134,50 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
136134
}
137135

138136
public List<String> getRegions() {
139-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
140-
// only STS
141-
return null;
137+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
138+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getRegions();
142139
}
143140
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
144141
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getRegions();
145142
}
146143
return null;
147144
}
148145

149-
public String getStsRoleArn() {
150-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
146+
public String getStsRoleAccessBucketAssumeRoleWithWebIdentity() {
147+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
151148
// only STS
152149
return null;
153150
}
154151
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
155-
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsRoleArn();
152+
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsRoleAccessBucketAssumeRoleWithWebIdentity();
156153
}
157154
return null;
158155
}
159156

160-
public String getStsRoleArn2() {
161-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
157+
public String getStsRoleAccessBucketAssumeRoleTaggedSession() {
158+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
162159
// only STS
163160
return null;
164161
}
165162
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
166-
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsRoleArn2();
163+
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsRoleAccessBucketAssumeRoleTaggedSession();
167164
}
168165
return null;
169166
}
170167

171-
public String getStsRoleArnClient() {
172-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
168+
public String getStsRoleCreateBucketClient() {
169+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
173170
// only STS
174171
return null;
175172
}
176173
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
177-
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsRoleArnClient();
174+
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsRoleCreateBucketClient();
178175
}
179176
return null;
180177
}
181178

182179
public Integer getStsDurationSeconds() {
183-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
180+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
184181
// only STS
185182
return null;
186183
}
@@ -190,9 +187,20 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
190187
return null;
191188
}
192189

190+
public String getStsSessionTag() {
191+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
192+
// only STS
193+
return null;
194+
}
195+
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
196+
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStsSessionTag();
197+
}
198+
return null;
199+
}
200+
193201
public Boolean getWithPathStyleAccessEnabled() {
194-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
195-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getWithPathStyleAccessEnabled();
202+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
203+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getWithPathStyleAccessEnabled();
196204
}
197205
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
198206
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getWithPathStyleAccessEnabled();
@@ -201,8 +209,8 @@ else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
201209
}
202210

203211
public S3STORAGECLASSES getStorageClass() {
204-
if(proxy.getActualInstance() instanceof StorageProfileS3Dto) {
205-
return ((StorageProfileS3Dto) proxy.getActualInstance()).getStorageClass();
212+
if(proxy.getActualInstance() instanceof StorageProfileS3StaticDto) {
213+
return ((StorageProfileS3StaticDto) proxy.getActualInstance()).getStorageClass();
206214
}
207215
else if(proxy.getActualInstance() instanceof StorageProfileS3STSDto) {
208216
return ((StorageProfileS3STSDto) proxy.getActualInstance()).getStorageClass();

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,20 @@ public <L> List<L> listForKey(final String key) {
5353
}
5454
if(dto.getProtocol() == Protocol.S3_STS) {
5555
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.OAUTH_TOKENEXCHANGE, true));
56-
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_ROLEARN_WEBIDENTITY, dto.getStsRoleArn()));
57-
if(dto.getStsRoleArn2() != null) {
58-
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_ROLEARN_TAG, dto.getStsRoleArn2()));
56+
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_ROLEARN_WEBIDENTITY, dto.getStsRoleAccessBucketAssumeRoleWithWebIdentity()));
57+
if(dto.getStsRoleAccessBucketAssumeRoleTaggedSession() != null) {
58+
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_ROLEARN_TAG, dto.getStsRoleAccessBucketAssumeRoleTaggedSession()));
5959
}
60-
if(dto.getStsRoleArnClient() != null) {
61-
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_ROLEARN_CREATE_BUCKET, dto.getStsRoleArnClient()));
60+
if(dto.getStsRoleCreateBucketClient() != null) {
61+
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_ROLEARN_CREATE_BUCKET, dto.getStsRoleCreateBucketClient()));
6262
}
6363
if(dto.getStsDurationSeconds() != null) {
6464
properties.add(String.format("%s=%s", S3AssumeRoleProtocol.S3_ASSUMEROLE_DURATIONSECONDS, dto.getStsDurationSeconds().toString()));
6565
}
66+
if(dto.getStsSessionTag() != null) {
67+
properties.add(String.format("%s=%s", "s3.assumerole.rolearn.tag.vaultid.key", dto.getStsSessionTag()));
68+
}
6669
}
67-
properties.add("s3.assumerole.rolearn.tag.vaultid.key=Vault");
6870
log.debug("Return properties {} from {}", properties, dto);
6971
return (List<L>) properties;
7072
case REGIONS_KEY:
@@ -79,7 +81,7 @@ public String stringForKey(final String key) {
7981
switch(key) {
8082
case PROTOCOL_KEY:
8183
switch(dto.getProtocol()) {
82-
case S3:
84+
case S3_STATIC:
8385
case S3_STS:
8486
return new S3AssumeRoleProtocol().getIdentifier();
8587
}
@@ -107,7 +109,7 @@ public Boolean booleanForKey(final String key) {
107109
switch(key) {
108110
case OAUTH_CONFIGURABLE_KEY:
109111
switch(dto.getProtocol()) {
110-
case S3:
112+
case S3_STATIC:
111113
return false;
112114
case S3_STS:
113115
return true;
@@ -116,7 +118,7 @@ public Boolean booleanForKey(final String key) {
116118
case ROLE_KEY_CONFIGURABLE_KEY:
117119
// Indicates Role ARN is required for STS `AssumeRoleWithWebIdentity`.
118120
// Determines usage of role grant flags when creating a new vault
119-
return dto.getStsRoleArn() != null;
121+
return dto.getStsRoleAccessBucketAssumeRoleWithWebIdentity() != null;
120122
}
121123
return super.booleanForKey(key);
122124
}
@@ -151,7 +153,7 @@ public List<String> keys() {
151153
if(dto.getRegions() != null) {
152154
keys.add(REGIONS_KEY);
153155
}
154-
if(dto.getStsRoleArn() != null) {
156+
if(dto.getStsRoleAccessBucketAssumeRoleWithWebIdentity() != null) {
155157
keys.add(ROLE_KEY_CONFIGURABLE_KEY);
156158
}
157159
return keys;

‎hub/src/main/java/cloud/katta/workflows/VaultServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public StorageProfileDtoWrapper getVaultStorageProfile(final UvfMetadataPayload
9393
public Session<?> getVaultStorageSession(final HubSession session, final UUID vaultId, final UvfMetadataPayload vaultMetadata) throws ApiException, AccessException {
9494
final StorageProfileDtoWrapper vaultStorageProfile = this.getVaultStorageProfile(vaultMetadata);
9595
switch(vaultStorageProfile.getProtocol()) {
96-
case S3:
96+
case S3_STATIC:
9797
case S3_STS:
9898
final VaultMetadataJWEBackendDto vaultStorageMetadata = vaultMetadata.storage();
9999
try {

0 commit comments

Comments
 (0)