-
Notifications
You must be signed in to change notification settings - Fork 220
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract AWS specific rules engine functions
This commit pulls the AWS specific rules engine functions into a new package, smithy-aws-rules-engine. This includes parseArn, partition, and isVirtualHostableS3Bucket. The partition loading has also moved to this package, including its data types. Relevant tests were migrated. Behavior that was only possible to validate using the parseArn function have been moved, even if the behavior is not AWS specific. Tests that used AWS functions but did not require it were updated to be agnostic.
- Loading branch information
Showing
58 changed files
with
184 additions
and
127 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| description = "AWS specific components for the Smithy rules engine" | ||
|
|
||
| ext { | ||
| displayName = "Smithy :: AWS Rules Components" | ||
| moduleName = "software.amazon.smithy.aws.rulesengine" | ||
| } | ||
|
|
||
| dependencies { | ||
| api project(":smithy-rules-engine") | ||
| api project(":smithy-model") | ||
| api project(":smithy-utils") | ||
| } |
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
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
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
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
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
1 change: 1 addition & 0 deletions
1
...software.amazon.smithy.aws.rulesengine.language.functions.partition.PartitionDataProvider
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 @@ | ||
| software.amazon.smithy.aws.rulesengine.language.functions.partition.DefaultPartitionDataProvider |
3 changes: 3 additions & 0 deletions
3
...ftware.amazon.smithy.rulesengine.language.syntax.expressions.functions.FunctionDefinition
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,3 @@ | ||
| software.amazon.smithy.aws.rulesengine.language.functions.AwsIsVirtualHostableS3Bucket$Definition | ||
| software.amazon.smithy.aws.rulesengine.language.functions.AwsPartition$Definition | ||
| software.amazon.smithy.aws.rulesengine.language.functions.ParseArn$Definition |
File renamed without changes.
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
72 changes: 72 additions & 0 deletions
72
.../test/java/software/amazon/smithy/aws/rulesengine/language/functions/IntegrationTest.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,72 @@ | ||
| /* | ||
| * Copyright 2022 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.smithy.aws.rulesengine.language.functions; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import java.io.FileInputStream; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
| import software.amazon.smithy.model.node.Node; | ||
| import software.amazon.smithy.rulesengine.language.EndpointRuleSet; | ||
| import software.amazon.smithy.rulesengine.language.error.RuleError; | ||
| import software.amazon.smithy.utils.IoUtils; | ||
| import software.amazon.smithy.utils.Pair; | ||
|
|
||
| public class IntegrationTest { | ||
| public static List<Pair<Node, String>> invalidRules() throws IOException { | ||
| try (Stream<Path> paths = Files.list( | ||
| Paths.get(IntegrationTest.class.getResource("invalid-rules").getPath())) | ||
| ) { | ||
| return paths.map(path -> { | ||
| try { | ||
| String pathContents = IoUtils.toUtf8String(new FileInputStream(path.toFile())); | ||
| Node content = Node.parseJsonWithComments(pathContents, | ||
| path.subpath(path.getNameCount() - 2, path.getNameCount()) | ||
| .toString().replace("\\", "/")); | ||
|
|
||
| List<String> commentLines = new ArrayList<>(); | ||
| for (String line : pathContents.split(System.lineSeparator())) { | ||
| if (line.startsWith("//")) { | ||
| commentLines.add(line.substring(3)); | ||
| } | ||
| } | ||
|
|
||
| return Pair.of(content, String.join("\n", commentLines)); | ||
| } catch (FileNotFoundException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| }).collect(Collectors.toList()); | ||
| } | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("invalidRules") | ||
| public void checkInvalidRules(Pair<Node, String> validationTestCase) { | ||
| RuleError error = assertThrows(RuleError.class, () -> EndpointRuleSet.fromNode(validationTestCase.getLeft())); | ||
| assertEquals(validationTestCase.getRight(), error.toString()); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...c/test/java/software/amazon/smithy/aws/rulesengine/language/functions/TestRunnerTest.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,20 @@ | ||
| package software.amazon.smithy.aws.rulesengine.language.functions; | ||
|
|
||
| import java.util.concurrent.Callable; | ||
| import java.util.stream.Stream; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
| import software.amazon.smithy.model.validation.testrunner.SmithyTestCase; | ||
| import software.amazon.smithy.model.validation.testrunner.SmithyTestSuite; | ||
|
|
||
| public class TestRunnerTest { | ||
| public static Stream<?> source() { | ||
| return SmithyTestSuite.defaultParameterizedTestSource(TestRunnerTest.class); | ||
| } | ||
|
|
||
| @ParameterizedTest(name = "{0}") | ||
| @MethodSource("source") | ||
| public void testRunner(String filename, Callable<SmithyTestCase.Result> callable) throws Exception { | ||
| callable.call(); | ||
| } | ||
| } |
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
1 change: 0 additions & 1 deletion
1
...rvices/software.amazon.smithy.rulesengine.language.stdlib.partition.PartitionDataProvider
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
...ftware.amazon.smithy.rulesengine.language.syntax.expressions.functions.FunctionDefinition
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.