Address CR Feedback

smithy-lang · Jun 27, 2023 · 2386d15 · 2386d15
1 parent e28f64d
commit 2386d15
Show file tree

Hide file tree

Showing 84 changed files with 329 additions and 232 deletions.
diff --git a/...ulesengine/language/functions/AwsArn.java → ...engine/aws/language/functions/AwsArn.java b/...ulesengine/language/functions/AwsArn.java → ...engine/aws/language/functions/AwsArn.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...gine/language/functions/AwsPartition.java → .../aws/language/functions/AwsPartition.java b/...gine/language/functions/AwsPartition.java → .../aws/language/functions/AwsPartition.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,10 +14,10 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.regex.Pattern;
-import software.amazon.smithy.aws.rulesengine.language.functions.partition.Partition;
-import software.amazon.smithy.aws.rulesengine.language.functions.partition.PartitionDataProvider;
-import software.amazon.smithy.aws.rulesengine.language.functions.partition.PartitionOutputs;
-import software.amazon.smithy.aws.rulesengine.language.functions.partition.Partitions;
+import software.amazon.smithy.rulesengine.aws.language.functions.partition.Partition;
+import software.amazon.smithy.rulesengine.aws.language.functions.partition.PartitionDataProvider;
+import software.amazon.smithy.rulesengine.aws.language.functions.partition.PartitionOutputs;
+import software.amazon.smithy.rulesengine.aws.language.functions.partition.Partitions;
 import software.amazon.smithy.rulesengine.language.evaluation.type.Type;
 import software.amazon.smithy.rulesengine.language.evaluation.value.Value;
 import software.amazon.smithy.rulesengine.language.syntax.Identifier;

diff --git a/...ain/java/software/amazon/smithy/rulesengine/aws/language/functions/EndpointAuthUtils.java b/...ain/java/software/amazon/smithy/rulesengine/aws/language/functions/EndpointAuthUtils.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rulesengine.aws.language.functions;
+
+import java.util.List;
+import software.amazon.smithy.rulesengine.language.Endpoint;
+import software.amazon.smithy.rulesengine.language.syntax.expressions.literal.Literal;
+import software.amazon.smithy.utils.MapUtils;
+
+public final class EndpointAuthUtils {
+    private static final String SIGV_4 = "sigv4";
+    private static final String SIG_V4A = "sigv4a";
+    private static final String SIGNING_NAME = "signingName";
+    private static final String SIGNING_REGION = "signingRegion";
+    private static final String SIGNING_REGION_SET = "signingRegionSet";
+
+    private EndpointAuthUtils() {}
+
+    public static Endpoint.Builder sigv4(Endpoint.Builder builder, Literal signingRegion, Literal signingService) {
+        return builder.addAuthScheme(SIGV_4, MapUtils.of(SIGNING_REGION, signingRegion, SIGNING_NAME, signingService));
+    }
+
+    public static Endpoint.Builder sigv4a(
+            Endpoint.Builder builder,
+            List<Literal> signingRegionSet,
+            Literal signingService
+    ) {
+        return builder.addAuthScheme(SIG_V4A, MapUtils.of(SIGNING_REGION_SET, Literal.tupleLiteral(signingRegionSet),
+                SIGNING_NAME, signingService));
+    }
+}
diff --git a/...nctions/AwsIsVirtualHostableS3Bucket.java → .../functions/IsVirtualHostableS3Bucket.java b/...nctions/AwsIsVirtualHostableS3Bucket.java → .../functions/IsVirtualHostableS3Bucket.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import java.util.Arrays;
 import java.util.List;
@@ -19,11 +19,11 @@
  * An AWS rule-set function for determining whether a given string can be promoted to an S3 virtual bucket host label.
  */
 @SmithyUnstableApi
