-
Notifications
You must be signed in to change notification settings - Fork 121
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.
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
Prepare RepositoryMetadata role Updates for #1060 Compatibility #1061
Merged
Merged
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
09a6593
Prepare PerPermission Updates for #1060 Compatibility
minwoox 3bc765b
Add test
minwoox 4f2e577
Fix test
minwoox 140428b
Fix
minwoox 5eea3d7
Add test
minwoox b19c106
Revamp
minwoox a1f2967
Apply more changes
minwoox 2b59432
Merge branch 'main' into prework_1060
minwoox 2ff378d
WIP
minwoox 059a5f4
Merge branch 'main' into prework_1060
minwoox 144d172
Merge branch 'main' into prework_1060
minwoox b096bad
Update
minwoox c054553
Update
minwoox f8d8aca
Add more test
minwoox 1fe2f94
Fix test
minwoox fe31752
Address the comments from @ikhoon
minwoox 27b8044
Empty roles
minwoox 2b2ca34
Add test
minwoox File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...c/main/java/com/linecorp/centraldogma/server/metadata/PerRolePermissionsDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2024 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.linecorp.centraldogma.server.metadata; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Set; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.core.type.TypeReference; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.deser.std.StdDeserializer; | ||
| import com.google.common.collect.ImmutableSet; | ||
|
|
||
| import com.linecorp.centraldogma.internal.Jackson; | ||
|
|
||
| final class PerRolePermissionsDeserializer extends StdDeserializer<PerRolePermissions> { | ||
|
|
||
| private static final long serialVersionUID = 1173216371065909688L; | ||
|
|
||
| private static final TypeReference<Set<Permission>> PERMISSION_SET_TYPE = | ||
| new TypeReference<Set<Permission>>() {}; | ||
|
|
||
| PerRolePermissionsDeserializer() { | ||
| super(PerRolePermissions.class); | ||
| } | ||
|
|
||
| @Override | ||
| public PerRolePermissions deserialize(JsonParser p, DeserializationContext ctxt) | ||
| throws IOException { | ||
| final JsonNode jsonNode = p.readValueAsTree(); | ||
| final Set<Permission> ownerPermission = getPermission(jsonNode.get("owner")); | ||
| final Set<Permission> memberPermission = getPermission(jsonNode.get("member")); | ||
| final Set<Permission> guestPermission = getPermission(jsonNode.get("guest")); | ||
|
|
||
| return new PerRolePermissions(ownerPermission, memberPermission, guestPermission, null); | ||
| } | ||
|
|
||
| static Set<Permission> getPermission(@Nullable JsonNode jsonNode) { | ||
| if (jsonNode == null || jsonNode.isNull()) { | ||
| return ImmutableSet.of(); | ||
| } | ||
| if (jsonNode.isArray()) { | ||
| // legacy format. e.g. [], ["READ"] or ["READ", "WRITE"] | ||
| return Jackson.convertValue(jsonNode, PERMISSION_SET_TYPE); | ||
| } | ||
| // e.g. "READ", "WRITE" or "REPO_ADMIN" | ||
| final Permission permission = Permission.valueOf(jsonNode.textValue()); | ||
| if (permission == Permission.READ) { | ||
| return ImmutableSet.of(Permission.READ); | ||
| } | ||
| // In this legacy format, REPO_ADMIN is the same as WRITE. | ||
| return ImmutableSet.of(Permission.READ, Permission.WRITE); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
...c/main/java/com/linecorp/centraldogma/server/metadata/RepositoryMetadataDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright 2024 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.linecorp.centraldogma.server.metadata; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collection; | ||
| import java.util.Iterator; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.deser.std.StdDeserializer; | ||
| import com.google.common.collect.ImmutableMap; | ||
|
|
||
| import com.linecorp.centraldogma.internal.Jackson; | ||
| import com.linecorp.centraldogma.server.QuotaConfig; | ||
|
|
||
| final class RepositoryMetadataDeserializer extends StdDeserializer<RepositoryMetadata> { | ||
|
|
||
| private static final long serialVersionUID = 1173216371065909688L; | ||
|
|
||
| RepositoryMetadataDeserializer() { | ||
| super(RepositoryMetadata.class); | ||
| } | ||
|
|
||
| @Override | ||
| public RepositoryMetadata deserialize(JsonParser p, DeserializationContext ctxt) | ||
| throws IOException { | ||
| final JsonNode jsonNode = p.readValueAsTree(); | ||
| final String name = jsonNode.get("name").textValue(); | ||
| final PerRolePermissions perRolePermissions = | ||
| Jackson.treeToValue(jsonNode.get("perRolePermissions"), PerRolePermissions.class); | ||
| final Map<String, Collection<Permission>> perUserPermissions = | ||
| perPermission(jsonNode, "perUserPermissions"); | ||
| final Map<String, Collection<Permission>> perTokenPermissions = | ||
| perPermission(jsonNode, "perTokenPermissions"); | ||
| final UserAndTimestamp creation = Jackson.treeToValue(jsonNode.get("creation"), UserAndTimestamp.class); | ||
| final JsonNode removalNode = jsonNode.get("removal"); | ||
| final UserAndTimestamp removal = | ||
| removalNode == null ? null : Jackson.treeToValue(removalNode, UserAndTimestamp.class); | ||
|
|
||
| final JsonNode writeQuotaNode = jsonNode.get("writeQuota"); | ||
| final QuotaConfig writeQuota = | ||
| writeQuotaNode == null ? null : Jackson.treeToValue(writeQuotaNode, QuotaConfig.class); | ||
|
|
||
| return new RepositoryMetadata(name, perRolePermissions, perUserPermissions, perTokenPermissions, | ||
| creation, removal, writeQuota); | ||
| } | ||
|
|
||
| private static Map<String, Collection<Permission>> perPermission(JsonNode rootNode, String filed) { | ||
| final JsonNode permissionsNode = rootNode.get(filed); | ||
|
|
||
| final ImmutableMap.Builder<String, Collection<Permission>> builder = ImmutableMap.builder(); | ||
| final Iterator<Entry<String, JsonNode>> fields = permissionsNode.fields(); | ||
| while (fields.hasNext()) { | ||
| final Entry<String, JsonNode> field = fields.next(); | ||
| final String id = field.getKey(); | ||
| builder.put(id, PerRolePermissionsDeserializer.getPermission(field.getValue())); | ||
| } | ||
|
|
||
| return builder.build(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understood these custom deserializers will be removed once migration is complete
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is correct. 👍 👍