Skip to content

Remove service metadata usage #7161

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

Open
S-Saranya1 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Remove service metadata usage #7161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a3a5cf3
Remove ServiceMetadata usage from AwsClientEndpointProvider in gener…
S-Saranya1 Jul 6, 2026
2be9a06
Remove ServiceMetadata usage from RDS/Neptune/DocDB presigning interc…
S-Saranya1 Jul 13, 2026
e49686a
Remove ServiceMetadata usage from DefaultS3Presigner, S3Utilities,and…
S-Saranya1 Jul 15, 2026
0efaa74
Merge to master
S-Saranya1 Jul 17, 2026
dacad55
Remove ServiceMetadata dependency from HelpfulUnknownHostExceptionInt…
S-Saranya1 Jul 21, 2026
408de94
Resolve signing region from endpoint rules, remove ServiceMetadata de…
S-Saranya1 Jul 23, 2026
c78d9b6
Stop generating ServiceMetadata classes for new services (#7185)
S-Saranya1 Jul 29, 2026
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
56 changes: 41 additions & 15 deletions .../src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@

package software.amazon.awssdk.codegen.lite.maven.plugin;

import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
Expand Down Expand Up @@ -50,6 +55,8 @@ public class RegionGenerationMojo extends AbstractMojo {
private static final String SERVICE_METADATA_BASE = "software.amazon.awssdk.regions.servicemetadata";
private static final String REGION_METADATA_BASE = "software.amazon.awssdk.regions.regionmetadata";
private static final String REGION_BASE = "software.amazon.awssdk.regions";
private static final String SERVICE_METADATA_ALLOWLIST_PATH =
"/software/amazon/awssdk/codegen/lite/service-metadata-allowlist.txt";

@Parameter(property = "outputDirectory", defaultValue = "${project.build.directory}")
private String outputDirectory;
Expand All @@ -68,21 +75,28 @@ public class RegionGenerationMojo extends AbstractMojo {
@Override
public void execute() throws MojoExecutionException {
Path baseSourcesDirectory = Paths.get(outputDirectory).resolve("generated-sources").resolve("sdk");
Path testsDirectory = Paths.get(outputDirectory).resolve("generated-test-sources").resolve("sdk-tests");

Partitions partitions = RegionMetadataLoader.build(endpoints);
PartitionsRegionsMetadata regionPartitions = PartitionsRegionsMetadataLoader.build(partitionsJson);

Set<String> allEndpointServices = new HashSet<>();
partitions.getPartitions().forEach(p -> allEndpointServices.addAll(p.getServices().keySet()));
Set<String> allowedServices = loadServiceMetadataAllowlist();
Set<String> effectiveServices = allowedServices.stream()
.filter(allEndpointServices::contains)
.collect(Collectors.toSet());

generatePartitionMetadataClass(baseSourcesDirectory, regionPartitions);
generateRegionClass(baseSourcesDirectory, regionPartitions);
generateServiceMetadata(baseSourcesDirectory, partitions);
generateServiceMetadata(baseSourcesDirectory, partitions, effectiveServices);
generateRegions(baseSourcesDirectory, regionPartitions);
generatePartitionProvider(baseSourcesDirectory, regionPartitions);
generateRegionProvider(baseSourcesDirectory, regionPartitions);
generateServiceProvider(baseSourcesDirectory, partitions);
generateServiceProvider(baseSourcesDirectory, effectiveServices);
generateEndpointTags(baseSourcesDirectory, partitions);

project.addCompileSourceRoot(baseSourcesDirectory.toFile().getAbsolutePath());
Path testsDirectory = Paths.get(outputDirectory).resolve("generated-test-sources").resolve("sdk-tests");
project.addTestCompileSourceRoot(testsDirectory.toFile().getAbsolutePath());
}

Expand All @@ -100,15 +114,13 @@ public void generateRegionClass(Path baseSourcesDirectory, PartitionsRegionsMeta
new CodeGenerator(sourcesDirectory.toString(), new RegionGenerator(partitions, REGION_BASE)).generate();
}

public void generateServiceMetadata(Path baseSourcesDirectory, Partitions partitions) {
public void generateServiceMetadata(Path baseSourcesDirectory, Partitions partitions, Set<String> effectiveServices) {
Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(SERVICE_METADATA_BASE, ".", "/"));
Set<String> services = new HashSet<>();
partitions.getPartitions().forEach(p -> services.addAll(p.getServices().keySet()));

services.forEach(s -> new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataGenerator(partitions,
s,
SERVICE_METADATA_BASE,
REGION_BASE))
effectiveServices.forEach(s -> new CodeGenerator(sourcesDirectory.toString(),
new ServiceMetadataGenerator(partitions,
s,
SERVICE_METADATA_BASE,
REGION_BASE))
.generate());
}

Expand Down Expand Up @@ -141,16 +153,30 @@ public void generateRegionProvider(Path baseSourcesDirectory, PartitionsRegionsM
.generate();
}

public void generateServiceProvider(Path baseSourcesDirectory, Partitions partitions) {
public void generateServiceProvider(Path baseSourcesDirectory, Set<String> effectiveServices) {
Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(REGION_BASE, ".", "/"));
new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataProviderGenerator(partitions,
SERVICE_METADATA_BASE,
REGION_BASE))
new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataProviderGenerator(SERVICE_METADATA_BASE,
REGION_BASE,
effectiveServices))
.generate();
}

public void generateEndpointTags(Path baseSourcesDirectory, Partitions partitions) {
Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(REGION_BASE, ".", "/"));
new CodeGenerator(sourcesDirectory.toString(), new EndpointTagGenerator(partitions, REGION_BASE)).generate();
}

private Set<String> loadServiceMetadataAllowlist() {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(
Objects.requireNonNull(RegionGenerationMojo.class.getResourceAsStream(SERVICE_METADATA_ALLOWLIST_PATH),
"Failed to load service-metadata-allowlist.txt"),
StandardCharsets.UTF_8))) {
return reader.lines()
.map(String::trim)
.filter(line -> !line.isEmpty() && !line.startsWith("#"))
.collect(Collectors.toSet());
} catch (Exception e) {
throw new RuntimeException("Failed to load service-metadata-allowlist.txt", e);
}
}
}
Loading