-
Notifications
You must be signed in to change notification settings - Fork 3.4k
AWS,Core: Add S3 REST Signer client + REST Spec #6169
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
116 changes: 116 additions & 0 deletions
116
aws/src/main/java/org/apache/iceberg/aws/s3/signer/S3ObjectMapper.java
This file contains hidden or 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,116 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF 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 | ||
| * | ||
| * http://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 org.apache.iceberg.aws.s3.signer; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonAutoDetect; | ||
| import com.fasterxml.jackson.annotation.PropertyAccessor; | ||
| import com.fasterxml.jackson.core.JsonFactory; | ||
| import com.fasterxml.jackson.core.JsonGenerator; | ||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.DeserializationFeature; | ||
| import com.fasterxml.jackson.databind.JsonDeserializer; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.JsonSerializer; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.PropertyNamingStrategies; | ||
| import com.fasterxml.jackson.databind.SerializerProvider; | ||
| import com.fasterxml.jackson.databind.module.SimpleModule; | ||
| import java.io.IOException; | ||
| import org.apache.iceberg.rest.RESTSerializers.ErrorResponseDeserializer; | ||
| import org.apache.iceberg.rest.RESTSerializers.ErrorResponseSerializer; | ||
| import org.apache.iceberg.rest.RESTSerializers.OAuthTokenResponseDeserializer; | ||
| import org.apache.iceberg.rest.RESTSerializers.OAuthTokenResponseSerializer; | ||
| import org.apache.iceberg.rest.responses.ErrorResponse; | ||
| import org.apache.iceberg.rest.responses.OAuthTokenResponse; | ||
|
|
||
| public class S3ObjectMapper { | ||
|
|
||
| private static final JsonFactory FACTORY = new JsonFactory(); | ||
| private static final ObjectMapper MAPPER = new ObjectMapper(FACTORY); | ||
| private static volatile boolean isInitialized = false; | ||
|
|
||
| private S3ObjectMapper() {} | ||
|
|
||
| static ObjectMapper mapper() { | ||
| if (!isInitialized) { | ||
| synchronized (S3ObjectMapper.class) { | ||
| if (!isInitialized) { | ||
| MAPPER.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); | ||
| MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); | ||
| MAPPER.setPropertyNamingStrategy(PropertyNamingStrategies.KebabCaseStrategy.INSTANCE); | ||
| MAPPER.registerModule(initModule()); | ||
| isInitialized = true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return MAPPER; | ||
| } | ||
|
|
||
| private static SimpleModule initModule() { | ||
| return new SimpleModule() | ||
| .addSerializer(ErrorResponse.class, new ErrorResponseSerializer()) | ||
| .addDeserializer(ErrorResponse.class, new ErrorResponseDeserializer()) | ||
| .addSerializer(OAuthTokenResponse.class, new OAuthTokenResponseSerializer()) | ||
| .addDeserializer(OAuthTokenResponse.class, new OAuthTokenResponseDeserializer()) | ||
| .addSerializer(S3SignRequest.class, new S3SignRequestSerializer<>()) | ||
| .addSerializer(ImmutableS3SignRequest.class, new S3SignRequestSerializer<>()) | ||
| .addDeserializer(S3SignRequest.class, new S3SignRequestDeserializer<>()) | ||
| .addDeserializer(ImmutableS3SignRequest.class, new S3SignRequestDeserializer<>()) | ||
| .addSerializer(S3SignResponse.class, new S3SignResponseSerializer<>()) | ||
| .addSerializer(ImmutableS3SignResponse.class, new S3SignResponseSerializer<>()) | ||
| .addDeserializer(S3SignResponse.class, new S3SignResponseDeserializer<>()) | ||
| .addDeserializer(ImmutableS3SignResponse.class, new S3SignResponseDeserializer<>()); | ||
| } | ||
|
|
||
| public static class S3SignRequestSerializer<T extends S3SignRequest> extends JsonSerializer<T> { | ||
| @Override | ||
| public void serialize(T request, JsonGenerator gen, SerializerProvider serializers) | ||
| throws IOException { | ||
| S3SignRequestParser.toJson(request, gen); | ||
| } | ||
| } | ||
|
|
||
| public static class S3SignRequestDeserializer<T extends S3SignRequest> | ||
| extends JsonDeserializer<T> { | ||
| @Override | ||
| public T deserialize(JsonParser p, DeserializationContext context) throws IOException { | ||
| JsonNode jsonNode = p.getCodec().readTree(p); | ||
| return (T) S3SignRequestParser.fromJson(jsonNode); | ||
| } | ||
| } | ||
|
|
||
| public static class S3SignResponseSerializer<T extends S3SignResponse> extends JsonSerializer<T> { | ||
| @Override | ||
| public void serialize(T request, JsonGenerator gen, SerializerProvider serializers) | ||
| throws IOException { | ||
| S3SignResponseParser.toJson(request, gen); | ||
| } | ||
| } | ||
|
|
||
| public static class S3SignResponseDeserializer<T extends S3SignResponse> | ||
| extends JsonDeserializer<T> { | ||
| @Override | ||
| public T deserialize(JsonParser p, DeserializationContext context) throws IOException { | ||
| JsonNode jsonNode = p.getCodec().readTree(p); | ||
| return (T) S3SignResponseParser.fromJson(jsonNode); | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
aws/src/main/java/org/apache/iceberg/aws/s3/signer/S3SignRequest.java
This file contains hidden or 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,41 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF 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 | ||
| * | ||
| * http://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 org.apache.iceberg.aws.s3.signer; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.iceberg.rest.RESTRequest; | ||
| import org.immutables.value.Value; | ||
|
|
||
| @Value.Immutable | ||
| public interface S3SignRequest extends RESTRequest { | ||
| String region(); | ||
|
|
||
| String method(); | ||
|
|
||
| URI uri(); | ||
|
|
||
| Map<String, List<String>> headers(); | ||
|
|
||
| Map<String, String> properties(); | ||
|
|
||
| @Override | ||
| default void validate() {} | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.