-
Notifications
You must be signed in to change notification settings - Fork 914
Add customization in S3 to keep expires as timestamp type #5610
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
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
63 changes: 63 additions & 0 deletions
63
...tware/amazon/awssdk/codegen/customization/processors/ShapeSubstitutionsProcessorTest.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,63 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file 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 software.amazon.awssdk.codegen.customization.processors; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import software.amazon.awssdk.codegen.C2jModels; | ||
| import software.amazon.awssdk.codegen.IntermediateModelBuilder; | ||
| import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig; | ||
| import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel; | ||
| import software.amazon.awssdk.codegen.model.service.ServiceModel; | ||
| import software.amazon.awssdk.codegen.model.service.Shape; | ||
| import software.amazon.awssdk.codegen.utils.ModelLoaderUtils; | ||
|
|
||
| public class ShapeSubstitutionsProcessorTest { | ||
|
|
||
| private static CustomizationConfig config; | ||
| private static ServiceModel serviceModel; | ||
|
|
||
| @BeforeAll | ||
| public static void setUp() throws IOException { | ||
| File serviceModelFile = new File(ShapeSubstitutionsProcessorTest.class.getResource("service-2.json").getFile()); | ||
| serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile); | ||
| File customizationConfigFile = new File(ShapeSubstitutionsProcessorTest.class.getResource("customization.config").getFile()); | ||
| serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile); | ||
| config = ModelLoaderUtils.loadModel(CustomizationConfig.class, customizationConfigFile); | ||
| } | ||
|
|
||
| @Test | ||
| public void setCustomStringShape_isAddedToModel() { | ||
| assertThat(serviceModel.getShapes().get("Timestamp").getType()).isEqualTo("string"); | ||
| IntermediateModel intermediateModel = new IntermediateModelBuilder(C2jModels.builder() | ||
| .serviceModel(serviceModel) | ||
| .customizationConfig(config) | ||
| .build()) | ||
| .build(); | ||
|
|
||
| assertThat(serviceModel.getShapes().get("AllTypesStructure").getMembers().get("Timestamp").getShape()).isEqualTo( | ||
| "SdkCustomization_timestamp"); | ||
| Shape listShape = serviceModel.getShapes().get("ListOfTimestamps"); | ||
| assertThat(listShape.getListMember().getShape()).isEqualTo("SdkCustomization_timestamp"); | ||
|
|
||
| Shape structShape = serviceModel.getShapes().get("StructWithTimestamp"); | ||
| assertThat(structShape.getMembers().get("Timestamp").getShape()).isEqualTo("SdkCustomization_timestamp"); | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
...st/resources/software/amazon/awssdk/codegen/customization/processors/customization.config
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,7 @@ | ||
| { | ||
| "shapeSubstitutions": { | ||
| "Timestamp": { | ||
| "emitAsType": "timestamp" | ||
| } | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
...src/test/resources/software/amazon/awssdk/codegen/customization/processors/service-2.json
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,65 @@ | ||
| { | ||
| "version":"2.0", | ||
| "metadata":{ | ||
| "apiVersion":"2016-03-11", | ||
| "endpointPrefix":"restjson", | ||
| "jsonVersion":"1.1", | ||
| "protocol":"rest-json", | ||
| "serviceAbbreviation":"JsonProtocolTests", | ||
| "serviceFullName":"AWS DR Tools JSON Protocol Tests", | ||
| "serviceId":"Json Protocol Tests", | ||
| "signatureVersion":"v4", | ||
| "targetPrefix":"ProtocolTestsJsonRpcService", | ||
| "timestampFormat":"unixTimestamp", | ||
| "uid":"restjson-2016-03-11" | ||
| }, | ||
| "operations":{ | ||
| "AllTypes":{ | ||
| "name":"AllTypes", | ||
| "http":{ | ||
| "method":"POST", | ||
| "requestUri":"/" | ||
| }, | ||
| "input":{"shape":"AllTypesStructure"} | ||
| } | ||
| }, | ||
| "shapes": { | ||
| "AllTypesStructure": { | ||
| "type": "structure", | ||
| "members": { | ||
| "TimeStampMember": { | ||
| "shape": "Timestamp" | ||
| }, | ||
| "ListOfTimestamps": { | ||
| "shape": "ListOfTimestamps" | ||
| }, | ||
| "Timestamp": { | ||
| "shape": "Timestamp" | ||
| }, | ||
| "StructWithTimestamp": { | ||
| "shape": "StructWithTimestamp" | ||
| } | ||
| } | ||
| }, | ||
| "ListOfTimestamps": { | ||
| "type": "list", | ||
| "member": { | ||
| "shape": "Timestamp" | ||
| } | ||
| }, | ||
| "StructWithTimestamp": { | ||
| "type": "structure", | ||
| "members": { | ||
| "Timestamp": { | ||
| "shape": "Timestamp" | ||
| } | ||
| } | ||
| }, | ||
| "Timestamp": { | ||
| "type": "string" | ||
| }, | ||
| "String" : { | ||
| "type" : "string" | ||
| } | ||
| } | ||
| } |
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
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.
Just for my understanding, what is this
SdkCustomization_name prefix for?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.
This is for the case where we need to add a new type to the service model. In this case, we are adding
"SdkCustomization_ expires": {"type": "timestamp"}to S3 since it doesn't have a generic timestamp type.