diff --git a/docs/services/iam.md b/docs/services/iam.md
index 1c7384fb413..eba7f57ccc6 100644
--- a/docs/services/iam.md
+++ b/docs/services/iam.md
@@ -2332,8 +2332,7 @@ requests retain HTTP 403 XML `AccessDenied` responses, except SNS's, which retur
action is denied. The routed protocol determines the status, not just the request's content type.
A request is checked against the resources it names. Floci builds their ARNs itself for S3,
-DynamoDB, SSM, KMS, IAM, API Gateway
-and CloudWatch Logs. For Secrets Manager, Elastic Load Balancing, ECR,
+DynamoDB, SSM, KMS, IAM and API Gateway. For Secrets Manager, Elastic Load Balancing, ECR,
Step Functions, EventBridge, EventBridge Scheduler, Amazon Cognito user pools and identity pools, Amazon Data Firehose, Cloud
Map, ACM, CodePipeline, CodeBuild, Amazon Managed Service for Apache Flink (Kinesis Data Analytics v2),
Application Auto Scaling, AWS Budgets, Cost and Usage Reports, Service Quotas, Amazon Textract, Amazon Translate, Amazon Athena,
@@ -2341,7 +2340,7 @@ AWS Data Exports, AWS Pricing Calculator, Cost Explorer, CloudTrail, Global Acce
Timestream for InfluxDB, Amazon Redshift, the Amazon Redshift Data API, AWS Payment Cryptography, AWS DataSync, Amazon EMR,
Amazon Rekognition, IAM Identity Center, Amazon Inspector, Amazon Macie, AWS Fault Injection Service, AWS Resource
Access Manager, CloudWatch Observability Access Manager, AWS Resource Explorer, AWS Account Management, AWS Control
-Catalog, Amazon OpenSearch Service, IAM Access Analyzer, AWS Security Hub, Amazon GuardDuty, Lambda, AWS Glue, Amazon SQS, Amazon SNS, Amazon Kinesis Data Streams, Amazon EventBridge Pipes, Aurora DSQL, STS, Amazon EKS and AWS Resource Groups they come from a table generated from AWS's Service Reference and botocore, `src/main/resources/aws/iam-request-resources.json`, which gives each
+Catalog, Amazon OpenSearch Service, IAM Access Analyzer, AWS Security Hub, Amazon GuardDuty, Lambda, AWS Glue, Amazon SQS, Amazon SNS, Amazon Kinesis Data Streams, Amazon EventBridge Pipes, Aurora DSQL, STS, Amazon EKS, AWS Resource Groups and Amazon CloudWatch Logs they come from a table generated from AWS's Service Reference and botocore, `src/main/resources/aws/iam-request-resources.json`, which gives each
operation's action, the resource types that action acts on with their ARN formats, and the request
members that name them: a member holding a resource's ARN, which counts when it matches the format
of a type the action acts on, or members filling the variables of a type's format. Nothing in it is
@@ -3088,19 +3087,22 @@ These identities always bypass enforcement (backward-compatible defaults):
| No `Authorization` header | **Rejected** for a JSON, CBOR or Query management call, unless AWS serves the operation without credentials. Allowed for a REST request such as a health check (see [Unsigned requests](#unsigned-requests)) |
| Unresolvable IAM action for the request | Allowed — unknown mappings are permissive |
-**CloudWatch Logs streams.** `logs:CreateLogStream` and `logs:DeleteLogStream` evaluate the
-specific log-stream ARN, so policies can allow or deny one stream within a group. Their
-`aws:ResourceTag/` conditions read the owning log group's current tags in the request's
-account and region. Both stream operations check the documented group and stream name constraints
+**CloudWatch Logs streams.** `logs:CreateLogStream`, `logs:DeleteLogStream`, `logs:PutLogEvents` and
+`logs:GetLogEvents` are checked on the log-stream ARN their group and stream names give, from the generated
+table, so policies can allow or deny one stream within a group. A stream ARN carries no
+`aws:ResourceTag/`: Floci holds no tags on a stream, and nothing AWS publishes gives a stream its group's.
+`CreateLogStream` and `DeleteLogStream` check the documented group and stream name constraints
before changing storage, preventing delimiter aliases from targeting another stream.
These checks also apply to deletion: legacy streams with names containing `:` or `*` cannot be
deleted through `DeleteLogStream`. Existing stored names are not automatically migrated.
-**CloudWatch Logs groups.** `CreateLogGroup`, `DeleteLogGroup`, `PutRetentionPolicy` and
-`DeleteRetentionPolicy` accept policy resources naming the selected group with a bare ARN
-or its legacy `:*` form. Both forms participate in each statement, including explicit denies
-and `NotResource`, without bypassing session, boundary or SCP ceilings. The three operations on
-existing groups read that group's resource tags; creation uses the request's `tags` for
+**CloudWatch Logs groups.** An operation on a log group, `FilterLogEvents`, `DescribeLogStreams`, metric and
+subscription filters and `StartQuery` among them, is checked on the group's bare ARN, as the Service Reference
+formats a log group, from the generated table. `CreateLogGroup`, `DeleteLogGroup`, `PutRetentionPolicy`,
+`DeleteRetentionPolicy` and `TagLogGroup` also accept policy resources naming the selected group with its legacy
+`:*` form. Both forms participate in each statement, including explicit denies
+and `NotResource`, without bypassing session, boundary or SCP ceilings. An operation on an
+existing group reads that group's resource tags; creation uses the request's `tags` for
`aws:RequestTag/` and `aws:TagKeys`. Tagged creation additionally requires either
`logs:TagResource` on the bare group ARN or `logs:TagLogGroup` on either group ARN form.
The group name constraints apply before mutation, and deletion preserves streams and filters
@@ -3108,22 +3110,24 @@ whose stored group identity belongs to another historical group. These four oper
or `*` in a group name. Historical names remain taggable through the ARN tagging APIs below;
they cannot be newly created or deleted through the group lifecycle APIs. Stored names are not migrated.
-**CloudWatch Logs ARN tagging.** For log groups, `logs:TagResource`, `logs:UntagResource`
-and `logs:ListTagsForResource` evaluate the group's ARN without a trailing `:*`. The ARN must
+**CloudWatch Logs ARN tagging.** `logs:TagResource`, `logs:UntagResource` and
+`logs:ListTagsForResource` are checked on the ARN their `resourceArn` carries, from the generated table, for each
+type the Service Reference gives them: a log group, a destination, a delivery source, a delivery destination or a
+delivery. For a log group the ARN must
identify a group in the request's account, region and partition; a different owner or resource
kind returns `ResourceNotFoundException` without reading or changing a local group's tags.
-All three actions use the group's existing `aws:ResourceTag/` conditions. `TagResource`
+All three actions use the resource's existing `aws:ResourceTag/` conditions. `TagResource`
also provides `aws:RequestTag/` and `aws:TagKeys`; `UntagResource` provides `aws:TagKeys`.
An unauthorized request cannot partially add or remove tags. These ownership checks also apply
when IAM enforcement is disabled. Shared tag mutations reject storage aliases whose stored group
name differs from the requested name, without migrating historical records.
-This support covers log groups. Tagging destinations and other CloudWatch Logs resource types
-remains unsupported. Plain-name inputs are used literally, including incomplete prefixes such as
+The tag handlers also take a plain group name, used literally, including incomplete prefixes such as
`arn:archive`; arbitrary `:log-group:` substrings never select a different group. Structurally complete
ARNs take precedence over plain-name interpretation and must identify a local group. A trailing `:*`
is accepted on a canonical local group ARN. These compatibility forms are not a claim that AWS accepts
-them for these APIs. Other Logs actions retain their existing wildcard resource evaluation.
+them for these APIs, and authorization reads `resourceArn` as AWS does: a plain name names nothing the
+table reads, so the call is checked on `*`, and a group ARN with a trailing `:*` is checked as written.
**CloudWatch Logs account policies.** `PutAccountPolicy` also needs the action for the type of
policy it creates, checked against `*` like `logs:PutAccountPolicy` itself: `logs:PutDataProtectionPolicy`
@@ -3503,9 +3507,7 @@ floci populates:
`ResourceId.N` or `InstanceId.N`), and for `s3:GetBucketTagging`, `s3:DeleteBucket` and the
`s3:PutBucketTagging` that `DeleteBucketTagging` is checked as (the bucket). A request naming several EC2 resources is evaluated
once per resource and denied when any of them fails the condition, as on AWS.
- `logs:CreateLogStream`, `logs:DeleteLogStream`, `logs:TagResource`, `logs:UntagResource`,
- `logs:ListTagsForResource`, `logs:DeleteLogGroup`, `logs:PutRetentionPolicy` and
- `logs:DeleteRetentionPolicy` use the owning log group's tags. Any other ARN a request is checked on
+ Any other ARN a request is checked on
takes the resource-tag keys the generated `resourceTagKeys` table in `iam-request-resources.json` gives
its type (`aws:ResourceTag/`, `secretsmanager:ResourceTag/`), which `regen_iam_request_resources.py`
reads from the Service Reference for every namespace it reads, valued from the tags the type's service
@@ -3538,8 +3540,9 @@ floci populates:
Load Balancing for its load balancers, target groups, listeners and rules and its Classic Load Balancers, SQS for its
queues, SNS for its topics, Kinesis Data Streams for its streams and consumers, EventBridge Pipes for its pipes,
Aurora DSQL for its clusters, EKS for its clusters, node groups, Fargate profiles, add-ons, Pod Identity
- associations and access entries and Resource Groups for its groups. Tag keys differing only in case are one condition
- key holding every value.
+ associations and access entries, Resource Groups for its groups and CloudWatch Logs for its log groups,
+ destinations, delivery sources, delivery destinations and deliveries. Tag keys differing only in case are one
+ condition key holding every value.
- EC2 resource keys such as a network interface's `ec2:Vpc`, `ec2:Subnet`, `ec2:AvailabilityZone` and
`ec2:NetworkInterfaceID`: for every action on a resource EC2 holds, the members of the resource the
key names, an ARN for a key the Service Reference types as one. `resourceKeys` in
diff --git a/src/main/java/io/floci/aws/core/common/IamConditionContextResolver.java b/src/main/java/io/floci/aws/core/common/IamConditionContextResolver.java
index 4acfbae9e51..cf4db08da0e 100644
--- a/src/main/java/io/floci/aws/core/common/IamConditionContextResolver.java
+++ b/src/main/java/io/floci/aws/core/common/IamConditionContextResolver.java
@@ -5,10 +5,6 @@
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.floci.aws.config.EmulatorConfig;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsCrossAccountService;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsDeliveryService;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsService;
-import io.floci.aws.services.cloudwatch.logs.LogGroupTagTarget;
import io.floci.aws.services.dynamodb.DynamoDbConditionKeys;
import io.floci.aws.services.dynamodb.DynamoDbFacade;
import io.floci.aws.services.dynamodb.DynamoDbPartiQLParser;
@@ -111,8 +107,6 @@ public class IamConditionContextResolver {
private final Instance dynamoDbFacade;
private final Instance ec2Service;
private final Instance s3Service;
- private final Instance logsService;
- private final Instance crossAccountService;
private final Instance iamService;
private final Instance lambdaWebService;
private final Instance requestConditionSpellings;
@@ -132,8 +126,6 @@ public class IamConditionContextResolver {
public IamConditionContextResolver(Instance dynamoDbFacade,
Instance ec2Service,
Instance s3Service,
- Instance logsService,
- Instance crossAccountService,
Instance iamService,
Instance lambdaWebService,
Instance requestConditionSpellings,
@@ -143,7 +135,7 @@ public IamConditionContextResolver(Instance dynamoDbFacade,
EmulatorConfig config,
CurrentVertxRequest currentVertxRequest,
ResolvedServiceCatalog serviceCatalog) {
- this(dynamoDbFacade, ec2Service, s3Service, logsService, crossAccountService, iamService,
+ this(dynamoDbFacade, ec2Service, s3Service, iamService,
lambdaWebService, requestConditionSpellings, storedResourceArns, requestContext, regionResolver,
config, currentVertxRequest, serviceCatalog, Clock.systemUTC());
}
@@ -151,8 +143,6 @@ public IamConditionContextResolver(Instance dynamoDbFacade,
IamConditionContextResolver(Instance dynamoDbFacade,
Instance ec2Service,
Instance s3Service,
- Instance logsService,
- Instance crossAccountService,
Instance iamService,
Instance lambdaWebService,
Instance requestConditionSpellings,
@@ -165,8 +155,6 @@ public IamConditionContextResolver(Instance dynamoDbFacade,
this.dynamoDbFacade = dynamoDbFacade;
this.ec2Service = ec2Service;
this.s3Service = s3Service;
- this.logsService = logsService;
- this.crossAccountService = crossAccountService;
this.iamService = iamService;
this.lambdaWebService = lambdaWebService;
this.requestConditionSpellings = requestConditionSpellings;
@@ -298,81 +286,35 @@ public Map> resolve(String credentialScope, String action,
};
}
- /** Logs tag operations and group mutations use the handler's resource and request scope. */
+ /**
+ * The tags a CloudWatch Logs call asks to attach or remove, read as its handler reads them: a tagged
+ * {@code CreateLogGroup}'s and a {@code TagResource}'s {@code tags} as {@code aws:RequestTag/} and
+ * {@code aws:TagKeys}, an {@code UntagResource}'s {@code tagKeys} as {@code aws:TagKeys}. The tags of what the
+ * request names come from Logs' {@link StoredResourceArns}, as for every namespace the table reads.
+ */
private Map> logsConditionContext(String action, ContainerRequestContext ctx) {
- if (!("logs:CreateLogStream".equals(action) || "logs:DeleteLogStream".equals(action)
- || LogGroupTagTarget.supports(action) || "logs:CreateLogGroup".equals(action) || "logs:DeleteLogGroup".equals(action)
- || "logs:PutRetentionPolicy".equals(action) || "logs:DeleteRetentionPolicy".equals(action))) {
+ if (!("logs:CreateLogGroup".equals(action) || "logs:TagResource".equals(action)
+ || "logs:UntagResource".equals(action))) {
return null;
}
JsonNode body = bufferedJsonBody(ctx);
if (body == null) {
return null;
}
- if ("logs:CreateLogGroup".equals(action)) {
- JsonNode tags = body.path("tags");
- if (!tags.isObject() || tags.isEmpty()) {
- return null;
- }
- Map> conditions = new LinkedHashMap<>();
- List keys = new ArrayList<>();
- tags.properties().forEach(entry -> {
- keys.add(entry.getKey());
- conditions.put("aws:RequestTag/" + entry.getKey(), List.of(entry.getValue().asText()));
- });
- conditions.put("aws:TagKeys", keys);
- return conditions;
- }
- boolean direct = LogGroupTagTarget.supports(action);
- boolean destination = direct && CloudWatchLogsCrossAccountService.isCrossAccountDestinationArn(
- body.path("resourceArn").asText());
- if (destination ? !crossAccountService.isResolvable() : !logsService.isResolvable()) {
- return null;
- }
- String region = requestContext.getRegion() == null ? config.defaultRegion() : requestContext.getRegion();
Map> conditions = new LinkedHashMap<>();
- if ("logs:TagResource".equals(action) && body.path("tags").isObject()) {
- List keys = new ArrayList<>();
- body.path("tags").fields().forEachRemaining(entry -> {
+ List keys = new ArrayList<>();
+ if ("logs:UntagResource".equals(action)) {
+ body.path("tagKeys").forEach(key -> keys.add(key.asText()));
+ } else if (body.path("tags").isObject()) {
+ body.path("tags").properties().forEach(entry -> {
keys.add(entry.getKey());
conditions.put(REQUEST_TAG_PREFIX + entry.getKey(), List.of(entry.getValue().asText()));
});
- if (!keys.isEmpty()) {
- conditions.put("aws:TagKeys", keys);
- }
- } else if ("logs:UntagResource".equals(action)) {
- List keys = new ArrayList<>();
- body.path("tagKeys").forEach(key -> keys.add(key.asText()));
- if (!keys.isEmpty()) {
- conditions.put("aws:TagKeys", keys);
- }
- }
- if (direct && CloudWatchLogsDeliveryService.isDeliveryResourceArn(body.path("resourceArn").asText())) {
- // A delivery source, destination or delivery: its request tags apply, its own tags are not read.
- return conditions.isEmpty() ? null : conditions;
- }
- Map tags;
- try {
- if (destination) {
- tags = crossAccountService.get().listDestinationTags(body.path("resourceArn").asText(), region);
- } else {
- String group = direct ? logsService.get().resolveTagTarget(body.path("resourceArn").asText(), region).name()
- : body.path("logGroupName").asText();
- tags = logsService.get().listTagsLogGroup(group, region);
- }
- } catch (AwsException e) {
- if (!"ResourceNotFoundException".equals(e.getErrorCode())) {
- throw e;
- }
- // Leave the handler to report a missing resource; unexpected lookup errors must not hide a deny.
- return conditions.isEmpty() ? null : conditions;
}
- if (tags == null || tags.isEmpty()) {
- return conditions.isEmpty() ? null : conditions;
+ if (!keys.isEmpty()) {
+ conditions.put("aws:TagKeys", keys);
}
- tags.forEach((key, value) -> conditions.put(RESOURCE_TAG_PREFIX + key,
- List.of(value == null ? "" : value)));
- return conditions;
+ return conditions.isEmpty() ? null : conditions;
}
/** The condition key whose value a delegation can decide rather than the request. */
diff --git a/src/main/java/io/floci/aws/core/common/IamEnforcementFilter.java b/src/main/java/io/floci/aws/core/common/IamEnforcementFilter.java
index aba4f450e22..6d998d88f4c 100644
--- a/src/main/java/io/floci/aws/core/common/IamEnforcementFilter.java
+++ b/src/main/java/io/floci/aws/core/common/IamEnforcementFilter.java
@@ -649,17 +649,17 @@ public void filter(ContainerRequestContext ctx) {
}
// Tagged group creation requires either tagging permission, using the same resolved
- // caller (including session, boundary and SCP ceilings) as the primary operation.
+ // caller (including session, boundary and SCP ceilings) as the primary operation, on the
+ // group the table checks the create on; the evaluator matches TagLogGroup's policies on it
+ // with or without the trailing :* as it does the create's.
if ("logs:CreateLogGroup".equals(action) && conditionContext != null
&& !conditionContext.getOrDefault("aws:TagKeys", List.of()).isEmpty()) {
- String groupResource = resources.getFirst();
- String taggingResource = groupResource.substring(0, groupResource.length() - 2);
+ String taggingResource = resources.getFirst();
Map> taggingContext = IamConditionContextResolver.withGlobalContext(
conditionContext, taggingResource, region, accountId, accountId);
- Map> groupContext = IamConditionContextResolver.withGlobalContext(
- conditionContext, groupResource, region, accountId, accountId);
if (evaluator.evaluate(caller, null, "logs:TagResource", taggingResource, taggingContext) == Decision.DENY
- && evaluator.evaluate(caller, null, "logs:TagLogGroup", groupResource, groupContext) == Decision.DENY) {
+ && evaluator.evaluate(caller, null, "logs:TagLogGroup", taggingResource, taggingContext)
+ == Decision.DENY) {
LOG.infov("IAM enforcement DENY: akid={0} action={1} resource={2}",
akid, "logs:TagResource", taggingResource);
ctx.abortWith(accessDeniedForRequest("logs:TagResource", credentialScope, ctx, taggingResource));
@@ -1801,16 +1801,12 @@ private static String postObjectEventName(String action, Set queryParame
}
/**
- * Logs, Secrets Manager and KMS targets depend on the serving operation and the request's partition; API
- * Gateway's path ARNs on the request's partition, which that service mints them in; and the targets of a
- * namespace the table of request resources reads on {@code operation}, the one the request is dispatched as (see
- * {@link RequestResources}).
+ * KMS targets depend on the serving operation and the request's partition; API Gateway's path ARNs on the
+ * request's partition, which that service mints them in; and the targets of a namespace the table of request
+ * resources reads on {@code operation}, the one the request is dispatched as (see {@link RequestResources}).
*/
private List targetResources(String credentialScope, String action, String operation,
ContainerRequestContext ctx, String region, String accountId) {
- if ("logs".equals(credentialScope)) {
- return arnBuilder.buildLogResources(action, ctx, region, accountId, requestPartition());
- }
if ("kms".equals(credentialScope)) {
return arnBuilder.buildKmsResources(action, ctx, region, accountId, requestPartition());
}
diff --git a/src/main/java/io/floci/aws/core/common/StoredResourceArns.java b/src/main/java/io/floci/aws/core/common/StoredResourceArns.java
index dfa57e366d0..f583ab918fd 100644
--- a/src/main/java/io/floci/aws/core/common/StoredResourceArns.java
+++ b/src/main/java/io/floci/aws/core/common/StoredResourceArns.java
@@ -61,9 +61,11 @@
* group, a listener, a rule or a Classic Load Balancer; SQS, for the tags of a queue; SNS, for the tags of a topic;
* Kinesis Data Streams, for the tags of a stream or a consumer; EventBridge Pipes, for the tags of a pipe; Aurora DSQL,
* for the tags of a cluster; EKS, for the tags of a cluster, a node group, a Fargate profile, an add-on, a Pod Identity
- * association or an access entry; Resource Groups, for the tags of a group); looked up lazily by
- * {@code ResourceArnBuilder} and {@code IamConditionContextResolver} through {@code Instance} for
- * the namespace a request or an ARN is of, so IAM never depends on that service directly.
+ * association or an access entry; Resource Groups, for the tags of a group; CloudWatch Logs, for a delivery, the
+ * delivery destinations of a delivery source and the tags of a log group, a destination, a delivery source, a
+ * delivery destination or a delivery); looked up lazily by {@code ResourceArnBuilder} and
+ * {@code IamConditionContextResolver} through {@code Instance} for the namespace a request or an
+ * ARN is of, so IAM never depends on that service directly.
*
* Each answer is a lookup of what the service holds, asked for by an entry of the generated table ({@code find},
* {@code through}, a default, {@code forwarded}, a type's {@code resourceTagKeys}): never a fact about what an operation acts on, which the table alone
diff --git a/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsService.java b/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsService.java
index a0923268734..9c284e1c716 100644
--- a/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsService.java
+++ b/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsService.java
@@ -454,18 +454,34 @@ public LogGroupTagTarget resolveTagTarget(String resourceArn, String region) {
return LogGroupTagTarget.resolve(resourceArn, region, regionResolver.getAccountId(), regionResolver.getPartition());
}
+ /**
+ * Gives the group a new map holding its tags and {@code tags}, under the lock creating and deleting a group take,
+ * so a tag call never puts back a group a delete has removed.
+ */
public void tagLogGroup(String groupName, Map tags, String region) {
- String key = groupKey(region, groupName);
- LogGroup group = requireNamedLogGroup(region, groupName);
- group.getTags().putAll(tags);
- groupStore.put(key, group);
+ synchronized (metricFilterStore) {
+ String key = groupKey(region, groupName);
+ LogGroup group = requireNamedLogGroup(region, groupName);
+ Map merged = new HashMap<>(group.getTags() != null ? group.getTags() : Map.of());
+ merged.putAll(tags);
+ group.setTags(merged);
+ groupStore.put(key, group);
+ }
}
+ /**
+ * Gives the group a new map holding its tags but {@code tagKeys}, under the lock creating and deleting a group
+ * take, so an untag call never puts back a group a delete has removed.
+ */
public void untagLogGroup(String groupName, List tagKeys, String region) {
- String key = groupKey(region, groupName);
- LogGroup group = requireNamedLogGroup(region, groupName);
- tagKeys.forEach(group.getTags()::remove);
- groupStore.put(key, group);
+ synchronized (metricFilterStore) {
+ String key = groupKey(region, groupName);
+ LogGroup group = requireNamedLogGroup(region, groupName);
+ Map remaining = new HashMap<>(group.getTags() != null ? group.getTags() : Map.of());
+ tagKeys.forEach(remaining::remove);
+ group.setTags(remaining);
+ groupStore.put(key, group);
+ }
}
/**
@@ -499,6 +515,18 @@ public Map listTagsLogGroup(String groupName, String region) {
return group.getTags();
}
+ /**
+ * The tags of the log group named {@code name} in {@code region} of {@code accountId}, read in place where its tag
+ * handlers read; none when that account holds no such group. Tag calls give the group a new map one at a time, so
+ * the read is of one whole set.
+ */
+ Map groupTagsInAccount(String accountId, String region, String name) {
+ return getForAccount(groupStore, accountId, groupKey(region, name))
+ .filter(stored -> name.equals(stored.getLogGroupName()))
+ .map(LogGroup::getTags)
+ .orElse(Map.of());
+ }
+
// ──────────────────────────── Log Streams ────────────────────────────
public void createLogStream(String groupName, String streamName, String region) {
diff --git a/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsStoredResourceArns.java b/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsStoredResourceArns.java
index bc19bcdcc44..04dbcea7283 100644
--- a/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsStoredResourceArns.java
+++ b/src/main/java/io/floci/aws/services/cloudwatch/logs/CloudWatchLogsStoredResourceArns.java
@@ -1,31 +1,46 @@
package io.floci.aws.services.cloudwatch.logs;
+import io.floci.aws.core.common.AwsArnUtils;
import io.floci.aws.core.common.AwsException;
+import io.floci.aws.core.common.RegionResolver;
import io.floci.aws.core.common.StoredResourceArns;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
/**
* What IAM asks CloudWatch Logs of the resources a request names: the caller's delivery of the id it was created
- * with, and the delivery destinations the deliveries from a delivery source send to, which the Service Reference
- * checks a {@code DeleteDeliverySource} on.
+ * with, the delivery destinations the deliveries from a delivery source send to, which the Service Reference
+ * checks a {@code DeleteDeliverySource} on, and the tags of a log group, a destination or a delivery source,
+ * delivery destination or delivery.
*/
@ApplicationScoped
public class CloudWatchLogsStoredResourceArns implements StoredResourceArns {
+ private static final String NAMESPACE = "logs";
+ private static final String LOG_GROUP = "log-group:";
+ private static final String ALL_STREAMS = ":*";
+
+ private final CloudWatchLogsService logs;
+ private final CloudWatchLogsCrossAccountService destinations;
private final CloudWatchLogsDeliveryService deliveries;
+ private final RegionResolver regionResolver;
@Inject
- public CloudWatchLogsStoredResourceArns(CloudWatchLogsDeliveryService deliveries) {
+ public CloudWatchLogsStoredResourceArns(CloudWatchLogsService logs, CloudWatchLogsCrossAccountService destinations,
+ CloudWatchLogsDeliveryService deliveries, RegionResolver regionResolver) {
+ this.logs = logs;
+ this.destinations = destinations;
this.deliveries = deliveries;
+ this.regionResolver = regionResolver;
}
@Override
public String namespace() {
- return "logs";
+ return NAMESPACE;
}
/** The ARN of the caller's delivery of the id {@code names} gives, as the service stored it; empty for none. */
@@ -46,4 +61,45 @@ public Optional find(String type, List names, String region) {
public List through(String member, String value, String region) {
return "name".equals(member) ? deliveries.destinationArnsFrom(value, region) : List.of();
}
+
+ /**
+ * The tags of the log group, destination, delivery source, delivery destination or delivery whose ARN is
+ * {@code arn}, in the request's account, where the tag handlers read: an ARN of another account names none, and
+ * neither does a log stream's, Floci holding no tags on a stream. A log group is read in place by the name its ARN
+ * gives, a trailing {@code :*} dropped as its tag handlers drop it, in the ARN's Region. A resource Floci does not
+ * hold has none; any other failure of the lookup is thrown, so it cannot pass for a resource without tags. A tag
+ * without a value reads as an empty one.
+ */
+ @Override
+ public Map storedTags(String arn) {
+ if (!AwsArnUtils.isArnFor(arn, NAMESPACE)) {
+ return Map.of();
+ }
+ AwsArnUtils.Arn parsed = AwsArnUtils.parse(arn);
+ String account = regionResolver.getAccountId();
+ String region = parsed.region();
+ if (!parsed.accountId().equals(account) || region.isBlank()) {
+ return Map.of();
+ }
+ String resource = parsed.resource();
+ if (resource.startsWith(LOG_GROUP)) {
+ String name = resource.substring(LOG_GROUP.length());
+ name = name.endsWith(ALL_STREAMS) ? name.substring(0, name.length() - ALL_STREAMS.length()) : name;
+ return name.isEmpty() || name.indexOf(':') >= 0 ? Map.of()
+ : StoredResourceArns.withEmptyValues(logs.groupTagsInAccount(account, region, name));
+ }
+ try {
+ if (CloudWatchLogsCrossAccountService.isCrossAccountDestinationArn(arn)) {
+ return StoredResourceArns.withEmptyValues(destinations.listDestinationTags(arn, region));
+ }
+ if (deliveries.isDeliveryArn(arn, region)) {
+ return StoredResourceArns.withEmptyValues(deliveries.listTags(arn, region));
+ }
+ } catch (AwsException e) {
+ if (!"ResourceNotFoundException".equals(e.getErrorCode())) {
+ throw e;
+ }
+ }
+ return Map.of();
+ }
}
diff --git a/src/main/java/io/floci/aws/services/cloudwatch/logs/model/LogGroup.java b/src/main/java/io/floci/aws/services/cloudwatch/logs/model/LogGroup.java
index e5d731e1525..3008c0c8abd 100644
--- a/src/main/java/io/floci/aws/services/cloudwatch/logs/model/LogGroup.java
+++ b/src/main/java/io/floci/aws/services/cloudwatch/logs/model/LogGroup.java
@@ -16,7 +16,7 @@ public class LogGroup {
private Integer retentionInDays;
private boolean deletionProtectionEnabled;
private String kmsKeyId;
- private Map tags = new HashMap<>();
+ private volatile Map tags = new HashMap<>();
public LogGroup() {}
diff --git a/src/main/java/io/floci/aws/services/iam/ResourceArnBuilder.java b/src/main/java/io/floci/aws/services/iam/ResourceArnBuilder.java
index 6f114c93607..f963fb2db01 100644
--- a/src/main/java/io/floci/aws/services/iam/ResourceArnBuilder.java
+++ b/src/main/java/io/floci/aws/services/iam/ResourceArnBuilder.java
@@ -12,9 +12,6 @@
import io.floci.aws.core.common.SigV4CredentialScope;
import io.floci.aws.core.common.StoredResourceArns;
import io.floci.aws.core.common.auth.SigV4Canonicalization;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsCrossAccountService;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsDeliveryService;
-import io.floci.aws.services.cloudwatch.logs.LogGroupTagTarget;
import io.floci.aws.services.kms.KmsService;
import io.floci.aws.services.s3.S3ControlArnUtils;
import io.floci.aws.services.s3.S3ObjectKeys;
@@ -218,43 +215,6 @@ private StoredResourceArns storedResourceArns(String namespace) {
return null;
}
- /** Uses the serving operation and the same raw names as the handler. */
- public List buildLogResources(String action, ContainerRequestContext ctx,
- String region, String accountId, String partition) {
- // Operations the vendored table reads take their resources from it.
- if (RequestResources.reads(action)) {
- return namedResources("logs", action, ctx, region, accountId, partition);
- }
- boolean stream = "logs:CreateLogStream".equals(action) || "logs:DeleteLogStream".equals(action);
- boolean group = switch (action) {
- case "logs:CreateLogGroup", "logs:DeleteLogGroup", "logs:PutRetentionPolicy",
- "logs:DeleteRetentionPolicy" -> true;
- default -> false;
- };
- if (!stream && !group && !LogGroupTagTarget.supports(action)) {
- return List.of("*");
- }
- JsonNode body = readJsonBody(ctx);
- if (body == null) {
- return List.of("*");
- }
- if (LogGroupTagTarget.supports(action)) {
- String resourceArn = body.path("resourceArn").asText();
- // A delivery source, destination or delivery is tagged through the same operations.
- if (CloudWatchLogsDeliveryService.isDeliveryResourceArn(resourceArn)) {
- return List.of(resourceArn);
- }
- if (CloudWatchLogsCrossAccountService.isCrossAccountDestinationArn(resourceArn)) {
- return List.of(resourceArn);
- }
- return List.of(LogGroupTagTarget.resolve(resourceArn, region, accountId, partition).arn());
- }
- String name = body.path("logGroupName").asText();
- String resource = "log-group:" + name + (stream
- ? ":log-stream:" + body.path("logStreamName").asText() : ":*");
- return List.of(new AwsArnUtils.Arn(partition, "logs", region, accountId, resource).toString());
- }
-
// ── IAM ─────────────────────────────────────────────────────────────────────
/** A stored entity's ARN and path, the two things a target ARN is built from. */
diff --git a/src/main/resources/aws/iam-request-resources.json b/src/main/resources/aws/iam-request-resources.json
index c37ed141f76..90d8cf2e843 100644
--- a/src/main/resources/aws/iam-request-resources.json
+++ b/src/main/resources/aws/iam-request-resources.json
@@ -1,7 +1,7 @@
{
"_source": {"generator": "tools/aws/regen_iam_request_resources.py", "reference": "https://servicereference.us-east-1.amazonaws.com/", "botocore": "botocore 1.43.118 (installed package)", "retrieved": "2026-11-20", "note": "make iam-request-resources-check re-derives every operation's resources from botocore; make iam-request-resources-verify checks every action, type and format against AWS."},
"namespaces": {"access-analyzer": ["accessanalyzer"], "account": ["account"], "acm": ["acm"], "application-autoscaling": ["application-autoscaling"], "athena": ["athena"], "bcm-data-exports": ["bcm-data-exports"], "bcm-pricing-calculator": ["bcm-pricing-calculator"], "budgets": ["budgets"], "ce": ["ce"], "cloudformation": ["cloudcontrol", "cloudformation"], "cloudfront": ["cloudfront"], "cloudfront-keyvaluestore": ["cloudfront-keyvaluestore"], "cloudtrail": ["cloudtrail"], "codebuild": ["codebuild"], "codepipeline": ["codepipeline"], "cognito-identity": ["cognito-identity"], "cognito-idp": ["cognito-idp"], "controlcatalog": ["controlcatalog"], "controltower": ["controltower"], "cur": ["cur"], "datasync": ["datasync"], "dsql": ["dsql"], "dynamodb": ["dynamodb"], "ec2": ["ec2"], "ecr": ["ecr"], "ecs": ["ecs"], "eks": ["eks"], "elasticloadbalancing": ["elb", "elbv2"], "elasticmapreduce": ["emr"], "emr-containers": ["emr-containers"], "emr-serverless": ["emr-serverless"], "es": ["es", "opensearch"], "events": ["eventbridgev2", "events"], "firehose": ["firehose"], "fis": ["fis"], "globalaccelerator": ["globalaccelerator"], "glue": ["glue"], "guardduty": ["guardduty"], "inspector2": ["inspector2"], "kinesis": ["kinesis"], "kinesisanalytics": ["kinesisanalytics", "kinesisanalyticsv2"], "lambda": ["lambda", "lambda-core", "lambda-microvms", "lambda-web"], "logs": ["logs"], "macie2": ["macie2"], "oam": ["oam"], "payment-cryptography": ["payment-cryptography", "payment-cryptography-data"], "pipes": ["pipes"], "quicksight": ["quicksight"], "ram": ["ram"], "rds": ["docdb", "neptune", "rds"], "redshift": ["redshift"], "redshift-data": ["redshift-data"], "redshift-serverless": ["redshift-serverless"], "rekognition": ["rekognition"], "resource-explorer-2": ["resource-explorer-2"], "resource-groups": ["resource-groups"], "route53": ["route53"], "s3tables": ["s3tables"], "s3vectors": ["s3vectors"], "scheduler": ["scheduler"], "secretsmanager": ["secretsmanager"], "securityhub": ["securityhub"], "servicediscovery": ["servicediscovery"], "servicequotas": ["service-quotas"], "signer": ["signer", "signer-data"], "sns": ["sns"], "sqs": ["sqs"], "ssm": ["ssm"], "sso": ["sso", "sso-admin"], "states": ["stepfunctions"], "sts": ["sts"], "textract": ["textract"], "timestream-influxdb": ["timestream-influxdb"], "translate": ["translate"], "xray": ["xray"]},
- "handBuilt": ["apigateway", "bedrock", "dynamodb", "iam", "kms", "logs", "s3"],
+ "handBuilt": ["apigateway", "bedrock", "dynamodb", "iam", "kms", "s3"],
"notCovered": {"airflow": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "app-integrations": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "appconfig": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "appsync": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "aps": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "autoscaling": "not read yet: AWS's group and launch configuration ARNs carry an id the service mints, `autoScalingGroup::autoScalingGroupName/`, while Floci mints `autoScalingGroup:`, which other services (ECS capacity providers) read back; the mint is fixed first", "aws-marketplace": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "backup": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "batch": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "bedrock-agentcore": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "cloudhsm": "not read yet: its ARN formats end in ${CloudHsmClusterInstanceName} and ${CloudHsmBackupInstanceName}, names, while its requests give ClusterId and BackupId, ids, which the rules do not fill a name from, so nearly every operation's resource would be left open", "cloudwatch": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "codeartifact": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "codedeploy": "not read yet: the Service Reference gives an on-premises instance's ARN as `instance:${InstanceName}`, while the CodeDeploy permissions reference gives arn:aws:codedeploy:region:account-id:instance/instance-ID and AWS's GetOnPremisesInstance example answers instance/_, an id the service mints after the name; reading it needs that format corrected", "codeguru-reviewer": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "comprehend": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "config": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "connect": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "detective": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "dlm": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "dms": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "ec2-instance-connect": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "elasticache": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "elasticbeanstalk": "not read yet: an environment's ARN carries its application's name, `environment//`, while most of its requests name it by EnvironmentName or EnvironmentId alone, so reading it needs the stored environment those find", "elasticfilesystem": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "execute-api": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "identitystore": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "iot": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "kafka": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "lightsail": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "memorydb": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "mq": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "network-firewall": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "organizations": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "rds-data": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "route53resolver": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "rum": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "sagemaker": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "servicecatalog": "not read yet: CreatePortfolioShare, UpdatePortfolioShare and DeletePortfolioShare give in AccountId the account a portfolio is shared with, which the rule reads as the portfolio's; a portfolio or product imported from another account keeps its owner's account in its ARN while requests name it by its id alone; and AppRegistry's applications and attribute groups are named in the path", "ses": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "signin": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "sso-oauth": "REST: its requests name their resources in the path, which RequestResources reads from the route a request matched in the vendored REST routes (regen_rest_routes.MODELS), which do not have its model yet", "swf": "not read yet: the Service Reference gives a domain's ARN no Region, `swf:::/domain/`, while the SWF Developer Guide gives it as arn:aws:swf:Region:AccountID:/domain/DomainName, as Floci mints it; reading it needs that format corrected", "transcribe": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "transfer": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint", "verifiedpermissions": "not read yet: a policyStoreId may name its store by an alias, `policy-store-alias/`, which AWS authorizes as the action on the store the alias points to and GetPolicyStoreAlias on the alias, and an aliasName carries the `policy-store-alias/` its format already gives; reading it needs both", "wafv2": "not read yet: a later batch, with the tests that show its ARNs are the ones its handlers mint"},
"otherNamespaces": ["a4b", "account-access", "acm-pca", "aco-automation", "agent-registry", "aidevops", "aiops", "airflow-serverless", "amplify", "amplifybackend", "amplifyuibuilder", "aoss", "apiportal", "appfabric", "appflow", "application-signals", "application-signals-mcp", "appmesh", "appmesh-preview", "apprunner", "appstream", "apptest", "arc-region-switch", "arc-zonal-shift", "artifact", "assurance", "auditmanager", "aws-external-anthropic", "b2bi", "backup-gateway", "backup-search", "bcm-data-hub", "bedrock-mantle", "bedrock-websearch", "billing", "billingconductor", "braket", "bugbust", "cases", "cassandra", "chatbot", "chime", "cleanrooms", "cleanrooms-ml", "cloud9", "clouddirectory", "cloudsearch", "cloudshell", "cloudtrail-data", "codecatalyst", "codecommit", "codeconnections", "codeguru-profiler", "codeguru-security", "codestar-connections", "codestar-notifications", "codewhisperer", "cognito-sync", "connect-campaigns", "consoleapp", "continuum", "databrew", "dataexchange", "datapipeline", "datazone", "dax", "deadline", "devicefarm", "devops-guru", "directconnect", "docdb-elastic", "drs", "ds", "ds-data", "ebs", "ecr-public", "eks-auth", "elastictranscoder", "elemental-appliances-software", "elemental-inference", "elemental-support-cases", "end-user-messaging", "entityresolution", "evs", "finspace", "finspace-api", "fms", "forecast", "frauddetector", "freertos", "fsx", "gamelift", "gameliftstreams", "geo", "geo-maps", "geo-places", "geo-routes", "glacier", "grafana", "greengrass", "groundstation", "health", "health-agent", "healthlake", "honeycode", "identity-sync", "imagebuilder", "interconnect", "internetmonitor", "invoicing", "iotanalytics", "iotdeviceadvisor", "iotfleethub", "iotfleetwise", "iotjobsdata", "iotmanagedintegrations", "iotsitewise", "iottwinmaker", "iotwireless", "iq", "iq-permission", "ivs", "ivschat", "kafka-cluster", "kafkaconnect", "kendra", "kendra-ranking", "kinesisvideo", "launchwizard", "lex", "license-manager", "license-manager-linux-subscriptions", "license-manager-user-subscriptions", "lookoutequipment", "lookoutmetrics", "lookoutvision", "m2", "machinelearning", "managedblockchain", "mapcredits", "mediaconnect", "mediaconvert", "medialive", "mediapackage", "mediapackage-vod", "mediapackagev2", "mediastore", "mediatailor", "medical-imaging", "mgh", "mgn", "migrationhub-orchestrator", "mobiletargeting", "monitron", "mpa", "neptune-db", "neptune-graph", "network-security-manager", "networkflowmonitor", "networkmanager", "networkmonitor", "nimble", "notifications", "notifications-contacts", "nova-act", "observabilityadmin", "odb", "omics", "one", "opensearch", "opsworks", "osis", "osm", "outposts", "panorama", "partnercentral", "payments", "pca-connector-ad", "pca-connector-scep", "pcs", "personalize", "pi", "polly", "private-networks", "profile", "proton", "purchase-orders", "q", "qapps", "qbusiness", "qdeveloper", "qldb", "rbin", "rds-db", "refactor-spaces", "repostspace", "resiliencehub", "robomaker", "rolesanywhere", "route53-recovery-cluster", "route53-recovery-control-config", "route53-recovery-readiness", "route53globalresolver", "route53profiles", "rtbfabric", "s3-object-lambda", "s3-outposts", "s3express", "s3files", "sagemaker-geospatial", "sagemaker-mlflow", "savingsplans", "schemas", "scn", "sdb", "security-ir", "securityagent", "securitylake", "serverlessrepo", "shield", "simspaceweaver", "sms-voice", "snow-device-management", "social-messaging", "sqlworkbench", "ssm-contacts", "ssm-incidents", "ssm-quicksetup", "ssm-sap", "ssmmessages", "storagegateway", "supportauthz", "synthetics", "thinclient", "timestream", "tnb", "transform", "transform-custom", "trustedadvisor", "ts", "vendor-insights", "voiceid", "vpc-lattice", "vpc-lattice-svcs", "vpce", "waf", "waf-regional", "wellarchitected", "wickr", "wisdom", "workdocs", "worklink", "workmail", "workmailmessageflow", "workspaces", "workspaces-instances", "workspaces-web"],
"arnFormats": {"access-analyzer": {"Analyzer": "arn:${Partition}:access-analyzer:${Region}:${Account}:analyzer/${AnalyzerName}", "ArchiveRule": "arn:${Partition}:access-analyzer:${Region}:${Account}:analyzer/${AnalyzerName}/archive-rule/${RuleName}"}, "account": {"account": "arn:${Partition}:account::${Account}:account", "accountInOrganization": "arn:${Partition}:account::${ManagementAccountId}:account/o-${OrganizationId}/${MemberAccountId}"}, "acm": {"acme-domain-validation": "arn:${Partition}:acm:${Region}:${Account}:acme-endpoint/${AcmeEndpointId}/acme-domain-validation/${AcmeDomainValidationId}", "acme-endpoint": "arn:${Partition}:acm:${Region}:${Account}:acme-endpoint/${AcmeEndpointId}", "acme-external-account-binding": "arn:${Partition}:acm:${Region}:${Account}:acme-endpoint/${AcmeEndpointId}/acme-external-account-binding/${ExternalAccountBindingId}", "certificate": "arn:${Partition}:acm:${Region}:${Account}:certificate/${CertificateId}"}, "application-autoscaling": {"ScalableTarget": "arn:${Partition}:application-autoscaling:${Region}:${Account}:scalable-target/${ResourceId}"}, "athena": {"capacity-reservation": "arn:${Partition}:athena:${Region}:${Account}:capacity-reservation/${CapacityReservationName}", "datacatalog": "arn:${Partition}:athena:${Region}:${Account}:datacatalog/${DataCatalogName}", "session": "arn:${Partition}:athena:${Region}:${Account}:workgroup/${WorkGroupName}/session/${SessionId}", "system-table": "arn:${Partition}:athena:${Region}:${Account}:system-table/${TableName}", "workgroup": "arn:${Partition}:athena:${Region}:${Account}:workgroup/${WorkGroupName}"}, "bcm-data-exports": {"billingview": "arn:${Partition}:billing::${Account}:billingview/${ResourceId}", "export": "arn:${Partition}:bcm-data-exports:${Region}:${Account}:export/${Identifier}", "table": "arn:${Partition}:bcm-data-exports:${Region}:${Account}:table/${Identifier}"}, "bcm-pricing-calculator": {"bill-estimate": "arn:${Partition}:bcm-pricing-calculator::${Account}:bill-estimate/${BillEstimateId}", "bill-scenario": "arn:${Partition}:bcm-pricing-calculator::${Account}:bill-scenario/${BillScenarioId}", "workload-estimate": "arn:${Partition}:bcm-pricing-calculator::${Account}:workload-estimate/${WorkloadEstimateId}"}, "budgets": {"budget": "arn:${Partition}:budgets::${Account}:budget/${BudgetName}", "budgetAction": "arn:${Partition}:budgets::${Account}:budget/${BudgetName}/action/${ActionId}"}, "ce": {"anomalymonitor": "arn:${Partition}:ce::${Account}:anomalymonitor/${Identifier}", "anomalysubscription": "arn:${Partition}:ce::${Account}:anomalysubscription/${Identifier}", "billingview": "arn:${Partition}:billing::${Account}:billingview/${ResourceId}", "costcategory": "arn:${Partition}:ce::${Account}:costcategory/${Identifier}"}, "cloudformation": {"changeset": "arn:${Partition}:cloudformation:${Region}:${Account}:changeSet/${ChangeSetName}/${Id}", "generatedtemplate": "arn:${Partition}:cloudformation:${Region}:${Account}:generatedTemplate/${Id}", "resourcescan": "arn:${Partition}:cloudformation:${Region}:${Account}:resourceScan/${Id}", "stack": "arn:${Partition}:cloudformation:${Region}:${Account}:stack/${StackName}/${Id}", "stackset": "arn:${Partition}:cloudformation:${Region}:${Account}:stackset/${StackSetName}:${Id}", "stackset-target": "arn:${Partition}:cloudformation:${Region}:${Account}:stackset-target/${StackSetTarget}", "type": "arn:${Partition}:cloudformation:${Region}:${Account}:type/resource/${Type}", "typeHook": "arn:${Partition}:cloudformation:${Region}:${Account}:type/hook/${Type}"}, "cloudfront": {"anycast-ip-list": "arn:${Partition}:cloudfront::${Account}:anycast-ip-list/${Id}", "cache-policy": "arn:${Partition}:cloudfront::${Account}:cache-policy/${Id}", "connection-function": "arn:${Partition}:cloudfront::${Account}:connection-function/${Id}", "connection-group": "arn:${Partition}:cloudfront::${Account}:connection-group/${Id}", "continuous-deployment-policy": "arn:${Partition}:cloudfront::${Account}:continuous-deployment-policy/${Id}", "distribution": "arn:${Partition}:cloudfront::${Account}:distribution/${DistributionId}", "distribution-tenant": "arn:${Partition}:cloudfront::${Account}:distribution-tenant/${Id}", "field-level-encryption-config": "arn:${Partition}:cloudfront::${Account}:field-level-encryption-config/${Id}", "field-level-encryption-profile": "arn:${Partition}:cloudfront::${Account}:field-level-encryption-profile/${Id}", "function": "arn:${Partition}:cloudfront::${Account}:function/${Name}", "key-value-store": "arn:${Partition}:cloudfront::${Account}:key-value-store/${Name}", "origin-access-control": "arn:${Partition}:cloudfront::${Account}:origin-access-control/${Id}", "origin-access-identity": "arn:${Partition}:cloudfront::${Account}:origin-access-identity/${Id}", "origin-request-policy": "arn:${Partition}:cloudfront::${Account}:origin-request-policy/${Id}", "realtime-log-config": "arn:${Partition}:cloudfront::${Account}:realtime-log-config/${Name}", "response-headers-policy": "arn:${Partition}:cloudfront::${Account}:response-headers-policy/${Id}", "streaming-distribution": "arn:${Partition}:cloudfront::${Account}:streaming-distribution/${DistributionId}", "trust-store": "arn:${Partition}:cloudfront::${Account}:trust-store/${Id}", "vpcorigin": "arn:${Partition}:cloudfront::${Account}:vpcorigin/${Id}"}, "cloudfront-keyvaluestore": {"key-value-store": "arn:${Partition}:cloudfront::${Account}:key-value-store/${ResourceId}"}, "cloudtrail": {"channel": "arn:${Partition}:cloudtrail:${Region}:${Account}:channel/${ChannelId}", "dashboard": "arn:${Partition}:cloudtrail:${Region}:${Account}:dashboard/${DashboardName}", "eventdatastore": "arn:${Partition}:cloudtrail:${Region}:${Account}:eventdatastore/${EventDataStoreId}", "trail": "arn:${Partition}:cloudtrail:${Region}:${Account}:trail/${TrailName}"}, "codebuild": {"build": "arn:${Partition}:codebuild:${Region}:${Account}:build/${BuildId}", "build-batch": "arn:${Partition}:codebuild:${Region}:${Account}:build-batch/${BuildBatchId}", "fleet": "arn:${Partition}:codebuild:${Region}:${Account}:fleet/${FleetName}:${FleetId}", "project": "arn:${Partition}:codebuild:${Region}:${Account}:project/${ProjectName}", "report": "arn:${Partition}:codebuild:${Region}:${Account}:report/${ReportGroupName}:${ReportId}", "report-group": "arn:${Partition}:codebuild:${Region}:${Account}:report-group/${ReportGroupName}", "sandbox": "arn:${Partition}:codebuild:${Region}:${Account}:sandbox/${SandboxId}"}, "codepipeline": {"action": "arn:${Partition}:codepipeline:${Region}:${Account}:${PipelineName}/${StageName}/${ActionName}", "actiontype": "arn:${Partition}:codepipeline:${Region}:${Account}:actiontype:${Owner}/${Category}/${Provider}/${Version}", "pipeline": "arn:${Partition}:codepipeline:${Region}:${Account}:${PipelineName}", "stage": "arn:${Partition}:codepipeline:${Region}:${Account}:${PipelineName}/${StageName}", "webhook": "arn:${Partition}:codepipeline:${Region}:${Account}:webhook:${WebhookName}"}, "cognito-identity": {"identitypool": "arn:${Partition}:cognito-identity:${Region}:${Account}:identitypool/${IdentityPoolId}"}, "cognito-idp": {"userpool": "arn:${Partition}:cognito-idp:${Region}:${Account}:userpool/${UserPoolId}", "webacl": "arn:${Partition}:wafv2:${Region}:${Account}:${Scope}/webacl/${Name}/${Id}"}, "controlcatalog": {"common-control": "arn:${Partition}:controlcatalog:::common-control/${CommonControlId}", "control": "arn:${Partition}:controlcatalog:::control/${ControlId}", "domain": "arn:${Partition}:controlcatalog:::domain/${DomainId}", "objective": "arn:${Partition}:controlcatalog:::objective/${ObjectiveId}"}, "controltower": {"Baseline": "arn:${Partition}:controltower:${Region}::baseline/${BaselineId}", "EnabledBaseline": "arn:${Partition}:controltower:${Region}:${Account}:enabledbaseline/${EnabledBaselineId}", "EnabledControl": "arn:${Partition}:controltower:${Region}:${Account}:enabledcontrol/${EnabledControlId}", "LandingZone": "arn:${Partition}:controltower:${Region}:${Account}:landingzone/${LandingZoneId}"}, "cur": {"cur": "arn:${Partition}:cur:${Region}:${Account}:definition/${ReportName}"}, "datasync": {"agent": "arn:${Partition}:datasync:${Region}:${Account}:agent/${AgentId}", "discoveryjob": "arn:${Partition}:datasync:${Region}:${Account}:system/${StorageSystemId}/job/${DiscoveryJobId}", "location": "arn:${Partition}:datasync:${Region}:${Account}:location/${LocationId}", "storagesystem": "arn:${Partition}:datasync:${Region}:${Account}:system/${StorageSystemId}", "task": "arn:${Partition}:datasync:${Region}:${Account}:task/${TaskId}", "taskexecution": "arn:${Partition}:datasync:${Region}:${Account}:task/${TaskId}/execution/${ExecutionId}"}, "dsql": {"Cluster": "arn:${Partition}:dsql:${Region}:${Account}:cluster/${Identifier}", "Stream": "arn:${Partition}:dsql:${Region}:${Account}:cluster/${ClusterId}/stream/${StreamId}"}, "dynamodb": {"backup": "arn:${Partition}:dynamodb:${Region}:${Account}:table/${TableName}/backup/${BackupName}", "bulk-operation": "arn:${Partition}:dynamodb:${Region}:${Account}:bulk-operation/${BulkOperationId}", "export": "arn:${Partition}:dynamodb:${Region}:${Account}:table/${TableName}/export/${ExportName}", "global-table": "arn:${Partition}:dynamodb::${Account}:global-table/${GlobalTableName}", "import": "arn:${Partition}:dynamodb:${Region}:${Account}:table/${TableName}/import/${ImportName}", "index": "arn:${Partition}:dynamodb:${Region}:${Account}:table/${TableName}/index/${IndexName}", "stream": "arn:${Partition}:dynamodb:${Region}:${Account}:table/${TableName}/stream/${StreamLabel}", "table": "arn:${Partition}:dynamodb:${Region}:${Account}:table/${TableName}"}, "ec2": {"application-status-check": "arn:${Partition}:ec2:${Region}:${Account}:application-status-check/${ApplicationStatusCheckId}", "capacity-block": "arn:${Partition}:ec2:${Region}:${Account}:capacity-block/${CapacityBlockId}", "capacity-manager-data-export": "arn:${Partition}:ec2:${Region}:${Account}:capacity-manager-data-export/${CapacityManagerDataExportId}", "capacity-reservation": "arn:${Partition}:ec2:${Region}:${Account}:capacity-reservation/${CapacityReservationId}", "capacity-reservation-cancellation-quote": "arn:${Partition}:ec2:${Region}:${Account}:capacity-reservation-cancellation-quote/${CapacityReservationCancellationQuoteId}", "capacity-reservation-fleet": "arn:${Partition}:ec2:${Region}:${Account}:capacity-reservation-fleet/${CapacityReservationFleetId}", "capacity-reservation-modification-quote": "arn:${Partition}:ec2:${Region}:${Account}:capacity-reservation-modification-quote/${CapacityReservationModificationQuoteId}", "carrier-gateway": "arn:${Partition}:ec2:${Region}:${Account}:carrier-gateway/${CarrierGatewayId}", "certificate": "arn:${Partition}:acm:${Region}:${Account}:certificate/${CertificateId}", "client-vpn-endpoint": "arn:${Partition}:ec2:${Region}:${Account}:client-vpn-endpoint/${ClientVpnEndpointId}", "coip-pool": "arn:${Partition}:ec2:${Region}:${Account}:coip-pool/${Ipv4PoolCoipId}", "customer-gateway": "arn:${Partition}:ec2:${Region}:${Account}:customer-gateway/${CustomerGatewayId}", "declarative-policies-report": "arn:${Partition}:ec2:${Region}:${Account}:declarative-policies-report/${DeclarativePoliciesReportId}", "dedicated-host": "arn:${Partition}:ec2:${Region}:${Account}:dedicated-host/${DedicatedHostId}", "dhcp-options": "arn:${Partition}:ec2:${Region}:${Account}:dhcp-options/${DhcpOptionsId}", "egress-only-internet-gateway": "arn:${Partition}:ec2:${Region}:${Account}:egress-only-internet-gateway/${EgressOnlyInternetGatewayId}", "elastic-gpu": "arn:${Partition}:ec2:${Region}:${Account}:elastic-gpu/${ElasticGpuId}", "elastic-inference": "arn:${Partition}:elastic-inference:${Region}:${Account}:elastic-inference-accelerator/${AcceleratorId}", "elastic-ip": "arn:${Partition}:ec2:${Region}:${Account}:elastic-ip/${AllocationId}", "export-image-task": "arn:${Partition}:ec2:${Region}:${Account}:export-image-task/${ExportImageTaskId}", "export-instance-task": "arn:${Partition}:ec2:${Region}:${Account}:export-instance-task/${ExportTaskId}", "fleet": "arn:${Partition}:ec2:${Region}:${Account}:fleet/${FleetId}", "fpga-image": "arn:${Partition}:ec2:${Region}:${Account}:fpga-image/${FpgaImageId}", "group": "arn:${Partition}:resource-groups:${Region}:${Account}:group/${GroupName}", "host-reservation": "arn:${Partition}:ec2:${Region}:${Account}:host-reservation/${HostReservationId}", "image": "arn:${Partition}:ec2:${Region}::image/${ImageId}", "image-usage-report": "arn:${Partition}:ec2:${Region}:${Account}:image-usage-report/${ImageUsageReportId}", "import-image-task": "arn:${Partition}:ec2:${Region}:${Account}:import-image-task/${ImportImageTaskId}", "import-snapshot-task": "arn:${Partition}:ec2:${Region}:${Account}:import-snapshot-task/${ImportSnapshotTaskId}", "instance": "arn:${Partition}:ec2:${Region}:${Account}:instance/${InstanceId}", "instance-connect-endpoint": "arn:${Partition}:ec2:${Region}:${Account}:instance-connect-endpoint/${InstanceConnectEndpointId}", "instance-event-window": "arn:${Partition}:ec2:${Region}:${Account}:instance-event-window/${InstanceEventWindowId}", "internet-gateway": "arn:${Partition}:ec2:${Region}:${Account}:internet-gateway/${InternetGatewayId}", "ipam": "arn:${Partition}:ec2::${Account}:ipam/${IpamId}", "ipam-external-resource-verification-token": "arn:${Partition}:ec2::${Account}:ipam-external-resource-verification-token/${IpamExternalResourceVerificationTokenId}", "ipam-internet-registry-association": "arn:${Partition}:ec2::${Account}:ipam-internet-registry-association/${IpamInternetRegistryAssociationId}", "ipam-policy": "arn:${Partition}:ec2::${Account}:ipam-policy/${IpamPolicyId}", "ipam-pool": "arn:${Partition}:ec2::${Account}:ipam-pool/${IpamPoolId}", "ipam-pool-allocation": "arn:${Partition}:ec2:${Region}:${Account}:ipam-pool-allocation/${IpamPoolAllocationId}", "ipam-prefix-list-resolver": "arn:${Partition}:ec2::${Account}:ipam-prefix-list-resolver/${IpamPrefixListResolverId}", "ipam-prefix-list-resolver-target": "arn:${Partition}:ec2::${Account}:ipam-prefix-list-resolver-target/${IpamPrefixListResolverTargetId}", "ipam-resource-discovery": "arn:${Partition}:ec2::${Account}:ipam-resource-discovery/${IpamResourceDiscoveryId}", "ipam-resource-discovery-association": "arn:${Partition}:ec2::${Account}:ipam-resource-discovery-association/${IpamResourceDiscoveryAssociationId}", "ipam-scope": "arn:${Partition}:ec2::${Account}:ipam-scope/${IpamScopeId}", "ipv4pool-ec2": "arn:${Partition}:ec2:${Region}:${Account}:ipv4pool-ec2/${Ipv4PoolEc2Id}", "ipv6pool-ec2": "arn:${Partition}:ec2:${Region}:${Account}:ipv6pool-ec2/${Ipv6PoolEc2Id}", "key-pair": "arn:${Partition}:ec2:${Region}:${Account}:key-pair/${KeyPairName}", "launch-template": "arn:${Partition}:ec2:${Region}:${Account}:launch-template/${LaunchTemplateId}", "license-configuration": "arn:${Partition}:license-manager:${Region}:${Account}:license-configuration:${LicenseConfigurationId}", "local-gateway": "arn:${Partition}:ec2:${Region}:${Account}:local-gateway/${LocalGatewayId}", "local-gateway-route-table": "arn:${Partition}:ec2:${Region}:${Account}:local-gateway-route-table/${LocalGatewayRoutetableId}", "local-gateway-route-table-virtual-interface-group-association": "arn:${Partition}:ec2:${Region}:${Account}:local-gateway-route-table-virtual-interface-group-association/${LocalGatewayRouteTableVirtualInterfaceGroupAssociationId}", "local-gateway-route-table-vpc-association": "arn:${Partition}:ec2:${Region}:${Account}:local-gateway-route-table-vpc-association/${LocalGatewayRouteTableVpcAssociationId}", "local-gateway-virtual-interface": "arn:${Partition}:ec2:${Region}:${Account}:local-gateway-virtual-interface/${LocalGatewayVirtualInterfaceId}", "local-gateway-virtual-interface-group": "arn:${Partition}:ec2:${Region}:${Account}:local-gateway-virtual-interface-group/${LocalGatewayVirtualInterfaceGroupId}", "mac-modification-task": "arn:${Partition}:ec2:${Region}:${Account}:mac-modification-task/${MacModificationTaskId}", "natgateway": "arn:${Partition}:ec2:${Region}:${Account}:natgateway/${NatGatewayId}", "network-acl": "arn:${Partition}:ec2:${Region}:${Account}:network-acl/${NaclId}", "network-insights-access-scope": "arn:${Partition}:ec2:${Region}:${Account}:network-insights-access-scope/${NetworkInsightsAccessScopeId}", "network-insights-access-scope-analysis": "arn:${Partition}:ec2:${Region}:${Account}:network-insights-access-scope-analysis/${NetworkInsightsAccessScopeAnalysisId}", "network-insights-analysis": "arn:${Partition}:ec2:${Region}:${Account}:network-insights-analysis/${NetworkInsightsAnalysisId}", "network-insights-path": "arn:${Partition}:ec2:${Region}:${Account}:network-insights-path/${NetworkInsightsPathId}", "network-interface": "arn:${Partition}:ec2:${Region}:${Account}:network-interface/${NetworkInterfaceId}", "outpost-lag": "arn:${Partition}:ec2:${Region}:${Account}:outpost-lag/${OutpostLagId}", "placement-group": "arn:${Partition}:ec2:${Region}:${Account}:placement-group/${PlacementGroupName}", "prefix-list": "arn:${Partition}:ec2:${Region}:${Account}:prefix-list/${PrefixListId}", "replace-root-volume-task": "arn:${Partition}:ec2:${Region}:${Account}:replace-root-volume-task/${ReplaceRootVolumeTaskId}", "reserved-instances": "arn:${Partition}:ec2:${Region}:${Account}:reserved-instances/${ReservationId}", "role": "arn:${Partition}:iam::${Account}:role/${RoleNameWithPath}", "route-server": "arn:${Partition}:ec2:${Region}:${Account}:route-server/${RouteServerId}", "route-server-endpoint": "arn:${Partition}:ec2:${Region}:${Account}:route-server-endpoint/${RouteServerEndpointId}", "route-server-peer": "arn:${Partition}:ec2:${Region}:${Account}:route-server-peer/${RouteServerPeerId}", "route-table": "arn:${Partition}:ec2:${Region}:${Account}:route-table/${RouteTableId}", "secondary-interface": "arn:${Partition}:ec2:${Region}:${Account}:secondary-interface/${SecondaryInterfaceId}", "secondary-network": "arn:${Partition}:ec2:${Region}:${Account}:secondary-network/${SecondaryNetworkId}", "secondary-subnet": "arn:${Partition}:ec2:${Region}:${Account}:secondary-subnet/${SecondarySubnetId}", "security-group": "arn:${Partition}:ec2:${Region}:${Account}:security-group/${SecurityGroupId}", "security-group-rule": "arn:${Partition}:ec2:${Region}:${Account}:security-group-rule/${SecurityGroupRuleId}", "snapshot": "arn:${Partition}:ec2:${Region}::snapshot/${SnapshotId}", "spot-fleet-request": "arn:${Partition}:ec2:${Region}:${Account}:spot-fleet-request/${SpotFleetRequestId}", "spot-instances-request": "arn:${Partition}:ec2:${Region}:${Account}:spot-instances-request/${SpotInstanceRequestId}", "subnet": "arn:${Partition}:ec2:${Region}:${Account}:subnet/${SubnetId}", "subnet-cidr-reservation": "arn:${Partition}:ec2:${Region}:${Account}:subnet-cidr-reservation/${SubnetCidrReservationId}", "traffic-mirror-filter": "arn:${Partition}:ec2:${Region}:${Account}:traffic-mirror-filter/${TrafficMirrorFilterId}", "traffic-mirror-filter-rule": "arn:${Partition}:ec2:${Region}:${Account}:traffic-mirror-filter-rule/${TrafficMirrorFilterRuleId}", "traffic-mirror-session": "arn:${Partition}:ec2:${Region}:${Account}:traffic-mirror-session/${TrafficMirrorSessionId}", "traffic-mirror-target": "arn:${Partition}:ec2:${Region}:${Account}:traffic-mirror-target/${TrafficMirrorTargetId}", "transit-gateway": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway/${TransitGatewayId}", "transit-gateway-attachment": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-attachment/${TransitGatewayAttachmentId}", "transit-gateway-connect-peer": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-connect-peer/${TransitGatewayConnectPeerId}", "transit-gateway-metering-policy": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-metering-policy/${TransitGatewayMeteringPolicyId}", "transit-gateway-multicast-domain": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-multicast-domain/${TransitGatewayMulticastDomainId}", "transit-gateway-policy-table": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-policy-table/${TransitGatewayPolicyTableId}", "transit-gateway-route-table": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-route-table/${TransitGatewayRouteTableId}", "transit-gateway-route-table-announcement": "arn:${Partition}:ec2:${Region}:${Account}:transit-gateway-route-table-announcement/${TransitGatewayRouteTableAnnouncementId}", "verified-access-endpoint": "arn:${Partition}:ec2:${Region}:${Account}:verified-access-endpoint/${VerifiedAccessEndpointId}", "verified-access-endpoint-target": "arn:${Partition}:ec2:${Region}:${Account}:verified-access-endpoint-target/${VerifiedAccessEndpointTargetId}", "verified-access-group": "arn:${Partition}:ec2:${Region}:${Account}:verified-access-group/${VerifiedAccessGroupId}", "verified-access-instance": "arn:${Partition}:ec2:${Region}:${Account}:verified-access-instance/${VerifiedAccessInstanceId}", "verified-access-policy": "arn:${Partition}:ec2:${Region}:${Account}:verified-access-policy/${VerifiedAccessPolicyId}", "verified-access-trust-provider": "arn:${Partition}:ec2:${Region}:${Account}:verified-access-trust-provider/${VerifiedAccessTrustProviderId}", "volume": "arn:${Partition}:ec2:${Region}:${Account}:volume/${VolumeId}", "vpc": "arn:${Partition}:ec2:${Region}:${Account}:vpc/${VpcId}", "vpc-block-public-access-exclusion": "arn:${Partition}:ec2:${Region}:${Account}:vpc-block-public-access-exclusion/${VpcBlockPublicAccessExclusionId}", "vpc-encryption-control": "arn:${Partition}:ec2:${Region}:${Account}:vpc-encryption-control/${VpcEncryptionControlId}", "vpc-endpoint": "arn:${Partition}:ec2:${Region}:${Account}:vpc-endpoint/${VpcEndpointId}", "vpc-endpoint-connection": "arn:${Partition}:ec2:${Region}:${Account}:vpc-endpoint-connection/${VpcEndpointConnectionId}", "vpc-endpoint-service": "arn:${Partition}:ec2:${Region}:${Account}:vpc-endpoint-service/${VpcEndpointServiceId}", "vpc-endpoint-service-permission": "arn:${Partition}:ec2:${Region}:${Account}:vpc-endpoint-service-permission/${VpcEndpointServicePermissionId}", "vpc-flow-log": "arn:${Partition}:ec2:${Region}:${Account}:vpc-flow-log/${VpcFlowLogId}", "vpc-peering-connection": "arn:${Partition}:ec2:${Region}:${Account}:vpc-peering-connection/${VpcPeeringConnectionId}", "vpn-concentrator": "arn:${Partition}:ec2:${Region}:${Account}:vpn-concentrator/${VpnConcentratorId}", "vpn-connection": "arn:${Partition}:ec2:${Region}:${Account}:vpn-connection/${VpnConnectionId}", "vpn-connection-device-type": "arn:${Partition}:ec2:${Region}:${Account}:vpn-connection-device-type/${VpnConnectionDeviceTypeId}", "vpn-gateway": "arn:${Partition}:ec2:${Region}:${Account}:vpn-gateway/${VpnGatewayId}"}, "ecr": {"repository": "arn:${Partition}:ecr:${Region}:${Account}:repository/${RepositoryName}"}, "ecs": {"capacity-provider": "arn:${Partition}:ecs:${Region}:${Account}:capacity-provider/${CapacityProviderName}", "cluster": "arn:${Partition}:ecs:${Region}:${Account}:cluster/${ClusterName}", "container-instance": "arn:${Partition}:ecs:${Region}:${Account}:container-instance/${ClusterName}/${ContainerInstanceId}", "daemon": "arn:${Partition}:ecs:${Region}:${Account}:daemon/${ClusterName}/${DaemonName}", "daemon-deployment": "arn:${Partition}:ecs:${Region}:${Account}:daemon-deployment/${ClusterName}/${DaemonName}/${DaemonDeploymentId}", "daemon-revision": "arn:${Partition}:ecs:${Region}:${Account}:daemon-revision/${ClusterName}/${DaemonName}/${DaemonRevisionId}", "daemon-task-definition": "arn:${Partition}:ecs:${Region}:${Account}:daemon-task-definition/${DaemonTaskDefinitionFamilyName}:${DaemonTaskDefinitionRevisionNumber}", "gateway": "arn:${Partition}:ecs:${Region}:${Account}:gateway/${GatewayName}/${GatewayId}", "gateway-route": "arn:${Partition}:ecs:${Region}:${Account}:gateway-route/${GatewayName}/${GatewayId}/${RouteId}", "service": "arn:${Partition}:ecs:${Region}:${Account}:service/${ClusterName}/${ServiceName}", "service-deployment": "arn:${Partition}:ecs:${Region}:${Account}:service-deployment/${ClusterName}/${ServiceName}/${ServiceDeploymentId}", "service-revision": "arn:${Partition}:ecs:${Region}:${Account}:service-revision/${ClusterName}/${ServiceName}/${ServiceRevisionId}", "task": "arn:${Partition}:ecs:${Region}:${Account}:task/${ClusterName}/${TaskId}", "task-definition": "arn:${Partition}:ecs:${Region}:${Account}:task-definition/${TaskDefinitionFamilyName}:${TaskDefinitionRevisionNumber}", "task-set": "arn:${Partition}:ecs:${Region}:${Account}:task-set/${ClusterName}/${ServiceName}/${TaskSetId}"}, "eks": {"access-entry": "arn:${Partition}:eks:${Region}:${Account}:access-entry/${ClusterName}/${IamIdentityType}/${IamIdentityAccountID}/${IamIdentityName}/${UUID}", "access-policy": "arn:${Partition}:eks::aws:cluster-access-policy/${AccessPolicyName}", "addon": "arn:${Partition}:eks:${Region}:${Account}:addon/${ClusterName}/${AddonName}/${UUID}", "capability": "arn:${Partition}:eks:${Region}:${Account}:capability/${ClusterName}/${CapabilityType}/${CapabilityName}/${UUID}", "cluster": "arn:${Partition}:eks:${Region}:${Account}:cluster/${ClusterName}", "dashboard": "arn:${Partition}:eks:${Region}:${Account}:dashboard/${DashboardName}", "eks-anywhere-subscription": "arn:${Partition}:eks:${Region}:${Account}:eks-anywhere-subscription/${UUID}", "fargateprofile": "arn:${Partition}:eks:${Region}:${Account}:fargateprofile/${ClusterName}/${FargateProfileName}/${UUID}", "identityproviderconfig": "arn:${Partition}:eks:${Region}:${Account}:identityproviderconfig/${ClusterName}/${IdentityProviderType}/${IdentityProviderConfigName}/${UUID}", "nodegroup": "arn:${Partition}:eks:${Region}:${Account}:nodegroup/${ClusterName}/${NodegroupName}/${UUID}", "podidentityassociation": "arn:${Partition}:eks:${Region}:${Account}:podidentityassociation/${ClusterName}/${UUID}"}, "elasticloadbalancing": {"listener-rule/app": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:listener-rule/app/${LoadBalancerName}/${LoadBalancerId}/${ListenerId}/${ListenerRuleId}", "listener-rule/net": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:listener-rule/net/${LoadBalancerName}/${LoadBalancerId}/${ListenerId}/${ListenerRuleId}", "listener/app": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:listener/app/${LoadBalancerName}/${LoadBalancerId}/${ListenerId}", "listener/gwy": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:listener/gwy/${LoadBalancerName}/${LoadBalancerId}/${ListenerId}", "listener/net": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:listener/net/${LoadBalancerName}/${LoadBalancerId}/${ListenerId}", "loadbalancer": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:loadbalancer/${LoadBalancerName}", "loadbalancer/app/": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:loadbalancer/app/${LoadBalancerName}/${LoadBalancerId}", "loadbalancer/gwy/": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:loadbalancer/gwy/${LoadBalancerName}/${LoadBalancerId}", "loadbalancer/net/": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:loadbalancer/net/${LoadBalancerName}/${LoadBalancerId}", "targetgroup": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:targetgroup/${TargetGroupName}/${TargetGroupId}", "truststore": "arn:${Partition}:elasticloadbalancing:${Region}:${Account}:truststore/${TrustStoreName}/${TrustStoreId}"}, "elasticmapreduce": {"cluster": "arn:${Partition}:elasticmapreduce:${Region}:${Account}:cluster/${ClusterId}", "editor": "arn:${Partition}:elasticmapreduce:${Region}:${Account}:editor/${EditorId}", "notebook-execution": "arn:${Partition}:elasticmapreduce:${Region}:${Account}:notebook-execution/${NotebookExecutionId}", "session": "arn:${Partition}:elasticmapreduce:${Region}:${Account}:cluster/${ClusterId}/session/${SessionId}", "studio": "arn:${Partition}:elasticmapreduce:${Region}:${Account}:studio/${StudioId}"}, "emr-containers": {"jobRun": "arn:${Partition}:emr-containers:${Region}:${Account}:/virtualclusters/${VirtualClusterId}/jobruns/${JobRunId}", "jobTemplate": "arn:${Partition}:emr-containers:${Region}:${Account}:/jobtemplates/${JobTemplateId}", "managedEndpoint": "arn:${Partition}:emr-containers:${Region}:${Account}:/virtualclusters/${VirtualClusterId}/endpoints/${EndpointId}", "securityConfiguration": "arn:${Partition}:emr-containers:${Region}:${Account}:/securityconfigurations/${SecurityConfigurationId}", "virtualCluster": "arn:${Partition}:emr-containers:${Region}:${Account}:/virtualclusters/${VirtualClusterId}"}, "emr-serverless": {"application": "arn:${Partition}:emr-serverless:${Region}:${Account}:/applications/${ApplicationId}", "jobRun": "arn:${Partition}:emr-serverless:${Region}:${Account}:/applications/${ApplicationId}/jobruns/${JobRunId}", "session": "arn:${Partition}:emr-serverless:${Region}:${Account}:/applications/${ApplicationId}/sessions/${SessionId}"}, "es": {"application": "arn:${Partition}:opensearch:${Region}:${Account}:application/${AppId}", "datasource": "arn:${Partition}:opensearch:${Region}:${Account}:datasource/${DataSourceName}", "domain": "arn:${Partition}:es:${Region}:${Account}:domain/${DomainName}", "es_role": "arn:${Partition}:iam::${Account}:role/aws-service-role/es.amazonaws.com/AWSServiceRoleForAmazonOpenSearchService", "opensearchservice_role": "arn:${Partition}:iam::${Account}:role/aws-service-role/opensearchservice.amazonaws.com/AWSServiceRoleForAmazonOpenSearchService"}, "events": {"alias": "arn:${Partition}:kms:${Region}:${Account}:alias/${Alias}", "api-destination": "arn:${Partition}:events:${Region}:${Account}:api-destination/${ApiDestinationName}", "archive": "arn:${Partition}:events:${Region}:${Account}:archive/${ArchiveName}", "connection": "arn:${Partition}:events:${Region}:${Account}:connection/${ConnectionName}", "create-snapshot": "arn:${Partition}:events:${Region}:${Account}:target/create-snapshot", "endpoint": "arn:${Partition}:events:${Region}:${Account}:endpoint/${EndpointName}", "event-bus": "arn:${Partition}:events:${Region}:${Account}:event-bus/${EventBusName}", "event-busv2": "arn:${Partition}:events:${Region}:${Account}:event-busv2/${EventBusName}/${OpaqueId}", "event-source": "arn:${Partition}:events:${Region}::event-source/${EventSourceName}", "event-sourcev2": "arn:${Partition}:events:${Region}:${Account}:event-sourcev2/${SourceType}/${EventSourceName}/${OpaqueId}", "key": "arn:${Partition}:kms:${Region}:${Account}:key/${KeyId}", "reboot-instance": "arn:${Partition}:events:${Region}:${Account}:target/reboot-instance", "replay": "arn:${Partition}:events:${Region}:${Account}:replay/${ReplayName}", "rule-on-custom-event-bus": "arn:${Partition}:events:${Region}:${Account}:rule/${EventBusName}/${RuleName}", "rule-on-default-event-bus": "arn:${Partition}:events:${Region}:${Account}:rule/${RuleName}", "stop-instance": "arn:${Partition}:events:${Region}:${Account}:target/stop-instance", "subscriber": "arn:${Partition}:events:${Region}:${Account}:subscriber/${SubscriberName}/${OpaqueId}", "terminate-instance": "arn:${Partition}:events:${Region}:${Account}:target/terminate-instance"}, "firehose": {"deliverystream": "arn:${Partition}:firehose:${Region}:${Account}:deliverystream/${DeliveryStreamName}"}, "fis": {"action": "arn:${Partition}:fis:${Region}:${Account}:action/${Id}", "experiment": "arn:${Partition}:fis:${Region}:${Account}:experiment/${Id}", "experiment-template": "arn:${Partition}:fis:${Region}:${Account}:experiment-template/${Id}", "safety-lever": "arn:${Partition}:fis:${Region}:${Account}:safety-lever/${Id}"}, "globalaccelerator": {"accelerator": "arn:${Partition}:globalaccelerator::${Account}:accelerator/${ResourceId}", "attachment": "arn:${Partition}:globalaccelerator::${Account}:attachment/${ResourceId}", "endpointgroup": "arn:${Partition}:globalaccelerator::${Account}:accelerator/${ResourceId}/listener/${ListenerId}/endpoint-group/${EndpointGroupId}", "listener": "arn:${Partition}:globalaccelerator::${Account}:accelerator/${ResourceId}/listener/${ListenerId}"}, "glue": {"blueprint": "arn:${Partition}:glue:${Region}:${Account}:blueprint/${BlueprintName}", "catalog": "arn:${Partition}:glue:${Region}:${Account}:catalog/${CatalogName}", "completion": "arn:${Partition}:glue:${Region}:${Account}:completion/${CompletionId}", "connection": "arn:${Partition}:glue:${Region}:${Account}:connection/${ConnectionName}", "connectionType": "arn:${Partition}:glue:${Region}:${Account}:connectionType:${ConnectionTypeName}", "crawler": "arn:${Partition}:glue:${Region}:${Account}:crawler/${CrawlerName}", "customEntityType": "arn:${Partition}:glue:${Region}:${Account}:customEntityType/${CustomEntityTypeId}", "dataQualityEvaluationConfig": "arn:${Partition}:glue:${Region}:${Account}:dataQualityEvaluationConfig/${EvaluationConfigName}", "dataQualityRuleset": "arn:${Partition}:glue:${Region}:${Account}:dataQualityRuleset/${RulesetName}", "database": "arn:${Partition}:glue:${Region}:${Account}:database/${DatabaseName}", "devendpoint": "arn:${Partition}:glue:${Region}:${Account}:devEndpoint/${DevEndpointName}", "integration": "arn:${Partition}:glue:${Region}:${Account}:integration:${IntegrationId}", "integrationResourceProperty": "arn:${Partition}:glue:${Region}:${Account}:integrationresourceproperty/${ResourceType}/${ResourceName}", "job": "arn:${Partition}:glue:${Region}:${Account}:job/${JobName}", "mlTransform": "arn:${Partition}:glue:${Region}:${Account}:mlTransform/${TransformId}", "registry": "arn:${Partition}:glue:${Region}:${Account}:registry/${RegistryName}", "rootcatalog": "arn:${Partition}:glue:${Region}:${Account}:catalog", "schema": "arn:${Partition}:glue:${Region}:${Account}:schema/${SchemaName}", "session": "arn:${Partition}:glue:${Region}:${Account}:session/${SessionId}", "table": "arn:${Partition}:glue:${Region}:${Account}:table/${DatabaseName}/${TableName}", "tableversion": "arn:${Partition}:glue:${Region}:${Account}:tableVersion/${DatabaseName}/${TableName}/${TableVersionName}", "trigger": "arn:${Partition}:glue:${Region}:${Account}:trigger/${TriggerName}", "usageProfile": "arn:${Partition}:glue:${Region}:${Account}:usageProfile/${UsageProfileId}", "userdefinedfunction": "arn:${Partition}:glue:${Region}:${Account}:userDefinedFunction/${DatabaseName}/${UserDefinedFunctionName}", "workflow": "arn:${Partition}:glue:${Region}:${Account}:workflow/${WorkflowName}"}, "guardduty": {"customdetectionrule": "arn:${Partition}:guardduty::aws:detection-rule/custom/${RuleId}", "customdetectionruleassociation": "arn:${Partition}:guardduty:${Region}:${Account}:detection-rule/custom/${RuleId}/association/${AssociationId}", "detector": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}", "filter": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/filter/${FilterName}", "ipset": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/ipset/${IPSetId}", "malwareprotectionplan": "arn:${Partition}:guardduty:${Region}:${Account}:malware-protection-plan/${MalwareProtectionPlanId}", "publishingDestination": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/publishingdestination/${PublishingDestinationId}", "threatentityset": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/threatentityset/${ThreatEntitySetId}", "threatintelset": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/threatintelset/${ThreatIntelSetId}", "trustedentityset": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/trustedentityset/${TrustedEntitySetId}"}, "inspector2": {"CIS Scan Configuration": "arn:${Partition}:inspector2:${Region}:${Account}:owner/${OwnerId}/cis-configuration/${CISScanConfigurationId}", "Code Security Integration": "arn:${Partition}:inspector2:${Region}:${Account}:codesecurity-integration/${CodeSecurityIntegrationId}", "Code Security Scan Configuration": "arn:${Partition}:inspector2:${Region}:${Account}:owner/${OwnerId}/codesecurity-configuration/${CodeSecurityScanConfigurationId}", "Connector": "arn:${Partition}:inspector2:${Region}:${Account}:connector/${ConnectorId}", "Filter": "arn:${Partition}:inspector2:${Region}:${Account}:owner/${OwnerId}/filter/${FilterId}", "Finding": "arn:${Partition}:inspector2:${Region}:${Account}:finding/${FindingId}"}, "kinesis": {"channel": "arn:${Partition}:kinesis:${Region}:${Account}:channel/${ChannelId}", "consumer": "arn:${Partition}:kinesis:${Region}:${Account}:${StreamType}/${StreamName}/consumer/${ConsumerName}:${ConsumerCreationTimpstamp}", "kmsKey": "arn:${Partition}:kms:${Region}:${Account}:key/${KeyId}", "queue": "arn:${Partition}:kinesis:${Region}:${Account}:queue/${QueueId}", "stream": "arn:${Partition}:kinesis:${Region}:${Account}:stream/${StreamName}"}, "kinesisanalytics": {"application": "arn:${Partition}:kinesisanalytics:${Region}:${Account}:application/${ApplicationName}", "snapshot": "arn:${Partition}:kinesisanalytics:${Region}:${Account}:snapshot/${SnapshotName}"}, "lambda": {"capacityProvider": "arn:${Partition}:lambda:${Region}:${Account}:capacity-provider:${CapacityProviderName}", "code signing config": "arn:${Partition}:lambda:${Region}:${Account}:code-signing-config:${CodeSigningConfigId}", "durable execution": "arn:${Partition}:lambda:${Region}:${Account}:function:${FunctionName}:${Version}/durable-execution/${ExecutionName}/${ExecutionId}", "eventSourceMapping": "arn:${Partition}:lambda:${Region}:${Account}:event-source-mapping:${UUID}", "function": "arn:${Partition}:lambda:${Region}:${Account}:function:${FunctionName}", "function alias": "arn:${Partition}:lambda:${Region}:${Account}:function:${FunctionName}:${Alias}", "function version": "arn:${Partition}:lambda:${Region}:${Account}:function:${FunctionName}:${Version}", "layer": "arn:${Partition}:lambda:${Region}:${Account}:layer:${LayerName}", "layerVersion": "arn:${Partition}:lambda:${Region}:${Account}:layer:${LayerName}:${LayerVersion}", "microvmImage": "arn:${Partition}:lambda:${Region}:${Account}:microvm-image:${MicrovmImageName}", "networkConnector": "arn:${Partition}:lambda:${Region}:${Account}:network-connector:${NetworkConnectorId}", "runtime": "arn:${Partition}:lambda:${Region}:${Account}:runtime/${RuntimeName}", "runtimeAlias": "arn:${Partition}:lambda:${Region}:${Account}:runtime/${RuntimeName}/alias/${Name}", "runtimeVersion": "arn:${Partition}:lambda:${Region}:${Account}:runtime/${RuntimeName}/version/${Name}", "webFunction": "arn:${Partition}:lambda:${Region}:${Account}:web-function/${FunctionName}", "webFunctionEndpoint": "arn:${Partition}:lambda:${Region}:${Account}:web-function/${FunctionName}/endpoint/${EndpointName}", "webFunctionRevision": "arn:${Partition}:lambda:${Region}:${Account}:web-function/${FunctionName}/revision/${RevisionId}"}, "logs": {"anomaly-detector": "arn:${Partition}:logs:${Region}:${Account}:anomaly-detector:${DetectorId}", "delivery": "arn:${Partition}:logs:${Region}:${Account}:delivery:${DeliveryName}", "delivery-destination": "arn:${Partition}:logs:${Region}:${Account}:delivery-destination:${DeliveryDestinationName}", "delivery-source": "arn:${Partition}:logs:${Region}:${Account}:delivery-source:${DeliverySourceName}", "destination": "arn:${Partition}:logs:${Region}:${Account}:destination:${DestinationName}", "log-group": "arn:${Partition}:logs:${Region}:${Account}:log-group:${LogGroupName}", "log-stream": "arn:${Partition}:logs:${Region}:${Account}:log-group:${LogGroupName}:log-stream:${LogStreamName}", "lookup-table": "arn:${Partition}:logs:${Region}:${Account}:lookup-table:${LookupTableName}", "scheduled-query": "arn:${Partition}:logs:${Region}:${Account}:scheduled-query:${ScheduledQueryId}"}, "macie2": {"AllowList": "arn:${Partition}:macie2:${Region}:${Account}:allow-list/${ResourceId}", "ClassificationJob": "arn:${Partition}:macie2:${Region}:${Account}:classification-job/${ResourceId}", "CustomDataIdentifier": "arn:${Partition}:macie2:${Region}:${Account}:custom-data-identifier/${ResourceId}", "FindingsFilter": "arn:${Partition}:macie2:${Region}:${Account}:findings-filter/${ResourceId}", "Member": "arn:${Partition}:macie2:${Region}:${Account}:member/${ResourceId}"}, "oam": {"Link": "arn:${Partition}:oam:${Region}:${Account}:link/${ResourceId}", "Sink": "arn:${Partition}:oam:${Region}:${Account}:sink/${ResourceId}"}, "payment-cryptography": {"alias": "arn:${Partition}:payment-cryptography:${Region}:${Account}:alias/${Alias}", "approval-team": "arn:${Partition}:mpa:${Region}:${Account}:approval-team/${ApprovalTeamId}", "key": "arn:${Partition}:payment-cryptography:${Region}:${Account}:key/${KeyId}"}, "pipes": {"pipe": "arn:${Partition}:pipes:${Region}:${Account}:pipe/${Name}"}, "quicksight": {"accessControlApplication": "arn:${Partition}:quicksight:${Region}:${Account}:access-control-application/${ResourceId}", "account": "arn:${Partition}:quicksight:${Region}:${Account}:account/${ResourceId}", "actionconnector": "arn:${Partition}:quicksight:${Region}:${Account}:action-connector/${ResourceId}", "agent": "arn:${Partition}:quicksight:${Region}:${Account}:agent/${ResourceId}", "analysis": "arn:${Partition}:quicksight:${Region}:${Account}:analysis/${ResourceId}", "app": "arn:${Partition}:quicksight:${Region}:${Account}:app/${ResourceId}", "approvalPolicy": "arn:${Partition}:quicksight:${Region}:${Account}:approval-policy/${ResourceId}", "assetBundleExportJob": "arn:${Partition}:quicksight:${Region}:${Account}:asset-bundle-export-job/${ResourceId}", "assetBundleImportJob": "arn:${Partition}:quicksight:${Region}:${Account}:asset-bundle-import-job/${ResourceId}", "assignment": "arn:${Partition}:quicksight::${Account}:assignment/${ResourceId}", "automation": "arn:${Partition}:quicksight:${Region}:${Account}:automation-group/${AutomationGroupId}/automation/${ResourceId}", "automationGroup": "arn:${Partition}:quicksight:${Region}:${Account}:automation-group/${ResourceId}", "automationJob": "arn:${Partition}:quicksight:${Region}:${Account}:automation-group/${AutomationGroupId}/automation/${AutomationId}/job/${ResourceId}", "brand": "arn:${Partition}:quicksight:${Region}:${Account}:brand/${ResourceId}", "customization": "arn:${Partition}:quicksight:${Region}:${Account}:customization/${ResourceId}", "custompermissions": "arn:${Partition}:quicksight:${Region}:${Account}:custompermissions/${ResourceId}", "dashboard": "arn:${Partition}:quicksight:${Region}:${Account}:dashboard/${ResourceId}", "dashboardSnapshotJob": "arn:${Partition}:quicksight:${Region}:${Account}:dashboard/${DashboardId}/snapshot-job/${ResourceId}", "dataset": "arn:${Partition}:quicksight:${Region}:${Account}:dataset/${ResourceId}", "datasource": "arn:${Partition}:quicksight:${Region}:${Account}:datasource/${ResourceId}", "dlpSetting": "arn:${Partition}:quicksight:${Region}:${Account}:dlpsetting/${ResourceId}", "emailCustomizationTemplate": "arn:${Partition}:quicksight:${Region}:${Account}:email-customization-template/${ResourceId}", "extension": "arn:${Partition}:quicksight:${Region}:${Account}:extension/${ResourceId}", "extensionaccess": "arn:${Partition}:quicksight:${Region}:${Account}:extension-access/${ResourceId}", "flow": "arn:${Partition}:quicksight:${Region}:${Account}:flow/${ResourceId}", "folder": "arn:${Partition}:quicksight:${Region}:${Account}:folder/${ResourceId}", "group": "arn:${Partition}:quicksight:${Region}:${Account}:group/${ResourceId}", "inboundConnector": "arn:${Partition}:quicksight:${Region}:${Account}:inbound-connector/${ResourceId}", "ingestion": "arn:${Partition}:quicksight:${Region}:${Account}:dataset/${DatasetId}/ingestion/${ResourceId}", "knowledgeBase": "arn:${Partition}:quicksight:${Region}:${Account}:knowledge-base/${ResourceId}", "limitsProfile": "arn:${Partition}:quicksight:${Region}:${Account}:limits-profile/${ResourceId}", "namespace": "arn:${Partition}:quicksight:${Region}:${Account}:namespace/${ResourceId}", "oauthClientApplication": "arn:${Partition}:quicksight:${Region}:${Account}:oauthClientApplication/${ResourceId}", "refreshschedule": "arn:${Partition}:quicksight:${Region}:${Account}:dataset/${DatasetId}/refresh-schedule/${ResourceId}", "space": "arn:${Partition}:quicksight:${Region}:${Account}:space/${ResourceId}", "template": "arn:${Partition}:quicksight:${Region}:${Account}:template/${ResourceId}", "theme": "arn:${Partition}:quicksight:${Region}:${Account}:theme/${ResourceId}", "topic": "arn:${Partition}:quicksight:${Region}:${Account}:topic/${ResourceId}", "user": "arn:${Partition}:quicksight:${Region}:${Account}:user/${ResourceId}", "vpcconnection": "arn:${Partition}:quicksight:${Region}:${Account}:vpcConnection/${ResourceId}"}, "ram": {"customer-managed-permission": "arn:${Partition}:ram:${Region}:${Account}:permission/${ResourcePath}", "permission": "arn:${Partition}:ram::aws:permission/${ResourcePath}", "resource-share": "arn:${Partition}:ram:${Region}:${Account}:resource-share/${ResourcePath}", "resource-share-invitation": "arn:${Partition}:ram:${Region}:${Account}:resource-share-invitation/${ResourcePath}"}, "rds": {"auto-backup": "arn:${Partition}:rds:${Region}:${Account}:auto-backup:${DbInstanceAutomatedBackupId}", "cev": "arn:${Partition}:rds:${Region}:${Account}:cev:${Engine}/${EngineVersion}/${CustomDbEngineVersionId}", "cluster": "arn:${Partition}:rds:${Region}:${Account}:cluster:${DbClusterInstanceName}", "cluster-auto-backup": "arn:${Partition}:rds:${Region}:${Account}:cluster-auto-backup:${DbClusterAutomatedBackupId}", "cluster-endpoint": "arn:${Partition}:rds:${Region}:${Account}:cluster-endpoint:${DbClusterEndpoint}", "cluster-pg": "arn:${Partition}:rds:${Region}:${Account}:cluster-pg:${ClusterParameterGroupName}", "cluster-snapshot": "arn:${Partition}:rds:${Region}:${Account}:cluster-snapshot:${ClusterSnapshotName}", "db": "arn:${Partition}:rds:${Region}:${Account}:db:${DbInstanceName}", "db-capacity-reservation": "arn:${Partition}:rds:${Region}:${Account}:db-capacity-reservation:${DBCapacityReservationIdentifier}", "deployment": "arn:${Partition}:rds:${Region}:${Account}:deployment:${BlueGreenDeploymentIdentifier}", "es": "arn:${Partition}:rds:${Region}:${Account}:es:${SubscriptionName}", "global-cluster": "arn:${Partition}:rds::${Account}:global-cluster:${GlobalCluster}", "integration": "arn:${Partition}:rds:${Region}:${Account}:integration:${IntegrationIdentifier}", "og": "arn:${Partition}:rds:${Region}:${Account}:og:${OptionGroupName}", "pg": "arn:${Partition}:rds:${Region}:${Account}:pg:${ParameterGroupName}", "proxy": "arn:${Partition}:rds:${Region}:${Account}:db-proxy:${DbProxyId}", "proxy-endpoint": "arn:${Partition}:rds:${Region}:${Account}:db-proxy-endpoint:${DbProxyEndpointId}", "ri": "arn:${Partition}:rds:${Region}:${Account}:ri:${ReservedDbInstanceName}", "secgrp": "arn:${Partition}:rds:${Region}:${Account}:secgrp:${SecurityGroupName}", "shardgrp": "arn:${Partition}:rds:${Region}:${Account}:shard-group:${DbShardGroupResourceId}", "snapshot": "arn:${Partition}:rds:${Region}:${Account}:snapshot:${SnapshotName}", "snapshot-tenant-database": "arn:${Partition}:rds:${Region}:${Account}:snapshot-tenant-database:${SnapshotName}:${TenantResourceId}", "subgrp": "arn:${Partition}:rds:${Region}:${Account}:subgrp:${SubnetGroupName}", "target-group": "arn:${Partition}:rds:${Region}:${Account}:target-group:${TargetGroupId}", "tenant-database": "arn:${Partition}:rds:${Region}:${Account}:tenant-database:${TenantResourceId}"}, "redshift": {"cluster": "arn:${Partition}:redshift:${Region}:${Account}:cluster:${ClusterName}", "datashare": "arn:${Partition}:redshift:${Region}:${Account}:datashare:${ProducerClusterNamespace}/${DataShareName}", "dbgroup": "arn:${Partition}:redshift:${Region}:${Account}:dbgroup:${ClusterName}/${DbGroup}", "dbname": "arn:${Partition}:redshift:${Region}:${Account}:dbname:${ClusterName}/${DbName}", "dbuser": "arn:${Partition}:redshift:${Region}:${Account}:dbuser:${ClusterName}/${DbUser}", "eventsubscription": "arn:${Partition}:redshift:${Region}:${Account}:eventsubscription:${EventSubscriptionName}", "hsmclientcertificate": "arn:${Partition}:redshift:${Region}:${Account}:hsmclientcertificate:${HSMClientCertificateId}", "hsmconfiguration": "arn:${Partition}:redshift:${Region}:${Account}:hsmconfiguration:${HSMConfigurationId}", "integration": "arn:${Partition}:redshift:${Region}:${Account}:integration:${IntegrationIdentifier}", "namespace": "arn:${Partition}:redshift:${Region}:${Account}:namespace:${ClusterNamespace}", "parametergroup": "arn:${Partition}:redshift:${Region}:${Account}:parametergroup:${ParameterGroupName}", "qev2idcapplication": "arn:${Partition}:redshift:${Region}:${Account}:qev2idcapplication:${Qev2IdcApplicationId}", "redshiftidcapplication": "arn:${Partition}:redshift:${Region}:${Account}:redshiftidcapplication:${RedshiftIdcApplicationId}", "securitygroup": "arn:${Partition}:redshift:${Region}:${Account}:securitygroup:${SecurityGroupName}/ec2securitygroup/${Owner}/${Ec2SecurityGroupId}", "securitygroupingress-cidr": "arn:${Partition}:redshift:${Region}:${Account}:securitygroupingress:${SecurityGroupName}/cidrip/${IpRange}", "securitygroupingress-ec2securitygroup": "arn:${Partition}:redshift:${Region}:${Account}:securitygroupingress:${SecurityGroupName}/ec2securitygroup/${Owner}/${Ece2SecuritygroupId}", "snapshot": "arn:${Partition}:redshift:${Region}:${Account}:snapshot:${ClusterName}/${SnapshotName}", "snapshotcopygrant": "arn:${Partition}:redshift:${Region}:${Account}:snapshotcopygrant:${SnapshotCopyGrantName}", "snapshotschedule": "arn:${Partition}:redshift:${Region}:${Account}:snapshotschedule:${ScheduleIdentifier}", "subnetgroup": "arn:${Partition}:redshift:${Region}:${Account}:subnetgroup:${SubnetGroupName}", "usagelimit": "arn:${Partition}:redshift:${Region}:${Account}:usagelimit:${UsageLimitId}"}, "redshift-data": {"cluster": "arn:${Partition}:redshift:${Region}:${Account}:cluster:${ClusterName}", "managed-workgroup": "arn:${Partition}:redshift-serverless:${Region}:${Account}:managed-workgroup/${ManagedWorkgroupId}", "workgroup": "arn:${Partition}:redshift-serverless:${Region}:${Account}:workgroup/${WorkgroupId}"}, "redshift-serverless": {"endpointAccess": "arn:${Partition}:redshift-serverless:${Region}:${Account}:managedvpcendpoint/${EndpointAccessId}", "managed-workgroup": "arn:${Partition}:redshift-serverless:${Region}:${Account}:managed-workgroup/${ManagedWorkgroupName}", "namespace": "arn:${Partition}:redshift-serverless:${Region}:${Account}:namespace/${NamespaceId}", "recoveryPoint": "arn:${Partition}:redshift-serverless:${Region}:${Account}:recoverypoint/${RecoveryPointId}", "snapshot": "arn:${Partition}:redshift-serverless:${Region}:${Account}:snapshot/${SnapshotId}", "workgroup": "arn:${Partition}:redshift-serverless:${Region}:${Account}:workgroup/${WorkgroupId}"}, "rekognition": {"collection": "arn:${Partition}:rekognition:${Region}:${Account}:collection/${CollectionId}", "dataset": "arn:${Partition}:rekognition:${Region}:${Account}:project/${ProjectName}/dataset/${DatasetType}/${CreationTimestamp}", "project": "arn:${Partition}:rekognition:${Region}:${Account}:project/${ProjectName}/${CreationTimestamp}", "projectversion": "arn:${Partition}:rekognition:${Region}:${Account}:project/${ProjectName}/version/${VersionName}/${CreationTimestamp}", "streamprocessor": "arn:${Partition}:rekognition:${Region}:${Account}:streamprocessor/${StreamprocessorId}"}, "resource-explorer-2": {"index": "arn:${Partition}:resource-explorer-2:${Region}:${Account}:index/${IndexUuid}", "managed-view": "arn:${Partition}:resource-explorer-2:${Region}:${Account}:managed-view/${ManagedViewName}/${ManagedViewUuid}", "view": "arn:${Partition}:resource-explorer-2:${Region}:${Account}:view/${ViewName}/${ViewUuid}"}, "resource-groups": {"group": "arn:${Partition}:resource-groups:${Region}:${Account}:group/${GroupName}", "tagSyncTask": "arn:${Partition}:resource-groups:${Region}:${Account}:group/${GroupName}/tag-sync-task/${TaskId}"}, "route53": {"change": "arn:${Partition}:route53:::change/${Id}", "cidrcollection": "arn:${Partition}:route53:::cidrcollection/${Id}", "delegationset": "arn:${Partition}:route53:::delegationset/${Id}", "healthcheck": "arn:${Partition}:route53:::healthcheck/${Id}", "healthchecksource": "arn:${Partition}:route53:::healthchecksource/${Id}", "hostedzone": "arn:${Partition}:route53:::hostedzone/${Id}", "queryloggingconfig": "arn:${Partition}:route53:::queryloggingconfig/${Id}", "trafficpolicy": "arn:${Partition}:route53:::trafficpolicy/${Id}", "trafficpolicyinstance": "arn:${Partition}:route53:::trafficpolicyinstance/${Id}", "vpc": "arn:${Partition}:ec2:${Region}:${Account}:vpc/${VpcId}"}, "s3tables": {"Table": "arn:${Partition}:s3tables:${Region}:${Account}:bucket/${TableBucketName}/table/${TableID}", "TableBucket": "arn:${Partition}:s3tables:${Region}:${Account}:bucket/${TableBucketName}"}, "s3vectors": {"Index": "arn:${Partition}:s3vectors:${Region}:${Account}:bucket/${BucketName}/index/${IndexName}", "VectorBucket": "arn:${Partition}:s3vectors:${Region}:${Account}:bucket/${BucketName}"}, "scheduler": {"schedule": "arn:${Partition}:scheduler:${Region}:${Account}:schedule/${GroupName}/${ScheduleName}", "schedule-group": "arn:${Partition}:scheduler:${Region}:${Account}:schedule-group/${GroupName}"}, "secretsmanager": {"Secret": "arn:${Partition}:secretsmanager:${Region}:${Account}:secret:${SecretId}"}, "securityhub": {"aggregatorv2": "arn:${Partition}:securityhub:${Region}:${Account}:aggregatorv2/${AggregatorV2Id}", "automation-rule": "arn:${Partition}:securityhub:${Region}:${Account}:automation-rule/${AutomationRuleId}", "automation-rulev2": "arn:${Partition}:securityhub:${Region}:${Account}:automation-rulev2/${AutomationRuleV2Id}", "configuration-policy": "arn:${Partition}:securityhub:${Region}:${Account}:configuration-policy/${ConfigurationPolicyId}", "connector": "arn:${Partition}:securityhub:${Region}:${Account}:connector/${ConnectorId}", "connectorv2": "arn:${Partition}:securityhub:${Region}:${Account}:connectorv2/${ConnectorV2Id}", "finding-aggregator": "arn:${Partition}:securityhub:${Region}:${Account}:finding-aggregator/${FindingAggregatorId}", "hub": "arn:${Partition}:securityhub:${Region}:${Account}:hub/default", "hubv2": "arn:${Partition}:securityhub:${Region}:${Account}:hubv2/${HubV2Id}", "product": "arn:${Partition}:securityhub:${Region}:${Account}:product/${Company}/${ProductId}"}, "servicediscovery": {"namespace": "arn:${Partition}:servicediscovery:${Region}:${Account}:namespace/${NamespaceId}", "service": "arn:${Partition}:servicediscovery:${Region}:${Account}:service/${ServiceId}"}, "servicequotas": {"quota": "arn:${Partition}:servicequotas:${Region}:${Account}:${ServiceCode}/${QuotaCode}"}, "signer": {"signing-job": "arn:${Partition}:signer:${Region}:${Account}:/signing-jobs/${JobId}", "signing-profile": "arn:${Partition}:signer:${Region}:${Account}:/signing-profiles/${ProfileName}"}, "sns": {"topic": "arn:${Partition}:sns:${Region}:${Account}:${TopicName}"}, "sqs": {"queue": "arn:${Partition}:sqs:${Region}:${Account}:${QueueName}"}, "ssm": {"association": "arn:${Partition}:ssm:${Region}:${Account}:association/${AssociationId}", "automation-definition": "arn:${Partition}:ssm:${Region}:${Account}:automation-definition/${AutomationDefinitionName}:${VersionId}", "automation-execution": "arn:${Partition}:ssm:${Region}:${Account}:automation-execution/${AutomationExecutionId}", "bucket": "arn:${Partition}:s3:::${BucketName}", "cloud-connector": "arn:${Partition}:ssm:${Region}:${Account}:cloud-connector/${CloudConnectorId}", "document": "arn:${Partition}:ssm:${Region}:${Account}:document/${DocumentName}", "iam-role": "arn:${Partition}:iam::${Account}:role/${RoleName}", "instance": "arn:${Partition}:ec2:${Region}:${Account}:instance/${InstanceId}", "maintenancewindow": "arn:${Partition}:ssm:${Region}:${Account}:maintenancewindow/${ResourceId}", "managed-instance": "arn:${Partition}:ssm:${Region}:${Account}:managed-instance/${InstanceId}", "managed-instance-inventory": "arn:${Partition}:ssm:${Region}:${Account}:managed-instance-inventory/${InstanceId}", "opsitem": "arn:${Partition}:ssm:${Region}:${Account}:opsitem/${ResourceId}", "opsitemgroup": "arn:${Partition}:ssm:${Region}:${Account}:opsitemgroup/default", "opsmetadata": "arn:${Partition}:ssm:${Region}:${Account}:opsmetadata/${ResourceId}", "parameter": "arn:${Partition}:ssm:${Region}:${Account}:parameter/${ParameterNameWithoutLeadingSlash}", "patchbaseline": "arn:${Partition}:ssm:${Region}:${Account}:patchbaseline/${PatchBaselineIdResourceId}", "resourcedatasync": "arn:${Partition}:ssm:${Region}:${Account}:resource-data-sync/${SyncName}", "servicesetting": "arn:${Partition}:ssm:${Region}:${Account}:servicesetting/${ResourceId}", "session": "arn:${Partition}:ssm:${Region}:${Account}:session/${SessionId}", "task": "arn:${Partition}:ecs:${Region}:${Account}:task/${TaskId}", "windowtarget": "arn:${Partition}:ssm:${Region}:${Account}:windowtarget/${WindowTargetId}", "windowtask": "arn:${Partition}:ssm:${Region}:${Account}:windowtask/${WindowTaskId}"}, "sso": {"Account": "arn:${Partition}:sso:::account/${AccountId}", "Application": "arn:${Partition}:sso::${Account}:application/${InstanceId}/${ApplicationId}", "ApplicationProvider": "arn:${Partition}:sso::aws:applicationProvider/${ApplicationProviderId}", "Instance": "arn:${Partition}:sso:::instance/${InstanceId}", "PermissionSet": "arn:${Partition}:sso:::permissionSet/${InstanceId}/${PermissionSetId}", "TrustedTokenIssuer": "arn:${Partition}:sso::${Account}:trustedTokenIssuer/${InstanceId}/${TrustedTokenIssuerId}"}, "states": {"activity": "arn:${Partition}:states:${Region}:${Account}:activity:${ActivityName}", "execution": "arn:${Partition}:states:${Region}:${Account}:execution:${StateMachineName}:${ExecutionId}", "express": "arn:${Partition}:states:${Region}:${Account}:express:${StateMachineName}:${ExecutionId}:${ExpressId}", "labelled execution": "arn:${Partition}:states:${Region}:${Account}:execution:${StateMachineName}/${MapRunLabel}:${ExecutionId}", "labelled express": "arn:${Partition}:states:${Region}:${Account}:express:${StateMachineName}/${MapRunLabel}:${ExecutionId}:${ExpressId}", "maprun": "arn:${Partition}:states:${Region}:${Account}:mapRun:${StateMachineName}/${MapRunLabel}:${MapRunId}", "statemachine": "arn:${Partition}:states:${Region}:${Account}:stateMachine:${StateMachineName}", "statemachinealias": "arn:${Partition}:states:${Region}:${Account}:stateMachine:${StateMachineName}:${StateMachineAliasName}", "statemachineversion": "arn:${Partition}:states:${Region}:${Account}:stateMachine:${StateMachineName}:${StateMachineVersionId}"}, "sts": {"context-provider": "arn:${Partition}:iam::aws:contextProvider/${ContextProviderName}", "federated-user": "arn:${Partition}:sts::${Account}:federated-user/${FederatedUserName}", "role": "arn:${Partition}:iam::${Account}:role/${RoleNameWithPath}", "root-user": "arn:${Partition}:iam::${Account}:root", "self-session": "arn:${Partition}:sts::${Account}:self"}, "textract": {"adapter": "arn:${Partition}:textract:${Region}:${Account}:/adapters/${AdapterId}", "adapterversion": "arn:${Partition}:textract:${Region}:${Account}:/adapters/${AdapterId}/versions/${AdapterVersion}", "blueprint": "arn:${Partition}:textract:${Region}:${Account}:blueprint/${BlueprintId}", "job": "arn:${Partition}:textract:${Region}:${Account}:job/${JobId}", "project": "arn:${Partition}:textract:${Region}:${Account}:project/${ProjectId}"}, "timestream-influxdb": {"db-backup": "arn:${Partition}:timestream-influxdb:${Region}:${Account}:db-backup/${DbBackupId}", "db-cluster": "arn:${Partition}:timestream-influxdb:${Region}:${Account}:db-cluster/${DbClusterId}", "db-instance": "arn:${Partition}:timestream-influxdb:${Region}:${Account}:db-instance/${DbInstanceIdentifier}", "db-parameter-group": "arn:${Partition}:timestream-influxdb:${Region}:${Account}:db-parameter-group/${DbParameterGroupIdentifier}"}, "translate": {"parallel-data": "arn:${Partition}:translate:${Region}:${Account}:parallel-data/${ResourceName}", "terminology": "arn:${Partition}:translate:${Region}:${Account}:terminology/${ResourceName}"}, "xray": {"group": "arn:${Partition}:xray:${Region}:${Account}:group/${GroupName}/${Id}", "sampling-rule": "arn:${Partition}:xray:${Region}:${Account}:sampling-rule/${SamplingRuleName}"}},
@@ -3319,20 +3319,124 @@
"lambda:UpdateRuntimeVersion": {"action": "lambda:UpdateRuntimeVersion", "types": ["runtimeVersion"], "resources": []},
"lambda:UpdateWebFunctionEndpoint": {"action": "lambda:UpdateWebFunctionEndpoint", "types": ["webFunctionEndpoint"], "resources": [{"type": "webFunctionEndpoint", "fill": {"EndpointName": "endpointName", "FunctionName": "functionName"}, "arnOf": {"functionName": "webFunction"}}], "located": {"endpointName": "{endpointName}", "functionName": "{functionName}"}},
"lambda:UploadFunction": {"action": "lambda:UploadFunction", "types": [], "resources": []},
+ "logs:AssociateKmsKey": {"action": "logs:AssociateKmsKey", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:AssociateSourceToS3TableIntegration": {"action": "logs:AssociateSourceToS3TableIntegration", "types": [], "resources": []},
+ "logs:CancelExportTask": {"action": "logs:CancelExportTask", "types": [], "resources": []},
+ "logs:CancelImportTask": {"action": "logs:CancelImportTask", "types": [], "resources": []},
"logs:CreateDelivery": {"action": "logs:CreateDelivery", "types": ["delivery", "delivery-destination", "delivery-source"], "resources": [{"types": ["delivery", "delivery-destination", "delivery-source"], "arn": "deliveryDestinationArn"}, {"type": "delivery", "fill": {}, "made": true}, {"type": "delivery-source", "fill": {"DeliverySourceName": "deliverySourceName"}}]},
+ "logs:CreateExportTask": {"action": "logs:CreateExportTask", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:CreateImportTask": {"action": "logs:CreateImportTask", "types": [], "resources": []},
+ "logs:CreateLogAnomalyDetector": {"action": "logs:CreateLogAnomalyDetector", "types": ["log-group"], "resources": [{"types": ["log-group"], "arn": "logGroupArnList[]"}]},
+ "logs:CreateLogGroup": {"action": "logs:CreateLogGroup", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:CreateLogStream": {"action": "logs:CreateLogStream", "types": ["log-stream"], "resources": [{"type": "log-stream", "fill": {"LogGroupName": "logGroupName", "LogStreamName": "logStreamName"}}]},
+ "logs:CreateLookupTable": {"action": "logs:CreateLookupTable", "types": ["lookup-table"], "resources": [{"type": "lookup-table", "fill": {"LookupTableName": "lookupTableName"}}]},
+ "logs:CreateScheduledQuery": {"action": "logs:CreateScheduledQuery", "types": ["scheduled-query"], "resources": [{"types": ["scheduled-query"], "arn": "executionRoleArn"}, {"type": "scheduled-query", "fill": {}, "find": ["name"]}]},
+ "logs:DeleteAccountPolicy": {"action": "logs:DeleteAccountPolicy", "types": [], "resources": []},
+ "logs:DeleteDataProtectionPolicy": {"action": "logs:DeleteDataProtectionPolicy", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
"logs:DeleteDelivery": {"action": "logs:DeleteDelivery", "types": ["delivery"], "resources": [{"type": "delivery", "fill": {}, "find": ["id"]}]},
"logs:DeleteDeliveryDestination": {"action": "logs:DeleteDeliveryDestination", "types": ["delivery-destination"], "resources": [{"type": "delivery-destination", "fill": {"DeliveryDestinationName": "name"}}]},
+ "logs:DeleteDeliveryDestinationPolicy": {"action": "logs:DeleteDeliveryDestinationPolicy", "types": ["delivery-destination"], "resources": [{"type": "delivery-destination", "fill": {"DeliveryDestinationName": "deliveryDestinationName"}}]},
"logs:DeleteDeliverySource": {"action": "logs:DeleteDeliverySource", "types": ["delivery-destination"], "resources": [{"types": ["delivery-destination"], "through": "name"}]},
+ "logs:DeleteDestination": {"action": "logs:DeleteDestination", "types": ["destination"], "resources": [{"type": "destination", "fill": {"DestinationName": "destinationName"}}]},
+ "logs:DeleteIndexPolicy": {"action": "logs:DeleteIndexPolicy", "types": [], "resources": []},
+ "logs:DeleteIntegration": {"action": "logs:DeleteIntegration", "types": [], "resources": []},
+ "logs:DeleteLogAnomalyDetector": {"action": "logs:DeleteLogAnomalyDetector", "types": ["anomaly-detector"], "resources": [{"types": ["anomaly-detector"], "arn": "anomalyDetectorArn"}]},
+ "logs:DeleteLogGroup": {"action": "logs:DeleteLogGroup", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DeleteLogStream": {"action": "logs:DeleteLogStream", "types": ["log-stream"], "resources": [{"type": "log-stream", "fill": {"LogGroupName": "logGroupName", "LogStreamName": "logStreamName"}}]},
+ "logs:DeleteLookupTable": {"action": "logs:DeleteLookupTable", "types": ["lookup-table"], "resources": [{"types": ["lookup-table"], "arn": "lookupTableArn"}]},
+ "logs:DeleteMetricFilter": {"action": "logs:DeleteMetricFilter", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DeleteQueryDefinition": {"action": "logs:DeleteQueryDefinition", "types": [], "resources": []},
+ "logs:DeleteResourcePolicy": {"action": "logs:DeleteResourcePolicy", "types": [], "resources": []},
+ "logs:DeleteRetentionPolicy": {"action": "logs:DeleteRetentionPolicy", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DeleteScheduledQuery": {"action": "logs:DeleteScheduledQuery", "types": ["scheduled-query"], "resources": [{"type": "scheduled-query", "fill": {"ScheduledQueryId": "identifier"}}]},
+ "logs:DeleteSubscriptionFilter": {"action": "logs:DeleteSubscriptionFilter", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DeleteSyslogConfiguration": {"action": "logs:DeleteSyslogConfiguration", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:DeleteTransformer": {"action": "logs:DeleteTransformer", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:DescribeAccountPolicies": {"action": "logs:DescribeAccountPolicies", "types": [], "resources": []},
+ "logs:DescribeConfigurationTemplates": {"action": "logs:DescribeConfigurationTemplates", "types": [], "resources": []},
"logs:DescribeDeliveries": {"action": "logs:DescribeDeliveries", "types": [], "resources": []},
"logs:DescribeDeliveryDestinations": {"action": "logs:DescribeDeliveryDestinations", "types": [], "resources": []},
"logs:DescribeDeliverySources": {"action": "logs:DescribeDeliverySources", "types": [], "resources": []},
+ "logs:DescribeDestinations": {"action": "logs:DescribeDestinations", "types": [], "resources": []},
+ "logs:DescribeExportTasks": {"action": "logs:DescribeExportTasks", "types": [], "resources": []},
+ "logs:DescribeFieldIndexes": {"action": "logs:DescribeFieldIndexes", "types": [], "resources": []},
+ "logs:DescribeImportTaskBatches": {"action": "logs:DescribeImportTaskBatches", "types": [], "resources": []},
+ "logs:DescribeImportTasks": {"action": "logs:DescribeImportTasks", "types": [], "resources": []},
+ "logs:DescribeIndexPolicies": {"action": "logs:DescribeIndexPolicies", "types": [], "resources": []},
+ "logs:DescribeLogGroups": {"action": "logs:DescribeLogGroups", "types": [], "resources": []},
+ "logs:DescribeLogStreams": {"action": "logs:DescribeLogStreams", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DescribeLookupTables": {"action": "logs:DescribeLookupTables", "types": [], "resources": []},
+ "logs:DescribeMetricFilters": {"action": "logs:DescribeMetricFilters", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DescribeQueries": {"action": "logs:DescribeQueries", "types": [], "resources": []},
+ "logs:DescribeQueryDefinitions": {"action": "logs:DescribeQueryDefinitions", "types": [], "resources": []},
+ "logs:DescribeResourcePolicies": {"action": "logs:DescribeResourcePolicies", "types": [], "resources": []},
+ "logs:DescribeSubscriptionFilters": {"action": "logs:DescribeSubscriptionFilters", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DisassociateKmsKey": {"action": "logs:DisassociateKmsKey", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:DisassociateSourceFromS3TableIntegration": {"action": "logs:DisassociateSourceFromS3TableIntegration", "types": [], "resources": []},
+ "logs:FilterLogEvents": {"action": "logs:FilterLogEvents", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:GetDataProtectionPolicy": {"action": "logs:GetDataProtectionPolicy", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
"logs:GetDelivery": {"action": "logs:GetDelivery", "types": ["delivery"], "resources": [{"type": "delivery", "fill": {}, "find": ["id"]}]},
"logs:GetDeliveryDestination": {"action": "logs:GetDeliveryDestination", "types": ["delivery-destination"], "resources": [{"type": "delivery-destination", "fill": {"DeliveryDestinationName": "name"}}]},
+ "logs:GetDeliveryDestinationPolicy": {"action": "logs:GetDeliveryDestinationPolicy", "types": ["delivery-destination"], "resources": [{"type": "delivery-destination", "fill": {"DeliveryDestinationName": "deliveryDestinationName"}}]},
"logs:GetDeliverySource": {"action": "logs:GetDeliverySource", "types": ["delivery-source"], "resources": [{"type": "delivery-source", "fill": {"DeliverySourceName": "name"}}]},
+ "logs:GetIntegration": {"action": "logs:GetIntegration", "types": [], "resources": []},
+ "logs:GetLogAnomalyDetector": {"action": "logs:GetLogAnomalyDetector", "types": ["anomaly-detector"], "resources": [{"types": ["anomaly-detector"], "arn": "anomalyDetectorArn"}]},
+ "logs:GetLogEvents": {"action": "logs:GetLogEvents", "types": ["log-stream"], "resources": [{"type": "log-stream", "fill": {"LogGroupName": "logGroupName", "LogStreamName": "logStreamName"}, "unless": {"logGroupName": [null]}}]},
+ "logs:GetLogFields": {"action": "logs:GetLogFields", "types": [], "resources": []},
+ "logs:GetLogGroupFields": {"action": "logs:GetLogGroupFields", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:GetLogObject": {"action": "logs:GetLogObject", "types": [], "resources": []},
+ "logs:GetLogRecord": {"action": "logs:GetLogRecord", "types": ["log-group"], "resources": []},
+ "logs:GetLookupTable": {"action": "logs:GetLookupTable", "types": ["lookup-table"], "resources": [{"types": ["lookup-table"], "arn": "lookupTableArn"}]},
+ "logs:GetQueryResults": {"action": "logs:GetQueryResults", "types": ["log-group"], "resources": []},
+ "logs:GetScheduledQuery": {"action": "logs:GetScheduledQuery", "types": ["scheduled-query"], "resources": [{"type": "scheduled-query", "fill": {"ScheduledQueryId": "identifier"}}]},
+ "logs:GetScheduledQueryHistory": {"action": "logs:GetScheduledQueryHistory", "types": ["scheduled-query"], "resources": [{"type": "scheduled-query", "fill": {"ScheduledQueryId": "identifier"}}]},
+ "logs:GetStorageTierPolicy": {"action": "logs:GetStorageTierPolicy", "types": [], "resources": []},
+ "logs:GetTransformer": {"action": "logs:GetTransformer", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:ListAggregateLogGroupSummaries": {"action": "logs:ListAggregateLogGroupSummaries", "types": [], "resources": []},
+ "logs:ListAnomalies": {"action": "logs:ListAnomalies", "types": ["anomaly-detector"], "resources": [{"types": ["anomaly-detector"], "arn": "anomalyDetectorArn"}, {"type": "anomaly-detector", "fill": {}, "when": {"anomalyDetectorArn": [null]}, "default": true}]},
+ "logs:ListIntegrations": {"action": "logs:ListIntegrations", "types": [], "resources": []},
+ "logs:ListLogAnomalyDetectors": {"action": "logs:ListLogAnomalyDetectors", "types": ["anomaly-detector"], "resources": [{"types": ["anomaly-detector"], "arn": "filterLogGroupArn"}]},
+ "logs:ListLogGroups": {"action": "logs:ListLogGroups", "types": [], "resources": []},
+ "logs:ListLogGroupsForQuery": {"action": "logs:ListLogGroupsForQuery", "types": [], "resources": []},
+ "logs:ListScheduledQueries": {"action": "logs:ListScheduledQueries", "types": [], "resources": []},
+ "logs:ListSourcesForS3TableIntegration": {"action": "logs:ListSourcesForS3TableIntegration", "types": [], "resources": []},
+ "logs:ListSyslogConfigurations": {"action": "logs:ListSyslogConfigurations", "types": [], "resources": []},
+ "logs:ListTagsForResource": {"action": "logs:ListTagsForResource", "types": ["anomaly-detector", "delivery", "delivery-destination", "delivery-source", "destination", "log-group", "lookup-table"], "resources": [{"types": ["anomaly-detector", "delivery", "delivery-destination", "delivery-source", "destination", "log-group", "lookup-table"], "arn": "resourceArn"}]},
+ "logs:ListTagsLogGroup": {"action": "logs:ListTagsLogGroup", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:PutAccountPolicy": {"action": "logs:PutAccountPolicy", "types": [], "resources": []},
+ "logs:PutBearerTokenAuthentication": {"action": "logs:PutBearerTokenAuthentication", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:PutDataProtectionPolicy": {"action": "logs:PutDataProtectionPolicy", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
"logs:PutDeliveryDestination": {"action": "logs:PutDeliveryDestination", "types": ["delivery-destination"], "resources": [{"types": ["delivery-destination"], "arn": "deliveryDestinationConfiguration.destinationResourceArn"}, {"types": ["delivery-destination"], "arn": "roleArn"}, {"type": "delivery-destination", "fill": {"DeliveryDestinationName": "name"}}]},
+ "logs:PutDeliveryDestinationPolicy": {"action": "logs:PutDeliveryDestinationPolicy", "types": ["delivery-destination"], "resources": [{"type": "delivery-destination", "fill": {"DeliveryDestinationName": "deliveryDestinationName"}}]},
"logs:PutDeliverySource": {"action": "logs:PutDeliverySource", "types": ["delivery-source"], "resources": [{"types": ["delivery-source"], "arn": "resourceArn"}, {"type": "delivery-source", "fill": {"DeliverySourceName": "name"}}]},
"logs:PutDestination": {"action": "logs:PutDestination", "types": ["destination"], "resources": [{"types": ["destination"], "arn": "roleArn"}, {"types": ["destination"], "arn": "targetArn"}, {"type": "destination", "fill": {"DestinationName": "destinationName"}}]},
+ "logs:PutDestinationPolicy": {"action": "logs:PutDestinationPolicy", "types": ["destination"], "resources": [{"type": "destination", "fill": {"DestinationName": "destinationName"}}]},
+ "logs:PutIndexPolicy": {"action": "logs:PutIndexPolicy", "types": [], "resources": []},
+ "logs:PutIntegration": {"action": "logs:PutIntegration", "types": [], "resources": []},
+ "logs:PutLogEvents": {"action": "logs:PutLogEvents", "types": ["log-stream"], "resources": [{"type": "log-stream", "fill": {"LogGroupName": "logGroupName", "LogStreamName": "logStreamName"}}]},
+ "logs:PutLogGroupDeletionProtection": {"action": "logs:PutLogGroupDeletionProtection", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:PutMetricFilter": {"action": "logs:PutMetricFilter", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:PutQueryDefinition": {"action": "logs:PutQueryDefinition", "types": [], "resources": []},
+ "logs:PutResourcePolicy": {"action": "logs:PutResourcePolicy", "types": [], "resources": []},
+ "logs:PutRetentionPolicy": {"action": "logs:PutRetentionPolicy", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:PutStorageTierPolicy": {"action": "logs:PutStorageTierPolicy", "types": [], "resources": []},
+ "logs:PutSubscriptionFilter": {"action": "logs:PutSubscriptionFilter", "types": ["destination", "log-group"], "resources": [{"types": ["destination", "log-group"], "arn": "destinationArn"}, {"types": ["destination", "log-group"], "arn": "roleArn"}, {"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:PutSyslogConfiguration": {"action": "logs:PutSyslogConfiguration", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:PutTransformer": {"action": "logs:PutTransformer", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifier"}}]},
+ "logs:StartLiveTail": {"action": "logs:StartLiveTail", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupIdentifiers[]"}}]},
+ "logs:StartQuery": {"action": "logs:StartQuery", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:StopQuery": {"action": "logs:StopQuery", "types": [], "resources": []},
+ "logs:TagLogGroup": {"action": "logs:TagLogGroup", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:TagResource": {"action": "logs:TagResource", "types": ["anomaly-detector", "delivery", "delivery-destination", "delivery-source", "destination", "log-group", "lookup-table", "scheduled-query"], "resources": [{"types": ["anomaly-detector", "delivery", "delivery-destination", "delivery-source", "destination", "log-group", "lookup-table", "scheduled-query"], "arn": "resourceArn"}]},
+ "logs:TestMetricFilter": {"action": "logs:TestMetricFilter", "types": [], "resources": []},
+ "logs:TestTransformer": {"action": "logs:TestTransformer", "types": [], "resources": []},
+ "logs:UntagLogGroup": {"action": "logs:UntagLogGroup", "types": ["log-group"], "resources": [{"type": "log-group", "fill": {"LogGroupName": "logGroupName"}}]},
+ "logs:UntagResource": {"action": "logs:UntagResource", "types": ["anomaly-detector", "delivery", "delivery-destination", "delivery-source", "destination", "log-group", "lookup-table", "scheduled-query"], "resources": [{"types": ["anomaly-detector", "delivery", "delivery-destination", "delivery-source", "destination", "log-group", "lookup-table", "scheduled-query"], "arn": "resourceArn"}]},
+ "logs:UpdateAnomaly": {"action": "logs:UpdateAnomaly", "types": ["anomaly-detector"], "resources": [{"types": ["anomaly-detector"], "arn": "anomalyDetectorArn"}, {"types": ["anomaly-detector"], "through": "anomalyId"}]},
"logs:UpdateDeliveryConfiguration": {"action": "logs:UpdateDeliveryConfiguration", "types": ["delivery", "delivery-destination", "delivery-source"], "resources": [{"type": "delivery", "fill": {}, "find": ["id"]}]},
+ "logs:UpdateLogAnomalyDetector": {"action": "logs:UpdateLogAnomalyDetector", "types": ["anomaly-detector"], "resources": [{"types": ["anomaly-detector"], "arn": "anomalyDetectorArn"}]},
+ "logs:UpdateLookupTable": {"action": "logs:UpdateLookupTable", "types": ["lookup-table"], "resources": [{"types": ["lookup-table"], "arn": "lookupTableArn"}]},
+ "logs:UpdateScheduledQuery": {"action": "logs:UpdateScheduledQuery", "types": ["scheduled-query"], "resources": [{"types": ["scheduled-query"], "arn": "executionRoleArn"}, {"type": "scheduled-query", "fill": {"ScheduledQueryId": "identifier"}}]},
"macie2:AcceptInvitation": {"action": "macie2:AcceptInvitation", "types": [], "resources": []},
"macie2:BatchGetCustomDataIdentifiers": {"action": "macie2:BatchGetCustomDataIdentifiers", "types": ["CustomDataIdentifier"], "resources": [{"type": "CustomDataIdentifier", "fill": {"ResourceId": "ids[]"}}]},
"macie2:BatchUpdateAutomatedDiscoveryAccounts": {"action": "macie2:BatchUpdateAutomatedDiscoveryAccounts", "types": [], "resources": []},
diff --git a/src/test/java/io/floci/aws/core/common/IamConditionContextResolverTest.java b/src/test/java/io/floci/aws/core/common/IamConditionContextResolverTest.java
index 446515e8ed7..84cb73618ac 100644
--- a/src/test/java/io/floci/aws/core/common/IamConditionContextResolverTest.java
+++ b/src/test/java/io/floci/aws/core/common/IamConditionContextResolverTest.java
@@ -3,8 +3,6 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.floci.aws.config.EmulatorConfig;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsCrossAccountService;
-import io.floci.aws.services.cloudwatch.logs.CloudWatchLogsService;
import io.floci.aws.services.dynamodb.DynamoDbFacade;
import io.floci.aws.services.dynamodb.DynamoDbService;
import io.floci.aws.services.dynamodb.backend.NativeDynamoDbBackend;
@@ -61,7 +59,6 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
@@ -77,8 +74,6 @@ class IamConditionContextResolverTest {
private Instance dynamoDbFacadeInstance;
private Ec2Service ec2Service;
private S3Service s3Service;
- private CloudWatchLogsService logsService;
- private CloudWatchLogsCrossAccountService crossAccountService;
private IamService iamService;
private LambdaWebService lambdaWebService;
private RequestContext requestContext;
@@ -123,14 +118,6 @@ void setUp() {
Instance s3ServiceInstance = mock(Instance.class);
when(s3ServiceInstance.isResolvable()).thenReturn(true);
when(s3ServiceInstance.get()).thenReturn(s3Service);
- logsService = mock(CloudWatchLogsService.class);
- Instance logsServiceInstance = mock(Instance.class);
- when(logsServiceInstance.isResolvable()).thenReturn(true);
- when(logsServiceInstance.get()).thenReturn(logsService);
- crossAccountService = mock(CloudWatchLogsCrossAccountService.class);
- Instance crossAccountServiceInstance = mock(Instance.class);
- when(crossAccountServiceInstance.isResolvable()).thenReturn(true);
- when(crossAccountServiceInstance.get()).thenReturn(crossAccountService);
iamService = mock(IamService.class);
Instance iamServiceInstance = mock(Instance.class);
when(iamServiceInstance.isResolvable()).thenReturn(true);
@@ -152,8 +139,7 @@ void setUp() {
ServiceCatalog catalog = new ServiceCatalog(List.of(dynamo));
when(serviceCatalog.matchTarget(any())).thenAnswer(call -> catalog.matchTarget(call.getArgument(0)));
resolver = new IamConditionContextResolver(
- dynamoDbFacadeInstance, ec2ServiceInstance, s3ServiceInstance, logsServiceInstance,
- crossAccountServiceInstance, iamServiceInstance,
+ dynamoDbFacadeInstance, ec2ServiceInstance, s3ServiceInstance, iamServiceInstance,
lambdaWebServiceInstance, spellings(new ShapeNamingSpelling()), mock(Instance.class),
requestContext, new RegionResolver("us-east-1", "123456789012"), config,
null, serviceCatalog);
@@ -247,43 +233,26 @@ void anAssumeRoleRequestCarriesItsSessionNameAndExternalId() {
assertNull(resolver.resolve("sts", "sts:GetCallerIdentity", formRequest("Action=GetCallerIdentity")));
}
+ /** A Logs create or tag call carries the tags it asks to attach or remove; what it names carries its own. */
@Test
- void logStreamTagsUseRawParentNameAndRequestRegion() throws Exception {
+ void aLogsTagCallCarriesTheTagsItAsksToAttachOrRemove() throws Exception {
ContainerRequestContext request = mock(ContainerRequestContext.class);
+ String group = "\"resourceArn\":\"arn:aws:logs:us-east-1:123456789012:log-group:app\"";
when(request.getProperty("floci.bufferedJsonBody"))
- .thenReturn(mapper.readTree("{\"logGroupName\":\" group \",\"logStreamName\":42}"));
- when(logsService.listTagsLogGroup(" group ", "eu-west-1")).thenReturn(Map.of("team", "blue"));
- requestContext.setRegion("eu-west-1");
- for (String action : List.of("logs:CreateLogStream", "logs:DeleteLogStream")) {
- assertEquals(Map.of("aws:ResourceTag/team", List.of("blue")), resolver.resolve("logs", action, request));
- }
- requestContext.setRegion(null);
- when(logsService.listTagsLogGroup(" group ", "us-east-1")).thenReturn(Map.of("team", "red"));
- assertEquals(Map.of("aws:ResourceTag/team", List.of("red")),
- resolver.resolve("logs", "logs:CreateLogStream", request));
- }
-
- @Test
- void missingLogGroupTagsDoNotReplaceTheHandlersMissingResourceError() throws Exception {
- ContainerRequestContext request = mock(ContainerRequestContext.class);
- when(request.getProperty("floci.bufferedJsonBody")).thenReturn(mapper.readTree("{\"logGroupName\":42}"));
- when(logsService.listTagsLogGroup("42", "us-east-1"))
- .thenThrow(new AwsException("ResourceNotFoundException", "missing", 400));
- assertNull(resolver.resolve("logs", "logs:DeleteLogStream", request));
- }
-
- @Test
- void unexpectedLogGroupLookupFailuresCannotEraseTagDenies() throws Exception {
- ContainerRequestContext request = mock(ContainerRequestContext.class);
- when(request.getProperty("floci.bufferedJsonBody")).thenReturn(mapper.readTree("{\"logGroupName\":\"group\"}"));
- AwsException failure = new AwsException("InternalFailure", "storage unavailable", 500);
- when(logsService.listTagsLogGroup("group", "us-east-1")).thenThrow(failure);
- assertSame(failure, assertThrows(AwsException.class,
- () -> resolver.resolve("logs", "logs:CreateLogStream", request)));
- IllegalStateException unexpected = new IllegalStateException("unavailable");
- doThrow(unexpected).when(logsService).listTagsLogGroup("group", "us-east-1");
- assertSame(unexpected, assertThrows(IllegalStateException.class,
- () -> resolver.resolve("logs", "logs:DeleteLogStream", request)));
+ .thenReturn(mapper.readTree("{" + group + ",\"tags\":{\"team\":\"blue\"}}"));
+ assertEquals(Map.of("aws:RequestTag/team", List.of("blue"), "aws:TagKeys", List.of("team")),
+ resolver.resolve("logs", "logs:TagResource", request));
+ when(request.getProperty("floci.bufferedJsonBody"))
+ .thenReturn(mapper.readTree("{" + group + ",\"tagKeys\":[\"team\"]}"));
+ assertEquals(Map.of("aws:TagKeys", List.of("team")), resolver.resolve("logs", "logs:UntagResource", request));
+ when(request.getProperty("floci.bufferedJsonBody"))
+ .thenReturn(mapper.readTree("{\"logGroupName\":\"app\",\"tags\":{\"team\":\"red\"}}"));
+ assertEquals(Map.of("aws:RequestTag/team", List.of("red"), "aws:TagKeys", List.of("team")),
+ resolver.resolve("logs", "logs:CreateLogGroup", request));
+ when(request.getProperty("floci.bufferedJsonBody"))
+ .thenReturn(mapper.readTree("{\"logGroupName\":\"app\",\"logStreamName\":\"s\"}"));
+ assertNull(resolver.resolve("logs", "logs:CreateLogGroup", request));
+ assertNull(resolver.resolve("logs", "logs:CreateLogStream", request));
}
/** A form request whose body can be read again, as a real request's restored stream can. */
@@ -866,7 +835,7 @@ private List remainingRetentionDays(String until) {
@SuppressWarnings("unchecked")
private IamConditionContextResolver resolverAt(Instant now) {
return new IamConditionContextResolver(mock(Instance.class), mock(Instance.class), mock(Instance.class),
- mock(Instance.class), mock(Instance.class), mock(Instance.class), mock(Instance.class),
+ mock(Instance.class), mock(Instance.class),
spellings(), mock(Instance.class), requestContext, new RegionResolver("us-east-1", "123456789012"),
config, null,
serviceCatalog, Clock.fixed(now, ZoneOffset.UTC));
@@ -878,7 +847,7 @@ private IamConditionContextResolver resolverReading(StoredResourceArns stored) {
Instance instance = mock(Instance.class);
when(instance.iterator()).thenAnswer(invocation -> List.of(stored).iterator());
return new IamConditionContextResolver(mock(Instance.class), mock(Instance.class), mock(Instance.class),
- mock(Instance.class), mock(Instance.class), mock(Instance.class), mock(Instance.class),
+ mock(Instance.class), mock(Instance.class),
spellings(), instance, requestContext, new RegionResolver("us-east-1", "123456789012"), config,
null, serviceCatalog, Clock.systemUTC());
}
diff --git a/src/test/java/io/floci/aws/core/common/RequestResourceMembersTest.java b/src/test/java/io/floci/aws/core/common/RequestResourceMembersTest.java
index a1d607b52e0..988e87fc6f5 100644
--- a/src/test/java/io/floci/aws/core/common/RequestResourceMembersTest.java
+++ b/src/test/java/io/floci/aws/core/common/RequestResourceMembersTest.java
@@ -18,7 +18,6 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -164,21 +163,14 @@ void theTableReadsItsNamespacesAndGivesEachTypeItNamesAnArnFormat() {
assertTrue(table.namespaces().containsAll(List.of("cognito-idp", "ecr", "elasticloadbalancing", "states")));
assertTrue(table.namespaces().contains("lambda"));
assertFalse(table.handBuilt().contains("lambda"));
- assertEquals(Set.of("dynamodb", "logs"), table.namespaces().stream().filter(table.handBuilt()::contains)
+ assertFalse(table.handBuilt().contains("logs"));
+ assertEquals(Set.of("dynamodb"), table.namespaces().stream().filter(table.handBuilt()::contains)
.collect(Collectors.toSet()));
- Set logsDelivery = Stream.of("PutDeliverySource", "GetDeliverySource", "DeleteDeliverySource",
- "DescribeDeliverySources", "PutDeliveryDestination", "GetDeliveryDestination",
- "DeleteDeliveryDestination", "DescribeDeliveryDestinations", "CreateDelivery", "GetDelivery",
- "UpdateDeliveryConfiguration", "DeleteDelivery", "DescribeDeliveries")
- .map(operation -> "logs:" + operation).collect(Collectors.toSet());
- Set expected = new HashSet<>(logsDelivery);
- expected.add("logs:PutDestination");
// What AWS was measured to check where the Service Reference lists no resource type (MEASURED).
- expected.add("dynamodb:ListTables");
- assertEquals(expected, table.operations().keySet().stream()
+ assertEquals(Set.of("dynamodb:ListTables"), table.operations().keySet().stream()
.filter(operation -> table.handBuilt().contains(operation.substring(0, operation.indexOf(':'))))
.collect(Collectors.toSet()),
- "only the operations listed to read override hand-built operations");
+ "only what MEASURED gives is read in a hand-built namespace");
assertTrue(table.namespaces().stream().noneMatch(table.notCovered()::contains));
assertTrue(table.operations().containsKey("rds:CreateDBParameterGroup"));
assertTrue(table.operations().containsKey("rds:CreateDBProxy"));
diff --git a/src/test/java/io/floci/aws/services/dynamodb/backend/DynamoDbFacadeTest.java b/src/test/java/io/floci/aws/services/dynamodb/backend/DynamoDbFacadeTest.java
index 53c0e71a01f..dd892ade018 100644
--- a/src/test/java/io/floci/aws/services/dynamodb/backend/DynamoDbFacadeTest.java
+++ b/src/test/java/io/floci/aws/services/dynamodb/backend/DynamoDbFacadeTest.java
@@ -152,7 +152,7 @@ void iamConditionContextFindsTheTableInTheRequestRegion() throws Exception {
RequestContext requestContext = new RequestContext();
requestContext.setRegion(OTHER_REGION);
IamConditionContextResolver resolver = new IamConditionContextResolver(dynamoDb,
- mock(Instance.class), mock(Instance.class), mock(Instance.class), mock(Instance.class),
+ mock(Instance.class), mock(Instance.class),
mock(Instance.class), mock(Instance.class), mock(Instance.class),
mock(Instance.class), requestContext,
new RegionResolver(OTHER_REGION, "000000000000"),
diff --git a/src/test/java/io/floci/aws/services/iam/LogsArnTagAuthorizationIntegrationTest.java b/src/test/java/io/floci/aws/services/iam/LogsArnTagAuthorizationIntegrationTest.java
index 0d85780a42d..2389e574368 100644
--- a/src/test/java/io/floci/aws/services/iam/LogsArnTagAuthorizationIntegrationTest.java
+++ b/src/test/java/io/floci/aws/services/iam/LogsArnTagAuthorizationIntegrationTest.java
@@ -123,11 +123,18 @@ private void verifyForeignArn(String action, String dimension, boolean root) {
assertTags(local, expectedTags(action));
}
+ /**
+ * A plain name where AWS takes an ARN names nothing the generated table reads, so the call is checked on
+ * {@code *}; the handler still reads it as the literal name of a historical group.
+ */
@ParameterizedTest
@ValueSource(strings = {"TagResource", "UntagResource", "ListTagsForResource"})
void incompleteArnPrefixRemainsALiteralLegacyName(String action) {
String name = historicalGroupNamed("arn:archive-" + UUID.randomUUID(), Map.of("team", "blue"));
- String caller = user(statement("Allow", "logs:" + action, arn(name)));
+ String scoped = user(statement("Allow", "logs:" + action, arn(name)));
+ invoke(scoped, action, name).statusCode(400).body(containsString("AccessDeniedException"));
+ assertTags(name, Map.of("team", "blue"));
+ String caller = user(statement("Allow", "logs:" + action, "*"));
assertSuccess(invoke(caller, action, name), action);
assertTags(name, expectedTags(action));
}
diff --git a/src/test/java/io/floci/aws/services/iam/LogsStreamAuthorizationIntegrationTest.java b/src/test/java/io/floci/aws/services/iam/LogsStreamAuthorizationIntegrationTest.java
index 0b72900aa2c..5b77fad32f7 100644
--- a/src/test/java/io/floci/aws/services/iam/LogsStreamAuthorizationIntegrationTest.java
+++ b/src/test/java/io/floci/aws/services/iam/LogsStreamAuthorizationIntegrationTest.java
@@ -69,49 +69,20 @@ void exactStreamPermissionAllowsOnlyThatStream(String action) {
assertPresent(group, "selected", action.equals("CreateLogStream"));
}
+ /**
+ * A stream carries no resource tags: Floci holds none on a stream, and nothing AWS publishes gives a stream its
+ * group's, so a condition on the group's tags matches no stream call.
+ */
@ParameterizedTest
@ValueSource(strings = {"CreateLogStream", "DeleteLogStream"})
- void groupTagDenyPreventsMutationEvenWithWildcardAllow(String action) {
- String group = group(Map.of("protected", "true"));
- prepare(action, group, "selected");
- String caller = user(policy("Allow", action, "*", "") + ","
- + policy("Deny", action, "*",
- ",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/protected\":\"true\"}}"));
-
- stream(caller, action, group, "selected").statusCode(400)
- .body(containsString("AccessDeniedException"));
- assertPresent(group, "selected", action.equals("DeleteLogStream"));
- if (action.equals("DeleteLogStream")) {
- assertEvent(group, "selected");
- }
- for (Map tags : List.of(Map.of("protected", "false"), Map.of())) {
- String allowed = group(tags);
- prepare(action, allowed, "selected");
- stream(caller, action, allowed, "selected").statusCode(200);
- assertPresent(allowed, "selected", action.equals("CreateLogStream"));
- }
- }
-
- @ParameterizedTest
- @ValueSource(strings = {"CreateLogStream", "DeleteLogStream"})
- void resourceTagAllowReadsTheOwningGroup(String action) {
+ void aStreamCallCarriesNoTagsOfItsGroup(String action) {
String group = group(Map.of("team", "blue"));
- String other = group(Map.of("team", "red"));
- String untagged = group(Map.of());
prepare(action, group, "selected");
- prepare(action, other, "selected");
- prepare(action, untagged, "selected");
String caller = user(policy("Allow", action, "*",
",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/team\":\"blue\"}}"));
-
- stream(caller, action, other, "selected").statusCode(400)
- .body(containsString("AccessDeniedException"));
- assertPresent(other, "selected", action.equals("DeleteLogStream"));
- stream(caller, action, untagged, "selected").statusCode(400)
+ stream(caller, action, group, "selected").statusCode(400)
.body(containsString("AccessDeniedException"));
- assertPresent(untagged, "selected", action.equals("DeleteLogStream"));
- stream(caller, action, group, "selected").statusCode(200);
- assertPresent(group, "selected", action.equals("CreateLogStream"));
+ assertPresent(group, "selected", action.equals("DeleteLogStream"));
}
@ParameterizedTest
@@ -144,36 +115,72 @@ void numericNamesUseTheSameTargetAsTheHandler(String action) {
assertPresent(group, "42", action.equals("DeleteLogStream"));
}
+ /** A group call reads the tags of the group of its name in the request's own account and Region. */
@ParameterizedTest
- @ValueSource(strings = {"CreateLogStream", "DeleteLogStream"})
+ @ValueSource(strings = {"PutRetentionPolicy", "DescribeLogStreams"})
void sameNamedGroupsKeepTheirAccountAndRegionTags(String action) {
- String group = "logs-stream-scope-" + UUID.randomUUID();
+ String group = "logs-group-scope-" + UUID.randomUUID();
String otherAccount = "222222222222";
String otherRegion = "eu-west-1";
createGroup(ACCOUNT, REGION, group, Map.of("team", "blue"));
createGroup(ACCOUNT, otherRegion, group, Map.of("team", "red"));
createGroup(otherAccount, REGION, group, Map.of("team", "red"));
- if (action.equals("DeleteLogStream")) {
- for (String[] scope : List.of(new String[]{ACCOUNT, REGION}, new String[]{ACCOUNT, otherRegion},
- new String[]{otherAccount, REGION})) {
- call(endpoint.getPort(), scope[0], scope[1], "CreateLogStream",
- Map.of("logGroupName", group, "logStreamName", "selected")).statusCode(200);
- }
- }
+ Map body = action.equals("PutRetentionPolicy")
+ ? Map.of("logGroupName", group, "retentionInDays", 7) : Map.of("logGroupName", group);
String statements = policy("Allow", action, "*",
",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/team\":\"blue\"}}");
String caller = user(statements);
String otherCaller = user(otherAccount, statements);
- call(endpoint.getPort(), caller, otherRegion, action,
- Map.of("logGroupName", group, "logStreamName", "selected"))
+ call(endpoint.getPort(), caller, otherRegion, action, body)
.statusCode(400).body(containsString("AccessDeniedException"));
- call(endpoint.getPort(), otherCaller, REGION, action,
- Map.of("logGroupName", group, "logStreamName", "selected"))
+ call(endpoint.getPort(), otherCaller, REGION, action, body)
.statusCode(400).body(containsString("AccessDeniedException"));
- assertPresent(ACCOUNT, otherRegion, group, "selected", action.equals("DeleteLogStream"));
- assertPresent(otherAccount, REGION, group, "selected", action.equals("DeleteLogStream"));
- stream(caller, action, group, "selected").statusCode(200);
- assertPresent(group, "selected", action.equals("CreateLogStream"));
+ call(endpoint.getPort(), caller, REGION, action, body).statusCode(200);
+ }
+
+ /** Writing and reading a stream's events is checked on the stream the request names, as the table reads it. */
+ @ParameterizedTest
+ @ValueSource(strings = {"PutLogEvents", "GetLogEvents"})
+ void aStreamsEventsAreCheckedOnTheStreamTheRequestNames(String action) {
+ String group = group(Map.of());
+ for (String name : List.of("selected", "other")) {
+ stream(ACCOUNT, "CreateLogStream", group, name).statusCode(200);
+ }
+ String caller = user(policy("Allow", action, streamArn(group, "selected"), ""));
+ call(endpoint.getPort(), caller, action, events(action, group, "other"))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ call(endpoint.getPort(), caller, action, events(action, group, "selected")).statusCode(200);
+ }
+
+ /** A call on a log group is checked on the group the request names, as the table reads it, not on {@code *}. */
+ @ParameterizedTest
+ @ValueSource(strings = {"FilterLogEvents", "DescribeLogStreams", "PutMetricFilter", "PutSubscriptionFilter"})
+ void aGroupCallIsCheckedOnTheGroupTheRequestNames(String action) {
+ String group = group(Map.of());
+ String other = group(Map.of());
+ String caller = user(policy("Allow", action,
+ "arn:aws:logs:" + REGION + ":" + ACCOUNT + ":log-group:" + group, ""));
+ call(endpoint.getPort(), caller, action, groupCall(action, other))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ call(endpoint.getPort(), caller, action, groupCall(action, group)).statusCode(200);
+ }
+
+ private static Map events(String action, String group, String stream) {
+ return action.equals("PutLogEvents")
+ ? Map.of("logGroupName", group, "logStreamName", stream, "logEvents",
+ List.of(Map.of("timestamp", System.currentTimeMillis(), "message", "written")))
+ : Map.of("logGroupName", group, "logStreamName", stream);
+ }
+
+ private static Map groupCall(String action, String group) {
+ return switch (action) {
+ case "PutMetricFilter" -> Map.of("logGroupName", group, "filterName", "errors", "filterPattern", "ERROR",
+ "metricTransformations", List.of(Map.of("metricName", "Errors", "metricNamespace", "App",
+ "metricValue", "1")));
+ case "PutSubscriptionFilter" -> Map.of("logGroupName", group, "filterName", "ship", "filterPattern", "",
+ "destinationArn", "arn:aws:lambda:" + REGION + ":" + ACCOUNT + ":function:ship");
+ default -> Map.of("logGroupName", group);
+ };
}
@ParameterizedTest
@@ -198,8 +205,7 @@ void queryCredentialsAuthorizeAndMutateTheSameRegion(String action) {
}
}
String resource = "arn:aws:logs:" + region + ":" + ACCOUNT + ":log-group:" + group + ":log-stream:selected";
- String caller = user(policy("Allow", action, resource,
- ",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/team\":\"blue\"}}"));
+ String caller = user(policy("Allow", action, resource, ""));
given().port(endpoint.getPort()).contentType("application/x-amz-json-1.1")
.queryParam("X-Amz-Algorithm", "AWS4-HMAC-SHA256")
.queryParam("X-Amz-Credential", caller + "/20261015/" + region + "/logs/aws4_request")
@@ -241,8 +247,7 @@ void credentialEdgeCasesKeepTheCanonicalRequestRegion(String action, String mode
}
String resource = "arn:aws:logs:" + selectedRegion + ":" + account
+ ":log-group:" + group + ":log-stream:selected";
- String caller = user(account, policy("Allow", action, resource,
- ",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/team\":\"blue\"}}"));
+ String caller = user(account, policy("Allow", action, resource, ""));
RequestSpecification request = given().port(endpoint.getPort()).contentType("application/x-amz-json-1.1")
.queryParam("X-Amz-Credential", caller + "/20261015/" + remote + "/logs/aws4_request")
.queryParam("X-Amz-Signature", "abc")
@@ -266,8 +271,7 @@ void storageKeyAliasesCannotDeleteAnotherGroupsStream(boolean exactGrant) {
seedHistoricalStream(protectedGroup, "s");
assertPresent(protectedGroup, "s", true);
assertEvent(protectedGroup, "s");
- String caller = user(policy("Allow", "DeleteLogStream", exactGrant ? streamArn(group, "x::s") : "*",
- ",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/team\":\"blue\"}}"));
+ String caller = user(policy("Allow", "DeleteLogStream", exactGrant ? streamArn(group, "x::s") : "*", ""));
Response response = stream(caller, "DeleteLogStream", group, "x::s").extract().response();
assertAll("reject storage alias and retain historical stream and event",
() -> response.then().statusCode(400).body(containsString("InvalidParameterException")),
diff --git a/src/test/java/io/floci/aws/services/iam/LogsUnknownRegionAuthorizationIntegrationTest.java b/src/test/java/io/floci/aws/services/iam/LogsUnknownRegionAuthorizationIntegrationTest.java
index 263c53a4bc8..edfadf9fbc8 100644
--- a/src/test/java/io/floci/aws/services/iam/LogsUnknownRegionAuthorizationIntegrationTest.java
+++ b/src/test/java/io/floci/aws/services/iam/LogsUnknownRegionAuthorizationIntegrationTest.java
@@ -81,9 +81,8 @@ void directTagArnRejectsColonRegionAndAcceptsUnambiguousUnknownRegion(String act
}
@ParameterizedTest
- @CsvSource({"CreateLogStream,false,false", "DeleteLogStream,false,false", "CreateLogStream,true,false",
- "DeleteLogStream,true,false", "DeleteLogStream,false,true"})
- void optedInRegionLabelsCannotAliasHistoricalGroupNames(String action, boolean conditional, boolean streamAlias) {
+ @CsvSource({"CreateLogStream,false", "DeleteLogStream,false", "DeleteLogStream,true"})
+ void optedInRegionLabelsCannotAliasHistoricalGroupNames(String action, boolean streamAlias) {
int port = endpoint.getPort();
String group = "logs-region-alias-" + UUID.randomUUID();
String historical = streamAlias ? group : "x::" + group;
@@ -106,13 +105,12 @@ void optedInRegionLabelsCannotAliasHistoricalGroupNames(String action, boolean c
}
}
assertPresent(port, REGION, historical, historicalStream, delete);
- String condition = conditional ? ",\"Condition\":{\"StringEquals\":{\"aws:ResourceTag/team\":\"blue\"}}" : "";
String resources = "[\"arn:aws:logs:" + aliasRegion + ":" + ACCOUNT + ":log-group:" + group
+ ":log-stream:s\",\"arn:aws:logs:" + validUnknownRegion + ":" + ACCOUNT
+ ":log-group:" + group + ":log-stream:s\"]";
String caller = LogsAuthorizationFixtures.user(cleanup, port, ACCOUNT, "logs-region-alias-", "streams",
"{\"Effect\":\"Allow\",\"Action\":\"logs:" + action
- + "\",\"Resource\":" + resources + condition + "}");
+ + "\",\"Resource\":" + resources + "}");
Response response = call(port, caller, aliasRegion, action,
Map.of("logGroupName", group, "logStreamName", "s"));
assertAll("preserve stored identity across an opted-in region delimiter",
diff --git a/src/test/java/io/floci/aws/services/iam/ResourceArnBuilderTest.java b/src/test/java/io/floci/aws/services/iam/ResourceArnBuilderTest.java
index f83a57dfb8d..2d5c7a76ee5 100644
--- a/src/test/java/io/floci/aws/services/iam/ResourceArnBuilderTest.java
+++ b/src/test/java/io/floci/aws/services/iam/ResourceArnBuilderTest.java
@@ -906,54 +906,66 @@ void resourceGroupTargetsAreTheGroupItsNameOrArnNamesFromTheTable() {
"us-east-1", ACCOUNT, "aws"));
}
+ /** A stream call is checked on the stream its group and stream names name, read raw, in the request's partition. */
@Test
- void logStreamTargetsUseTheServingActionAndRequestPartition() {
- for (String action : List.of("logs:CreateLogStream", "logs:DeleteLogStream")) {
+ void logStreamTargetsAreTheStreamTheRequestNamesFromTheTable() {
+ for (String action : List.of("logs:CreateLogStream", "logs:DeleteLogStream", "logs:PutLogEvents")) {
for (String region : List.of("us-east-1", "cn-north-1", "us-gov-west-1")) {
+ String partition = AwsRegions.partitionFor(region);
setJsonBody("{\"logGroupName\":\" /group \",\"logStreamName\":42}");
- when(ctx.getHeaderString("X-Amz-Target")).thenReturn("Logs_20140328.DeleteLogGroup");
- assertEquals(List.of("arn:" + AwsRegions.partitionFor(region)
- + ":logs:" + region + ":123456789012:log-group: /group :log-stream:42"),
- builder.buildLogResources(action, ctx, region, "123456789012", AwsRegions.partitionFor(region)));
+ assertEquals(List.of("arn:" + partition + ":logs:" + region + ":" + ACCOUNT
+ + ":log-group: /group :log-stream:42"),
+ builder.buildResources("logs", action, ctx, region, ACCOUNT, partition));
}
}
}
+ /**
+ * A group call is checked on the group its name names, as the Service Reference formats a log group, with no
+ * trailing {@code :*}; the evaluator matches a policy naming the group with one for the group's own management
+ * actions ({@code LogGroupArnPolicyCompatibilityTest}).
+ */
@Test
- void logGroupTargetsUseTheServingActionAndRequestPartition() {
+ void logGroupTargetsAreTheGroupTheRequestNamesFromTheTable() {
for (String action : List.of("logs:CreateLogGroup", "logs:DeleteLogGroup", "logs:PutRetentionPolicy",
- "logs:DeleteRetentionPolicy")) {
+ "logs:DeleteRetentionPolicy", "logs:TagLogGroup", "logs:FilterLogEvents", "logs:DescribeLogStreams",
+ "logs:PutMetricFilter", "logs:StartQuery")) {
for (String region : List.of("us-east-1", "cn-north-1", "us-gov-west-1")) {
+ String partition = AwsRegions.partitionFor(region);
setJsonBody("{\"logGroupName\":42}");
- when(ctx.getHeaderString("X-Amz-Target")).thenReturn("Logs_20140328.DeleteLogStream");
- assertEquals(List.of("arn:" + AwsRegions.partitionFor(region)
- + ":logs:" + region + ":123456789012:log-group:42:*"),
- builder.buildLogResources(action, ctx, region, "123456789012", AwsRegions.partitionFor(region)));
+ assertEquals(List.of("arn:" + partition + ":logs:" + region + ":" + ACCOUNT + ":log-group:42"),
+ builder.buildResources("logs", action, ctx, region, ACCOUNT, partition));
}
}
+ // A request naming no group names nothing the table reads.
+ setJsonBody("{}");
+ assertEquals(List.of("*"), builder.buildResources("logs", "logs:FilterLogEvents", ctx, "us-east-1", ACCOUNT,
+ "aws"));
}
+ /** A subscription filter is checked on its group, and on its destination when that is a Logs destination. */
@Test
- void directLogTagTargetsUseBareArnAndServingAction() {
- for (String action : List.of("logs:TagResource", "logs:UntagResource", "logs:ListTagsForResource")) {
- for (String region : List.of("us-east-1", "cn-north-1", "us-gov-west-1", "custom-region-1")) {
- String partition = AwsRegions.partitionFor(region);
- String arn = "arn:" + partition + ":logs:" + region + ":" + ACCOUNT + ":log-group:group";
- setJsonBody("{\"resourceArn\":\"" + arn + "\"}");
- when(ctx.getHeaderString("X-Amz-Target")).thenReturn("Logs_20140328.DeleteLogGroup");
- assertEquals(List.of(arn), builder.buildLogResources(action, ctx, region, ACCOUNT, partition));
- }
- }
+ void subscriptionFilterTargetsAreItsGroupAndALogsDestination() {
+ String prefix = "arn:aws:logs:us-east-1:" + ACCOUNT + ":";
+ setJsonBody("{\"logGroupName\":\"app\",\"destinationArn\":\"arn:aws:lambda:us-east-1:" + ACCOUNT
+ + ":function:ship\"}");
+ assertEquals(List.of(prefix + "log-group:app"),
+ builder.buildResources("logs", "logs:PutSubscriptionFilter", ctx, "us-east-1", ACCOUNT, "aws"));
+ setJsonBody("{\"logGroupName\":\"app\",\"destinationArn\":\"" + prefix + "destination:central\"}");
+ assertEquals(List.of(prefix + "destination:central", prefix + "log-group:app"),
+ builder.buildResources("logs", "logs:PutSubscriptionFilter", ctx, "us-east-1", ACCOUNT, "aws"));
}
@Test
- void destinationTagTargetsUseDestinationArn() {
+ void logTagTargetsAreTheArnTheRequestCarries() {
for (String action : List.of("logs:TagResource", "logs:UntagResource", "logs:ListTagsForResource")) {
- for (String region : List.of("us-east-1", "cn-north-1", "us-gov-west-1")) {
+ for (String region : List.of("us-east-1", "cn-north-1", "us-gov-west-1", "custom-region-1")) {
String partition = AwsRegions.partitionFor(region);
- String arn = "arn:" + partition + ":logs:" + region + ":" + ACCOUNT + ":destination:central";
- setJsonBody("{\"resourceArn\":\"" + arn + "\"}");
- assertEquals(List.of(arn), builder.buildLogResources(action, ctx, region, ACCOUNT, partition));
+ for (String resource : List.of("log-group:group", "destination:central")) {
+ String arn = "arn:" + partition + ":logs:" + region + ":" + ACCOUNT + ":" + resource;
+ setJsonBody("{\"resourceArn\":\"" + arn + "\"}");
+ assertEquals(List.of(arn), builder.buildResources("logs", action, ctx, region, ACCOUNT, partition));
+ }
}
}
}
@@ -963,15 +975,16 @@ void destinationTagTargetsUseDestinationArn() {
void putDestinationTargetsTheDestinationItNames(String partition, String region) {
setJsonBody("{\"destinationName\":\"central\"}");
assertEquals(List.of("arn:" + partition + ":logs:" + region + ":" + ACCOUNT + ":destination:central"),
- builder.buildLogResources("logs:PutDestination", ctx, region, ACCOUNT, partition));
+ builder.buildResources("logs", "logs:PutDestination", ctx, region, ACCOUNT, partition));
String targetArn = "arn:" + partition + ":kinesis:" + region + ":" + ACCOUNT + ":stream/central";
String roleArn = "arn:" + partition + ":iam::" + ACCOUNT + ":role/logs-delivery";
setJsonBody("{\"destinationName\":\"central\",\"targetArn\":\"" + targetArn
+ "\",\"roleArn\":\"" + roleArn + "\"}");
assertEquals(List.of("arn:" + partition + ":logs:" + region + ":" + ACCOUNT + ":destination:central"),
- builder.buildLogResources("logs:PutDestination", ctx, region, ACCOUNT, partition));
+ builder.buildResources("logs", "logs:PutDestination", ctx, region, ACCOUNT, partition));
setJsonBody("{}");
- assertEquals(List.of("*"), builder.buildLogResources("logs:PutDestination", ctx, region, ACCOUNT, partition));
+ assertEquals(List.of("*"),
+ builder.buildResources("logs", "logs:PutDestination", ctx, region, ACCOUNT, partition));
}
@Test
@@ -987,51 +1000,43 @@ void deliveryActionsAreAuthorizedOnTheSourceDestinationOrDeliveryTheyName() {
.thenThrow(new AwsException("ResourceNotFoundException", "Delivery not found", 400));
when(deliveries.destinationArnsFrom("bus-source", "us-east-1"))
.thenReturn(List.of(prefix + "delivery-destination:bus-logs"));
- ResourceArnBuilder builder = reading(new CloudWatchLogsStoredResourceArns(deliveries));
+ ResourceArnBuilder builder = reading(new CloudWatchLogsStoredResourceArns(null, null, deliveries, null));
for (String action : List.of("logs:PutDeliverySource", "logs:GetDeliverySource")) {
setJsonBody("{\"name\":\"bus-source\"}");
assertEquals(List.of(prefix + "delivery-source:bus-source"),
- builder.buildLogResources(action, ctx, "us-east-1", ACCOUNT, "aws"));
+ builder.buildResources("logs", action, ctx, "us-east-1", ACCOUNT, "aws"));
}
setJsonBody("{\"name\":\"bus-source\"}");
assertEquals(List.of(prefix + "delivery-destination:bus-logs"),
- builder.buildLogResources("logs:DeleteDeliverySource", ctx, "us-east-1", ACCOUNT, "aws"));
+ builder.buildResources("logs", "logs:DeleteDeliverySource", ctx, "us-east-1", ACCOUNT, "aws"));
// A source with no deliveries reaches no destination, so the request names none of its resource type.
setJsonBody("{\"name\":\"idle-source\"}");
- assertEquals(List.of("*"), builder.buildLogResources("logs:DeleteDeliverySource", ctx, "us-east-1", ACCOUNT,
- "aws"));
+ assertEquals(List.of("*"),
+ builder.buildResources("logs", "logs:DeleteDeliverySource", ctx, "us-east-1", ACCOUNT, "aws"));
for (String action : List.of("logs:PutDeliveryDestination", "logs:GetDeliveryDestination",
"logs:DeleteDeliveryDestination")) {
setJsonBody("{\"name\":\"bus-logs\"}");
assertEquals(List.of(prefix + "delivery-destination:bus-logs"),
- builder.buildLogResources(action, ctx, "us-east-1", ACCOUNT, "aws"));
+ builder.buildResources("logs", action, ctx, "us-east-1", ACCOUNT, "aws"));
}
for (String action : List.of("logs:GetDelivery", "logs:DeleteDelivery", "logs:UpdateDeliveryConfiguration")) {
setJsonBody("{\"id\":\"AbCdEfGh12345678\"}");
assertEquals(List.of(prefix + "delivery:AbCdEfGh12345678"),
- builder.buildLogResources(action, ctx, "us-east-1", ACCOUNT, "aws"));
+ builder.buildResources("logs", action, ctx, "us-east-1", ACCOUNT, "aws"));
// One it holds none of has its id open.
setJsonBody("{\"id\":\"gone\"}");
assertEquals(List.of(prefix + "delivery:*"),
- builder.buildLogResources(action, ctx, "us-east-1", ACCOUNT, "aws"));
+ builder.buildResources("logs", action, ctx, "us-east-1", ACCOUNT, "aws"));
}
setJsonBody("{\"deliverySourceName\":\"bus-source\",\"deliveryDestinationArn\":\""
+ prefix + "delivery-destination:bus-logs\"}");
assertEquals(List.of(prefix + "delivery-destination:bus-logs", prefix + "delivery:*",
prefix + "delivery-source:bus-source"),
- builder.buildLogResources("logs:CreateDelivery", ctx, "us-east-1", ACCOUNT, "aws"));
+ builder.buildResources("logs", "logs:CreateDelivery", ctx, "us-east-1", ACCOUNT, "aws"));
for (String action : List.of("logs:DescribeDeliverySources", "logs:DescribeDeliveryDestinations",
"logs:DescribeDeliveries")) {
setJsonBody("{}");
- assertEquals(List.of("*"), builder.buildLogResources(action, ctx, "us-east-1", ACCOUNT, "aws"));
- }
- }
-
- @Test
- void excludedLogsActionsKeepWildcardResources() {
- for (String action : List.of("logs:PutLogEvents")) {
- setJsonBody("{\"logGroupName\":\"group\",\"logStreamName\":\"stream\"}");
- assertEquals(List.of("*"), builder.buildLogResources(action, ctx, "us-east-1", ACCOUNT, "aws"));
+ assertEquals(List.of("*"), builder.buildResources("logs", action, ctx, "us-east-1", ACCOUNT, "aws"));
}
}
diff --git a/tools/aws/regen_iam_request_resources.py b/tools/aws/regen_iam_request_resources.py
index ac272dd4185..d097252e57c 100644
--- a/tools/aws/regen_iam_request_resources.py
+++ b/tools/aws/regen_iam_request_resources.py
@@ -96,10 +96,8 @@
the reference lists one client's operations per namespace, and
OpenSearch Service's are the `es` client's alone, while the `opensearch` client's are named after `es` actions.
-Every operation in `NAMESPACES` is read, whether Floci serves it or not. In a namespace in `HAND_BUILT`, whose
-other operations keep their existing resource builders, so are the operations `READ_IN_HAND_BUILT` lists, which
-follow the rule unchanged: a family of a hand-built namespace whose requests name their resources the
-way the rule reads them. `HAND_BUILT` are the namespaces `ResourceArnBuilder` builds resources for itself, and
+Every operation in `NAMESPACES` is read, whether Floci serves it or not. `HAND_BUILT` are the namespaces
+`ResourceArnBuilder` builds resources for itself, whose operations are read only where `MEASURED` gives them, and
`NOT_COVERED` the ones Floci serves that are not read yet, each with its reason;
`RequestResourceNamespacesIntegrationTest` fails for a served namespace in none of the three.
`ID_TARGETS` is Floci's coverage of id-list namespaces, the types of each it reads by id (EC2's instances and
@@ -298,24 +296,10 @@
"rekognition", "resource-explorer-2", "route53", "s3tables", "s3vectors", "servicediscovery",
"servicequotas", "ssm", "sso", "states", "textract", "timestream-influxdb", "translate", "signer", "xray",
"securityhub", "guardduty", "secretsmanager", "scheduler", "lambda", "cloudformation", "glue",
- "sqs", "sns", "kinesis", "pipes", "dsql", "sts", "eks", "resource-groups")
+ "sqs", "sns", "kinesis", "pipes", "dsql", "sts", "eks", "resource-groups", "logs")
# The namespaces whose resources ResourceArnBuilder builds itself.
-HAND_BUILT = ("apigateway", "bedrock", "dynamodb", "iam", "kms", "logs", "s3")
-
-# Operations of a namespace in `HAND_BUILT` read from the reference all the same, each with its reason.
-_LOGS_DELIVERY = ("CloudWatch Logs vended-log delivery: its requests name a delivery source, destination or delivery "
- "by the member the rule reads, while ResourceArnBuilder keeps building the log group and stream ARNs")
-READ_IN_HAND_BUILT: dict[str, str] = {
- f"logs:{operation}": _LOGS_DELIVERY
- for operation in ("PutDeliverySource", "GetDeliverySource", "DeleteDeliverySource", "DescribeDeliverySources",
- "PutDeliveryDestination", "GetDeliveryDestination", "DeleteDeliveryDestination",
- "DescribeDeliveryDestinations", "CreateDelivery", "GetDelivery", "UpdateDeliveryConfiguration",
- "DeleteDelivery", "DescribeDeliveries")
-}
-READ_IN_HAND_BUILT["logs:PutDestination"] = (
- "CloudWatch Logs destination creation names the destination by destinationName, which ResourceArnBuilder "
- "reads from the generated request-resource table")
+HAND_BUILT = ("apigateway", "bedrock", "dynamodb", "iam", "kms", "s3")
# ---------------------------------------------------------------------------------------------------------------------
# MEASURED: what AWS was measured to check where neither botocore nor the Service Reference says it.
@@ -3471,24 +3455,15 @@ def _with_resource_types(documents: list[dict]) -> set[str]:
def reads(operation: str) -> bool:
- """Read whole namespaces, and in a namespace otherwise built by hand the operations `READ_IN_HAND_BUILT` lists
- and those `MEASURED` gives."""
+ """Read whole namespaces, and in a namespace otherwise built by hand the operations `MEASURED` gives."""
namespace = namespace_of(operation)
- return namespace in NAMESPACES or namespace in HAND_BUILT and (operation in READ_IN_HAND_BUILT
- or operation in MEASURED)
+ return namespace in NAMESPACES or namespace in HAND_BUILT and operation in MEASURED
def _check_overrides(covered: dict[str, dict]) -> None:
- """Every operation `READ_IN_HAND_BUILT` lists or `MEASURED` gives is one the file reads, and no namespace is in
- two places."""
- stale = [f"READ_IN_HAND_BUILT names {operation}, which the reference does not give" for operation in READ_IN_HAND_BUILT
- if operation not in covered]
- stale += [f"MEASURED gives {operation}, which the file does not read" for operation in MEASURED
- if operation not in covered]
- stale += [f"MEASURED gives {operation}, which READ_IN_HAND_BUILT reads by the rules" for operation in MEASURED
- if operation in READ_IN_HAND_BUILT]
- stale += [f"READ_IN_HAND_BUILT names {operation}, outside HAND_BUILT" for operation in READ_IN_HAND_BUILT
- if namespace_of(operation) not in HAND_BUILT]
+ """Every operation `MEASURED` gives is one the file reads, and no namespace is in two places."""
+ stale = [f"MEASURED gives {operation}, which the file does not read" for operation in MEASURED
+ if operation not in covered]
for left, right in (("NAMESPACES", "HAND_BUILT"), ("NAMESPACES", "NOT_COVERED"), ("HAND_BUILT", "NOT_COVERED")):
stale += [f"{namespace} is in both {left} and {right}"
for namespace in sorted(set(globals()[left]) & set(globals()[right]))]
@@ -3952,8 +3927,7 @@ def verify_against(vendored: dict, upstream: dict[str, dict], formats: dict[str,
untrue.append(f"AWS no longer gives {namespace}'s {', '.join(changed)} the ARN format the file does")
added = sorted(operation for operation in upstream
if namespace_of(operation) in vendored["namespaces"]
- and (namespace_of(operation) not in vendored["handBuilt"] or operation in READ_IN_HAND_BUILT
- or operation in MEASURED)
+ and (namespace_of(operation) not in vendored["handBuilt"] or operation in MEASURED)
and operation not in vendored["operations"])
return untrue, added
diff --git a/tools/aws/test_regen_iam_request_resources.py b/tools/aws/test_regen_iam_request_resources.py
index 310aac54878..c10dd981aa9 100644
--- a/tools/aws/test_regen_iam_request_resources.py
+++ b/tools/aws/test_regen_iam_request_resources.py
@@ -370,7 +370,6 @@ def isolated(monkeypatch):
monkeypatch.setattr(r, "NAMESPACES", ("svc",))
monkeypatch.setattr(r, "HAND_BUILT", ("hand",))
monkeypatch.setattr(r, "NOT_COVERED", {"later": "a later batch"})
- monkeypatch.setattr(r, "READ_IN_HAND_BUILT", {})
monkeypatch.setattr(r, "MEASURED", {})
monkeypatch.setattr(r, "STATEMENT_SOURCES", {})
return monkeypatch
@@ -1141,28 +1140,6 @@ def test_the_vendored_file_is_well_formed():
"type": "loadbalancer/app/", "fill": {"LoadBalancerName": "Name"}, "when": {"Type": ["application", None]}}
-def test_hand_built_operations_listed_to_read_follow_the_rule(isolated, tmp_path):
- isolated.setattr(r, "READ_IN_HAND_BUILT", {"hand:GetThing": "a family the rule reads"})
- documents = DOCUMENTS + [reference("hand", {"GetThing": ["thing"], "PutThing": ["thing"]},
- {"thing": "arn:${Partition}:hand:${Region}:${Account}:thing/${ThingName}"})]
- hand = model({"GetThing": {"ThingName": "String"}, "PutThing": {"ThingName": "String"}})
- hand["metadata"]["endpointPrefix"] = "hand"
- write_models(tmp_path, {"svc": model({"GetThing": {"ThingName": "String"}, "ListThings": {}}), "hand": hand})
- document = r.build(documents, "test", tmp_path, "botocore test")
- assert document["operations"]["hand:GetThing"] == {
- "action": "hand:GetThing", "types": ["thing"], "resources": [{"type": "thing", "fill": {"ThingName": "ThingName"}}]}
- assert "hand:PutThing" not in document["operations"]
- assert r.reads("hand:GetThing") and not r.reads("hand:PutThing")
- assert r.validate(document) == []
-
-
-def test_operations_listed_to_read_must_exist_and_be_hand_built(isolated, tmp_path):
- write_models(tmp_path, {"svc": model({"GetThing": {"ThingName": "String"}, "ListThings": {}})})
- isolated.setattr(r, "READ_IN_HAND_BUILT", {"hand:Gone": "no longer there"})
- with pytest.raises(ValueError, match="READ_IN_HAND_BUILT names hand:Gone, which the reference does not give"):
- r.build(DOCUMENTS, "test", tmp_path, "botocore test")
-
-
MEASURED_FORMATS = {"thing": "arn:${Partition}:hand:${Region}:${Account}:thing/${ThingName}"}
PROBED = "real AWS probes in https://example.com/probes accept an allow and enforce a deny on thing/*"