-public final class AwsIsVirtualHostableS3Bucket extends LibraryFunction {
+public final class IsVirtualHostableS3Bucket extends LibraryFunction {
     public static final String ID = "aws.isVirtualHostableS3Bucket";
     private static final Definition DEFINITION = new Definition();
 
-    private AwsIsVirtualHostableS3Bucket(FunctionNode functionNode) {
+    private IsVirtualHostableS3Bucket(FunctionNode functionNode) {
         super(DEFINITION, functionNode);
     }
 
@@ -33,7 +33,7 @@ public <T> T accept(ExpressionVisitor<T> visitor) {
     }
 
     /**
-     * A {@link FunctionDefinition} for the {@link AwsIsVirtualHostableS3Bucket} function.
+     * A {@link FunctionDefinition} for the {@link IsVirtualHostableS3Bucket} function.
      */
     public static final class Definition implements FunctionDefinition {
         @Override
@@ -67,8 +67,8 @@ public Value evaluate(List<Value> arguments) {
         }
 
         @Override
-        public AwsIsVirtualHostableS3Bucket createFunction(FunctionNode functionNode) {
-            return new AwsIsVirtualHostableS3Bucket(functionNode);
+        public IsVirtualHostableS3Bucket createFunction(FunctionNode functionNode) {
+            return new IsVirtualHostableS3Bucket(functionNode);
         }
     }
 }
diff --git a/...esengine/language/functions/ParseArn.java → ...gine/aws/language/functions/ParseArn.java b/...esengine/language/functions/ParseArn.java → ...gine/aws/language/functions/ParseArn.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...rtition/DefaultPartitionDataProvider.java → ...rtition/DefaultPartitionDataProvider.java b/...rtition/DefaultPartitionDataProvider.java → ...rtition/DefaultPartitionDataProvider.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import java.io.InputStream;
 import software.amazon.smithy.model.node.Node;

diff --git a/...nguage/functions/partition/Partition.java → ...nguage/functions/partition/Partition.java b/...nguage/functions/partition/Partition.java → ...nguage/functions/partition/Partition.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...ions/partition/PartitionDataProvider.java → ...ions/partition/PartitionDataProvider.java b/...ions/partition/PartitionDataProvider.java → ...ions/partition/PartitionDataProvider.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import software.amazon.smithy.utils.SmithyUnstableApi;
 

diff --git a/...functions/partition/PartitionOutputs.java → ...functions/partition/PartitionOutputs.java b/...functions/partition/PartitionOutputs.java → ...functions/partition/PartitionOutputs.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...guage/functions/partition/Partitions.java → ...guage/functions/partition/Partitions.java b/...guage/functions/partition/Partitions.java → ...guage/functions/partition/Partitions.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...e/functions/partition/RegionOverride.java → ...e/functions/partition/RegionOverride.java b/...e/functions/partition/RegionOverride.java → ...e/functions/partition/RegionOverride.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import software.amazon.smithy.model.FromSourceLocation;
 import software.amazon.smithy.model.SourceLocation;

diff --git a/...software.amazon.smithy.aws.rulesengine.language.functions.partition.PartitionDataProvider b/...software.amazon.smithy.aws.rulesengine.language.functions.partition.PartitionDataProvider
diff --git a/...software.amazon.smithy.rulesengine.aws.language.functions.partition.PartitionDataProvider b/...software.amazon.smithy.rulesengine.aws.language.functions.partition.PartitionDataProvider
@@ -0,0 +1 @@
+software.amazon.smithy.rulesengine.aws.language.functions.partition.DefaultPartitionDataProvider
diff --git a/...ftware.amazon.smithy.rulesengine.language.syntax.expressions.functions.FunctionDefinition b/...ftware.amazon.smithy.rulesengine.language.syntax.expressions.functions.FunctionDefinition
@@ -1,3 +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
+software.amazon.smithy.rulesengine.aws.language.functions.IsVirtualHostableS3Bucket$Definition
+software.amazon.smithy.rulesengine.aws.language.functions.AwsPartition$Definition
+software.amazon.smithy.rulesengine.aws.language.functions.ParseArn$Definition
diff --git a/...guage/functions/partition/partitions.json → ...guage/functions/partition/partitions.json b/...guage/functions/partition/partitions.json → ...guage/functions/partition/partitions.json
diff --git a/...engine/language/functions/AwsArnTest.java → ...ne/aws/language/functions/AwsArnTest.java b/...engine/language/functions/AwsArnTest.java → ...ne/aws/language/functions/AwsArnTest.java
@@ -1,4 +1,4 @@
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

diff --git a/...e/functions/AwsPartitionFunctionTest.java → ...e/functions/AwsPartitionFunctionTest.java b/...e/functions/AwsPartitionFunctionTest.java → ...e/functions/AwsPartitionFunctionTest.java
@@ -1,4 +1,4 @@
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/...e/language/functions/IntegrationTest.java → ...s/language/functions/IntegrationTest.java b/...e/language/functions/IntegrationTest.java → ...s/language/functions/IntegrationTest.java
@@ -1,4 +1,4 @@
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

diff --git a/...ne/language/functions/TestRunnerTest.java → ...ws/language/functions/TestRunnerTest.java b/...ne/language/functions/TestRunnerTest.java → ...ws/language/functions/TestRunnerTest.java
@@ -1,4 +1,4 @@
-package software.amazon.smithy.aws.rulesengine.language.functions;
+package software.amazon.smithy.rulesengine.aws.language.functions;
 
 import java.util.concurrent.Callable;
 import java.util.stream.Stream;

diff --git a/...e/functions/partition/PartitionsTest.java → ...e/functions/partition/PartitionsTest.java b/...e/functions/partition/PartitionsTest.java → ...e/functions/partition/PartitionsTest.java
@@ -1,4 +1,4 @@
-package software.amazon.smithy.aws.rulesengine.language.functions.partition;
+package software.amazon.smithy.rulesengine.aws.language.functions.partition;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;

diff --git a/...alid/eventbridge-rules-extra-param.errors → ...alid/eventbridge-rules-extra-param.errors b/...alid/eventbridge-rules-extra-param.errors → ...alid/eventbridge-rules-extra-param.errors
@@ -1,4 +1,4 @@
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointRuleSet | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointTests | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#clientContextParams | UnstableTrait
-[DANGER] example#FizzBuzz: Parameter 'useDualStackEndpoint' is never used in test cases | RuleSetParameter.Unused
+[DANGER] example#FizzBuzz: Parameter `useDualStackEndpoint` is never used in an `EndpointTests` test case | RuleSetParameter.TestCase.Unused
diff --git a/...alid/eventbridge-rules-extra-param.smithy → ...alid/eventbridge-rules-extra-param.smithy b/...alid/eventbridge-rules-extra-param.smithy → ...alid/eventbridge-rules-extra-param.smithy
diff --git a/...ventbridge-tests-param-not-defined.errors → ...ventbridge-tests-param-not-defined.errors b/...ventbridge-tests-param-not-defined.errors → ...ventbridge-tests-param-not-defined.errors
@@ -1,4 +1,4 @@
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointRuleSet | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointTests | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#clientContextParams | UnstableTrait
-[ERROR] example#FizzBuzz: Test parameter 'notDefined' is not defined in ruleset | RuleSetParameter.Undefined
+[ERROR] example#FizzBuzz: Test parameter `notDefined` is not defined in ruleset | RuleSetParameter.TestCase.Undefined
diff --git a/...ventbridge-tests-param-not-defined.smithy → ...ventbridge-tests-param-not-defined.smithy b/...ventbridge-tests-param-not-defined.smithy → ...ventbridge-tests-param-not-defined.smithy
@@ -353,7 +353,8 @@ use smithy.rules#endpointTests
             "documentation": "basic case of endpointId",
             "params": {
                 "region": "us-east-1",
-                "endpointId": "myendpoint"
+                "endpointId": "myendpoint",
+                "useDualStackEndpoint": false
             },
             "expect": {
                 "endpoint": {

diff --git a/...ntbridge-tests-param-type-mismatch.errors → ...ntbridge-tests-param-type-mismatch.errors b/...ntbridge-tests-param-type-mismatch.errors → ...ntbridge-tests-param-type-mismatch.errors
@@ -1,5 +1,5 @@
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointRuleSet | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointTests | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#clientContextParams | UnstableTrait
-[ERROR] example#FizzBuzz: Type mismatch for parameter 'useFIPSEndpoint', 'Boolean' expected | RuleSetParameter.TypeMismatch
+[ERROR] example#FizzBuzz: Type mismatch for parameter `useFIPSEndpoint`, `Boolean` expected | RuleSetParameter.TestCase.TypeMismatch
 [ERROR] example#FizzBuzz: Expected bool but was: true | RuleSetTestCase
diff --git a/...ntbridge-tests-param-type-mismatch.smithy → ...ntbridge-tests-param-type-mismatch.smithy b/...ntbridge-tests-param-type-mismatch.smithy → ...ntbridge-tests-param-type-mismatch.smithy
@@ -352,7 +352,8 @@ use smithy.rules#endpointTests
             "documentation": "basic case of endpointId",
             "params": {
                 "region": "us-east-1",
-                "endpointId": "myendpoint"
+                "endpointId": "myendpoint",
+                "useDualStackEndpoint": false
             },
             "expect": {
                 "endpoint": {

diff --git a/...entbridge-tests-req-params-missing.errors → ...entbridge-tests-req-params-missing.errors b/...entbridge-tests-req-params-missing.errors → ...entbridge-tests-req-params-missing.errors
@@ -1,5 +1,5 @@
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointRuleSet | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointTests | UnstableTrait
 [WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#clientContextParams | UnstableTrait
-[ERROR] example#FizzBuzz: Required parameter 'region' is missing in at least one test case | RuleSetParameter.RequiredMissing
+[ERROR] example#FizzBuzz: Required parameter `region` is missing in at least one test case | RuleSetParameter.TestCase.RequiredMissing
 [ERROR] example#FizzBuzz: Expected string but was: <empty> | RuleSetTestCase
diff --git a/...entbridge-tests-req-params-missing.smithy → ...entbridge-tests-req-params-missing.smithy b/...entbridge-tests-req-params-missing.smithy → ...entbridge-tests-req-params-missing.smithy
@@ -352,7 +352,8 @@ use smithy.rules#endpointTests
             "documentation": "basic case of endpointId",
             "params": {
                 "region": "us-east-1",
-                "endpointId": "myendpoint"
+                "endpointId": "myendpoint",
+                "useDualStackEndpoint": false
             },
             "expect": {
                 "endpoint": {

diff --git a/...ctions/errorfiles/valid/aws-region.errors → ...ctions/errorfiles/valid/aws-region.errors b/...ctions/errorfiles/valid/aws-region.errors → ...ctions/errorfiles/valid/aws-region.errors
diff --git a/...ctions/errorfiles/valid/aws-region.smithy → ...ctions/errorfiles/valid/aws-region.smithy b/...ctions/errorfiles/valid/aws-region.smithy → ...ctions/errorfiles/valid/aws-region.smithy
diff --git a/...errorfiles/valid/eventbridge-tests.errors → ...errorfiles/valid/eventbridge-tests.errors b/...errorfiles/valid/eventbridge-tests.errors → ...errorfiles/valid/eventbridge-tests.errors
diff --git a/...errorfiles/valid/eventbridge-tests.smithy → ...errorfiles/valid/eventbridge-tests.smithy b/...errorfiles/valid/eventbridge-tests.smithy → ...errorfiles/valid/eventbridge-tests.smithy
@@ -352,7 +352,8 @@ use smithy.rules#endpointTests
             "documentation": "basic case of endpointId",
             "params": {
                 "region": "us-east-1",
-                "endpointId": "myendpoint"
+                "endpointId": "myendpoint",
+                "useDualStackEndpoint": false
             },
             "expect": {
                 "endpoint": {

diff --git a/...tions/errorfiles/valid/eventbridge.errors → ...tions/errorfiles/valid/eventbridge.errors b/...tions/errorfiles/valid/eventbridge.errors → ...tions/errorfiles/valid/eventbridge.errors
diff --git a/...tions/errorfiles/valid/eventbridge.smithy → ...tions/errorfiles/valid/eventbridge.smithy b/...tions/errorfiles/valid/eventbridge.smithy → ...tions/errorfiles/valid/eventbridge.smithy
diff --git a/...age/functions/errorfiles/valid/fns.errors → ...nctions/errorfiles/valid/functions.errors b/...age/functions/errorfiles/valid/fns.errors → ...nctions/errorfiles/valid/functions.errors
diff --git a/...age/functions/errorfiles/valid/fns.smithy → ...nctions/errorfiles/valid/functions.smithy b/...age/functions/errorfiles/valid/fns.smithy → ...nctions/errorfiles/valid/functions.smithy
diff --git a/...alid/is-virtual-hostable-s3-bucket.errors → ...alid/is-virtual-hostable-s3-bucket.errors b/...alid/is-virtual-hostable-s3-bucket.errors → ...alid/is-virtual-hostable-s3-bucket.errors
diff --git a/...alid/is-virtual-hostable-s3-bucket.smithy → ...alid/is-virtual-hostable-s3-bucket.smithy b/...alid/is-virtual-hostable-s3-bucket.smithy → ...alid/is-virtual-hostable-s3-bucket.smithy
diff --git a/...rfiles/valid/local-region-override.errors → ...rfiles/valid/local-region-override.errors b/...rfiles/valid/local-region-override.errors → ...rfiles/valid/local-region-override.errors
diff --git a/...rfiles/valid/local-region-override.smithy → ...rfiles/valid/local-region-override.smithy b/...rfiles/valid/local-region-override.smithy → ...rfiles/valid/local-region-override.smithy
diff --git a/...nctions/errorfiles/valid/parse-arn.errors → ...nctions/errorfiles/valid/parse-arn.errors b/...nctions/errorfiles/valid/parse-arn.errors → ...nctions/errorfiles/valid/parse-arn.errors
diff --git a/...nctions/errorfiles/valid/parse-arn.smithy → ...nctions/errorfiles/valid/parse-arn.smithy b/...nctions/errorfiles/valid/parse-arn.smithy → ...nctions/errorfiles/valid/parse-arn.smithy
diff --git a/...ions/errorfiles/valid/partition-fn.errors → ...ions/errorfiles/valid/partition-fn.errors b/...ions/errorfiles/valid/partition-fn.errors → ...ions/errorfiles/valid/partition-fn.errors
diff --git a/...ions/errorfiles/valid/partition-fn.smithy → ...ions/errorfiles/valid/partition-fn.smithy b/...ions/errorfiles/valid/partition-fn.smithy → ...ions/errorfiles/valid/partition-fn.smithy
diff --git a/...nctions/invalid-rules/invalid-slice.json5 → ...nctions/invalid-rules/invalid-slice.json5 b/...nctions/invalid-rules/invalid-slice.json5 → ...nctions/invalid-rules/invalid-slice.json5
@@ -8,7 +8,7 @@
 // while typechecking "{bucketArn#accountId}.{bucketArn#resourceId[2]}.{bucketArn#region}"
 // while typechecking the template `"{bucketArn#accountId}.{bucketArn#resourceId[2]}.{bucketArn#region}"`
 // while checking {bucketArn#resourceId[2]}
-// Expected string but found OptionalType<StringType>. hint: use `assign` in a condition or `isSet` to prove that this value is non-null
+// Expected string but found OptionalType[StringType]. hint: use `assign` in a condition or `isSet` to prove that this value is non-null
 {
   "version": "1.2",
   "parameters": {

diff --git a/...nvalid-rules/only-refs-coerce-isset.json5 → ...nvalid-rules/only-refs-coerce-isset.json5 b/...nvalid-rules/only-refs-coerce-isset.json5 → ...nvalid-rules/only-refs-coerce-isset.json5
@@ -14,7 +14,7 @@
 // while typechecking "https://{bucketArn#resourceId[1]}-{bucketArn#accountId}.{bucketArn#region}.{partitionResult#dnsSuffix}"
 // while typechecking the template `"https://{bucketArn#resourceId[1]}-{bucketArn#accountId}.{bucketArn#region}.{partitionResult#dnsSuffix}"`
 // while checking {bucketArn#resourceId[1]}
-// Expected string but found OptionalType<StringType>. hint: use `assign` in a condition or `isSet` to prove that this value is non-null
+// Expected string but found OptionalType[StringType]. hint: use `assign` in a condition or `isSet` to prove that this value is non-null
 {
   "version": "1.2",
   "parameters": {

diff --git a/...ctions/partition/complete-partitions.json → ...ctions/partition/complete-partitions.json b/...ctions/partition/complete-partitions.json → ...ctions/partition/complete-partitions.json
diff --git a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/language/Endpoint.java b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/language/Endpoint.java
@@ -29,7 +29,6 @@
 import software.amazon.smithy.rulesengine.language.syntax.expressions.Expression;
 import software.amazon.smithy.rulesengine.language.syntax.expressions.literal.Literal;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.MapUtils;
 import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.StringUtils;
@@ -43,9 +42,6 @@ public final class Endpoint implements FromSourceLocation, ToNode, ToSmithyBuild
     private static final String URL = "url";
     private static final String PROPERTIES = "properties";
     private static final String HEADERS = "headers";
-    private static final String SIGV_4 = "sigv4";
-    private static final String SIG_V4A = "sigv4a";
-    private static final String SIGNING_REGION = "signingRegion";
 
     private final Map<String, List<Expression>> headers;
     private final Map<Identifier, Literal> properties;
@@ -239,9 +235,6 @@ public Type typeCheck(Scope<Type> scope) {
      * Builder for {@link Endpoint}.
      */
     public static class Builder extends RulesComponentBuilder<Builder, Endpoint> {
-        private static final String SIGNING_NAME = "signingName";
-        private static final String SIGNING_REGION_SET = "signingRegionSet";
-
         private final BuilderRef<Map<String, List<Expression>>> headers = BuilderRef.forOrderedMap();
         private final BuilderRef<Map<Identifier, Literal>> properties = BuilderRef.forOrderedMap();
         private final BuilderRef<Map<Identifier, Map<Identifier, Literal>>> authSchemes = BuilderRef.forOrderedMap();
@@ -286,15 +279,6 @@ public Builder addAuthScheme(String scheme, Map<String, Literal> parameters) {
             return addAuthScheme(Identifier.of(scheme), transformedParameters);
         }
 
-        public Builder sigv4(Literal signingRegion, Literal signingService) {
-            return addAuthScheme(SIGV_4, MapUtils.of(SIGNING_REGION, signingRegion, SIGNING_NAME, signingService));
-        }
-
-        public Builder sigv4a(List<Literal> signingRegionSet, Literal signingService) {
-            return addAuthScheme(SIG_V4A, MapUtils.of(SIGNING_REGION_SET, Literal.tupleLiteral(signingRegionSet),
-                    SIGNING_NAME, signingService));
-        }
-
         public Builder headers(Map<String, List<Expression>> headers) {
             this.headers.clear();
             this.headers.get().putAll(headers);

diff --git a/...s-engine/src/main/java/software/amazon/smithy/rulesengine/language/TraversingVisitor.java b/...s-engine/src/main/java/software/amazon/smithy/rulesengine/language/TraversingVisitor.java
@@ -77,6 +77,6 @@ public Stream<R> visitEndpoint(Endpoint endpoint) {
      * @return a stream of values.
      */
     public Stream<R> visitConditions(List<Condition> conditions) {
-        return conditions.stream().flatMap(condition -> condition.getFn().accept(this));
+        return conditions.stream().flatMap(condition -> condition.getFunction().accept(this));
     }
 }
diff --git a/...e/src/main/java/software/amazon/smithy/rulesengine/language/evaluation/RuleEvaluator.java b/...e/src/main/java/software/amazon/smithy/rulesengine/language/evaluation/RuleEvaluator.java
@@ -78,7 +78,7 @@ public Value evaluateRuleSet(EndpointRuleSet ruleset, Map<Identifier, Value> par
      * @return the value returned by the condition.
      */
     public Value evaluateCondition(Condition condition) {
-        Value value = condition.getFn().accept(this);
+        Value value = condition.getFunction().accept(this);
         if (!value.isEmpty()) {
             condition.getResult().ifPresent(res -> scope.insert(res, value));
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		software.amazon.smithy.rulesengine.aws.language.functions.partition.DefaultPartitionDataProvider