Skip to content

Allow .api.aws endpoints #758

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.

Sign up for GitHub

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
chenliu0831 merged 8 commits into from
Jun 10, 2025
Merged

Allow .api.aws endpoints #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1a9511
Allow .api.aws endpoints
Jun 4, 2025
0a62270
Change common api prefixes to function calls
Jun 9, 2025
bc0da51
Address comments
Jun 9, 2025
11bc4e3
Merge branch 'main' into allow-api-aws-endpoints
shwdean Jun 10, 2025
7fd281f
Run spotless
rhernandez35 Jun 10, 2025
f62a567
Merge branch 'main' into allow-api-aws-endpoints
shwdean Jun 10, 2025
3f36247
Fix spotbugs and remove public visibility
Jun 10, 2025
84c24a3
Fix spotless
Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...in/java/software/amazon/smithy/java/aws/servicebundle/bundler/ApiStandardTerminology.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.java.aws.servicebundle.bundler;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -40,8 +41,18 @@ final class ApiStandardTerminology {
"Untag",
"Update");

static final Set<String> READ_ONLY_API_PREFIXES = withCommonsPrefixes(READ_ONLY_TERMS);
static final Set<String> WRITE_API_PREFIXES = withCommonsPrefixes(WRITE_TERMS);
private static final Set<String> READ_ONLY_API_PREFIXES = withCommonsPrefixes(READ_ONLY_TERMS);
private static final Set<String> WRITE_API_PREFIXES = withCommonsPrefixes(WRITE_TERMS);

@SuppressFBWarnings(value = "MS", justification = "Internal representation already immutable")
public static Set<String> getReadOnlyApiPrefixes() {
return READ_ONLY_API_PREFIXES;
}

@SuppressFBWarnings(value = "MS", justification = "Internal representation already immutable")
public static Set<String> getWriteApiPrefixes() {
return WRITE_API_PREFIXES;
}

private ApiStandardTerminology() {}

Expand Down
10 changes: 6 additions & 4 deletions ...rc/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public Builder blockedOperations(Set<String> blockedOperations) {
}

public Builder readOnlyOperations() {
this.allowedPrefixes(ApiStandardTerminology.READ_ONLY_API_PREFIXES);
this.blockedPrefixes(ApiStandardTerminology.WRITE_API_PREFIXES);
this.allowedPrefixes(ApiStandardTerminology.getReadOnlyApiPrefixes());
this.blockedPrefixes(ApiStandardTerminology.getWriteApiPrefixes());
return this;
}

Expand Down Expand Up @@ -239,8 +239,10 @@ Map<String, String> parseEndpoints(ObjectNode endpointTests) {
continue;
}

if (endpoint.startsWith("https://") && endpoint.endsWith(region + ".amazonaws.com")) {
if (endpoint.endsWith(region + ".amazonaws.com") || endpoint.contains(region + ".amazonaws.com.")) {
if (endpoint.startsWith("https://")) {
if (endpoint.endsWith(region + ".amazonaws.com")
|| endpoint.contains(region + ".amazonaws.com.")
|| endpoint.endsWith(region + ".api.aws")) {
var prev = endpoints.put(region, endpoint);
if (prev != null && !endpoint.equals(prev)) {
throw new RuntimeException(
Expand Down
4 changes: 2 additions & 2 deletions ...est/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public void testReadAndWritePrefixes() {
var bundler = AwsServiceBundler.builder()
.serviceName("dynamodb")
.resolver(serviceName -> getModel("dynamodb-2012-08-10.json"))
.allowedPrefixes(ApiStandardTerminology.READ_ONLY_API_PREFIXES)
.blockedPrefixes(ApiStandardTerminology.WRITE_API_PREFIXES)
.allowedPrefixes(ApiStandardTerminology.getReadOnlyApiPrefixes())
.blockedPrefixes(ApiStandardTerminology.getWriteApiPrefixes())
.build();
var bundle = bundler.bundle();
var bundleModel = new ModelAssembler().addUnparsedModel("model.json", bundle.getModel())
Expand Down