Skip to content

Commit 859e82d

Browse files
committed
Revert "Add validator to check consistency of resource name used for IamResource (smithy-lang#1819)"
This reverts commit 436942e.
1 parent 5accc5e commit 859e82d

File tree

9 files changed

+14
-135
lines changed

9 files changed

+14
-135
lines changed

smithy-aws-iam-traits/src/main/java/software/amazon/smithy/aws/iam/traits/IamResourceTraitValidator.java

-62
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
software.amazon.smithy.aws.iam.traits.ConditionKeysValidator
2-
software.amazon.smithy.aws.iam.traits.IamResourceTraitValidator

smithy-aws-iam-traits/src/test/java/software/amazon/smithy/aws/iam/traits/ConditionKeysIndexTest.java

+14
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,18 @@ public void successfullyLoadsConditionKeys() {
6565
assertThat(index.getDefinedConditionKeys(service, ShapeId.from("smithy.example#GetResource2")).keySet(),
6666
is(empty()));
6767
}
68+
69+
@Test
70+
public void detectsUnknownConditionKeys() {
71+
ValidatedResult<Model> result = Model.assembler()
72+
.addImport(getClass().getResource("invalid-condition-keys.smithy"))
73+
.discoverModels(getClass().getClassLoader())
74+
.assemble();
75+
76+
assertTrue(result.isBroken());
77+
assertThat(result.getValidationEvents(Severity.ERROR).stream()
78+
.map(ValidationEvent::getId)
79+
.collect(Collectors.toSet()),
80+
contains("ConditionKeys"));
81+
}
6882
}

smithy-aws-iam-traits/src/test/java/software/amazon/smithy/aws/iam/traits/TestRunnerTest.java

-21
This file was deleted.

smithy-aws-iam-traits/src/test/resources/software/amazon/smithy/aws/iam/traits/errorfiles/condition-keys/invalid-condition-keys.errors

-1
This file was deleted.

smithy-aws-iam-traits/src/test/resources/software/amazon/smithy/aws/iam/traits/errorfiles/iam-resources/invalid-iam-resources.errors

-3
This file was deleted.

smithy-aws-iam-traits/src/test/resources/software/amazon/smithy/aws/iam/traits/errorfiles/iam-resources/invalid-iam-resources.smithy

-44
This file was deleted.

smithy-aws-iam-traits/src/test/resources/software/amazon/smithy/aws/iam/traits/iam-resource.smithy

-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ $version: "1.0"
22

33
namespace smithy.example
44

5-
use aws.api#arn
6-
75
@aws.api#service(sdkId: "My")
86
service MyService {
97
version: "2020-07-02",
108
resources: [SuperResource]
119
}
1210

1311
@aws.iam#iamResource(name: "super")
14-
@arn(template: "super/{id1}")
1512
resource SuperResource {
1613
identifiers: {
1714
id1: String,

0 commit comments

Comments
 (0)