Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

refactor(ecs): tell names from ARNs through AwsArnUtils.looksLikeArn (#6879)

Hector Ventura9cea537cfa70
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCfnProvisioner.java
index 58fc79847c..787c5a1960 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCfnProvisioner.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCfnProvisioner.java
@@ -389,7 +389,7 @@ public class EcsCfnProvisioner implements CfnResourceProvisioner {
return "default";
}
int slash = clusterRef.lastIndexOf('/');
- return clusterRef.startsWith("arn:") && slash >= 0 ? clusterRef.substring(slash + 1) : clusterRef;
+ return AwsArnUtils.looksLikeArn(clusterRef) && slash >= 0 ? clusterRef.substring(slash + 1) : clusterRef;
}
/** The cluster segment of {@code service/<cluster>/<name>}; the legacy {@code service/<name>} form is the default. */
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java
index 54bd7359eb..64dc70dc20 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java
@@ -709,7 +709,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
if (cluster != null) {
result.add(cluster);
} else {
- failures.add(Failure.missing(id != null && id.startsWith("arn:")
+ failures.add(Failure.missing(AwsArnUtils.looksLikeArn(id)
? id : regionResolver.buildArn("ecs", region, "cluster/" + id)));
}
}
@@ -1407,7 +1407,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
if (ref == null) {
return false;
}
- String tail = ref.startsWith("arn:") ? ref.substring(ref.lastIndexOf('/') + 1) : ref;
+ String tail = AwsArnUtils.looksLikeArn(ref) ? ref.substring(ref.lastIndexOf('/') + 1) : ref;
int colon = tail.lastIndexOf(':');
if (colon < 0) {
return false;
@@ -2371,7 +2371,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
if (task != null) {
result.add(task);
} else {
- failures.add(Failure.missing(ref != null && ref.startsWith("arn:")
+ failures.add(Failure.missing(AwsArnUtils.looksLikeArn(ref)
? ref
: regionResolver.buildArn("ecs", region,
"task/" + cluster.getClusterName() + "/" + ref)));
@@ -3063,7 +3063,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
/** Echoes an ARN the caller supplied, otherwise builds the ARN the service would have had. */
private String missingServiceArn(EcsCluster cluster, String serviceRef, String region) {
- if (serviceRef != null && serviceRef.startsWith("arn:")) {
+ if (AwsArnUtils.looksLikeArn(serviceRef)) {
return serviceRef;
}
return regionResolver.buildArn("ecs", region,
@@ -3593,7 +3593,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
if (instance != null) {
result.add(instance);
} else {
- failures.add(Failure.missing(ref.startsWith("arn:") ? ref
+ failures.add(Failure.missing(AwsArnUtils.looksLikeArn(ref) ? ref
: containerInstanceArnFor(cluster, ref, region)));
}
}
@@ -3666,7 +3666,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
for (String ref : instanceRefs) {
ContainerInstance instance = resolveContainerInstance(cluster.getClusterArn(), ref);
if (instance == null) {
- failures.add(Failure.missing(ref.startsWith("arn:") ? ref
+ failures.add(Failure.missing(AwsArnUtils.looksLikeArn(ref) ? ref
: containerInstanceArnFor(cluster, ref, region)));
continue;
}
@@ -3791,7 +3791,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
.findFirst().orElse(null));
};
if (cp == null) {
- failures.add(Failure.missing(ref.startsWith("arn:") ? ref
+ failures.add(Failure.missing(AwsArnUtils.looksLikeArn(ref) ? ref
: regionResolver.buildArn("ecs", region, "capacity-provider/" + ref)));
continue;
}
@@ -4073,7 +4073,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
if (match != null) {
found.add(match);
} else {
- failures.add(Failure.missing(ref.startsWith("arn:") ? ref
+ failures.add(Failure.missing(AwsArnUtils.looksLikeArn(ref) ? ref
: regionResolver.buildArn("ecs", region, "task-set/"
+ cluster.getClusterName() + "/" + svc.getServiceName() + "/" + ref)));
}
@@ -5230,7 +5230,7 @@ public class EcsService implements ContainerTeardown, ResourceProvider, Resettab
*/
private String resolvedTaskDefinitionArn(EcsServiceModel svc, String region) {
String ref = svc.getTaskDefinition();
- if (ref == null || ref.startsWith("arn:")) {
+ if (ref == null || AwsArnUtils.looksLikeArn(ref)) {
return ref;
}
try {
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
index ecc94af0c7..92253483e2 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
@@ -2124,7 +2124,7 @@ public class EcsContainerManager {
/** The region embedded in an ARN {@code valueFrom} (4th segment), or {@code taskRegion} for a bare name. */
private String arnRegion(String valueFrom, String taskRegion) {
- if (valueFrom != null && valueFrom.startsWith("arn:")) {
+ if (AwsArnUtils.looksLikeArn(valueFrom)) {
String[] parts = valueFrom.split(":", 5);
if (parts.length >= 4 && !parts[3].isBlank()) {
return parts[3];
diff --git a/tools/partition/baseline.tsv b/tools/partition/baseline.tsv
index 729e05f2a3..1554c5d15e 100644
--- a/tools/partition/baseline.tsv
+++ b/tools/partition/baseline.tsv
@@ -19,7 +19,6 @@ arn-probe src/main/java/io/github/hectorvent/floci/services/appsync/graphql/reso
arn-probe src/main/java/io/github/hectorvent/floci/services/batch/BatchService.java 4
arn-probe src/main/java/io/github/hectorvent/floci/services/bedrock/BedrockService.java 3
arn-probe src/main/java/io/github/hectorvent/floci/services/budgets/BudgetsService.java 1
-arn-probe src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCfnProvisioner.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontService.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailService.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsCrossAccountService.java 1
@@ -27,8 +26,6 @@ arn-probe src/main/java/io/github/hectorvent/floci/services/connect/ConnectServi
arn-probe src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbTableNames.java 2
arn-probe src/main/java/io/github/hectorvent/floci/services/dynamodb/backend/DynamoDbLocalBackend.java 2
-arn-probe src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java 9
-arn-probe src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2TargetResolver.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/glue/GlueService.java 1
arn-probe src/main/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilder.java 8