iamdata 0.1.202505111__py3-none-any.whl → 0.1.202511181__py3-none-any.whl

iamdata/data/resourceTypes/athena.json

@@ -19,5 +19,12 @@
     "conditionKeys": [
       "aws:ResourceTag/${TagKey}"
     ]
+  },
+  "session": {
+    "key": "session",
+    "arn": "arn:${Partition}:athena:${Region}:${Account}:workgroup/${WorkGroupName}/session/${SessionId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   }
 }

iamdata/data/resourceTypes/auditmanager.json

@@ -1,11 +1,17 @@
 {
   "assessment": {
     "key": "assessment",
-    "arn": "arn:${Partition}:auditmanager:${Region}:${Account}:assessment/${AssessmentId}"
+    "arn": "arn:${Partition}:auditmanager:${Region}:${Account}:assessment/${AssessmentId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "assessmentframework": {
     "key": "assessmentFramework",
-    "arn": "arn:${Partition}:auditmanager:${Region}:${Account}:assessmentFramework/${AssessmentFrameworkId}"
+    "arn": "arn:${Partition}:auditmanager:${Region}:${Account}:assessmentFramework/${AssessmentFrameworkId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "assessmentcontrolset": {
     "key": "assessmentControlSet",

iamdata/data/resourceTypes/batch.json

@@ -38,6 +38,20 @@
       "aws:ResourceTag/${TagKey}"
     ]
   },
+  "service-environment": {
+    "key": "service-environment",
+    "arn": "arn:${Partition}:batch:${Region}:${Account}:service-environment/${ServiceEnvironmentName}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "service-job": {
+    "key": "service-job",
+    "arn": "arn:${Partition}:batch:${Region}:${Account}:service-job/${JobId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
   "consumable-resource": {
     "key": "consumable-resource",
     "arn": "arn:${Partition}:batch:${Region}:${Account}:consumable-resource/${ConsumableResourceName}",

iamdata/data/resourceTypes/bcm-dashboards.json

@@ -0,0 +1 @@
+{}

iamdata/data/resourceTypes/bcm-recommended-actions.json

@@ -0,0 +1 @@
+{}

iamdata/data/resourceTypes/bedrock-agentcore.json

@@ -0,0 +1,87 @@
+{
+  "memory": {
+    "key": "memory",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:memory/${MemoryId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "gateway": {
+    "key": "gateway",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:gateway/${GatewayId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "workload-identity": {
+    "key": "workload-identity",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:workload-identity-directory/${DirectoryId}/workload-identity/${WorkloadIdentityName}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "oauth2credentialprovider": {
+    "key": "oauth2credentialprovider",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:token-vault/${TokenVaultId}/oauth2credentialprovider/${Name}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "apikeycredentialprovider": {
+    "key": "apikeycredentialprovider",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:token-vault/${TokenVaultId}/apikeycredentialprovider/${Name}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "runtime": {
+    "key": "runtime",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:runtime/${RuntimeId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "runtime-endpoint": {
+    "key": "runtime-endpoint",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:runtime/${RuntimeId}/runtime-endpoint/${Name}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "code-interpreter-custom": {
+    "key": "code-interpreter-custom",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:code-interpreter-custom/${CodeInterpreterId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "code-interpreter": {
+    "key": "code-interpreter",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:aws:code-interpreter/${CodeInterpreterId}"
+  },
+  "browser-custom": {
+    "key": "browser-custom",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:browser-custom/${BrowserId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "browser": {
+    "key": "browser",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:aws:browser/${BrowserId}"
+  },
+  "workload-identity-directory": {
+    "key": "workload-identity-directory",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:workload-identity-directory/${DirectoryId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "token-vault": {
+    "key": "token-vault",
+    "arn": "arn:${Partition}:bedrock-agentcore:${Region}:${Account}:token-vault/${TokenVaultId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  }
+}

iamdata/data/resourceTypes/bedrock.json

@@ -3,6 +3,10 @@
     "key": "foundation-model",
     "arn": "arn:${Partition}:bedrock:${Region}::foundation-model/${ResourceId}"
   },
+  "system-tool": {
+    "key": "system-tool",
+    "arn": "arn:${Partition}:bedrock::${Account}:system-tool/${ResourceId}"
+  },
   "async-invoke": {
     "key": "async-invoke",
     "arn": "arn:${Partition}:bedrock:${Region}:${Account}:async-invoke/${ResourceId}",
@@ -99,6 +103,24 @@
       "aws:ResourceTag/${TagKey}"
     ]
   },
+  "guardrail-profile": {
+    "key": "guardrail-profile",
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:guardrail-profile/${ResourceId}"
+  },
+  "automated-reasoning-policy": {
+    "key": "automated-reasoning-policy",
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:automated-reasoning-policy/${AutomatedReasoningPolicyId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "automated-reasoning-policy-version": {
+    "key": "automated-reasoning-policy-version",
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:automated-reasoning-policy/${AutomatedReasoningPolicyId}:${AutomatedReasoningPolicyVersion}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
   "flow": {
     "key": "flow",
     "arn": "arn:${Partition}:bedrock:${Region}:${Account}:flow/${FlowId}",
@@ -113,6 +135,10 @@
       "aws:ResourceTag/${TagKey}"
     ]
   },
+  "flow-execution": {
+    "key": "flow-execution",
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:flow/${FlowId}/alias/${FlowAliasId}/execution/${FlowExecutionId}"
+  },
   "model-copy-job": {
     "key": "model-copy-job",
     "arn": "arn:${Partition}:bedrock:${Region}:${Account}:model-copy-job/${ResourceId}",
@@ -154,15 +180,24 @@
   },
   "data-automation-project": {
     "key": "data-automation-project",
-    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:data-automation-project/${ProjectId}"
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:data-automation-project/${ProjectId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "blueprint": {
     "key": "blueprint",
-    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:blueprint/${BlueprintId}"
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:blueprint/${BlueprintId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "data-automation-invocation-job": {
     "key": "data-automation-invocation-job",
-    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:data-automation-invocation/${JobId}"
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:data-automation-invocation/${JobId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "data-automation-profile": {
     "key": "data-automation-profile",
@@ -174,5 +209,12 @@
     "conditionKeys": [
       "aws:ResourceTag/${TagKey}"
     ]
+  },
+  "custom-model-deployment": {
+    "key": "custom-model-deployment",
+    "arn": "arn:${Partition}:bedrock:${Region}:${Account}:custom-model/${ResourceId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   }
 }

iamdata/data/resourceTypes/cassandra.json

@@ -12,5 +12,12 @@
     "conditionKeys": [
       "aws:ResourceTag/${TagKey}"
     ]
+  },
+  "stream": {
+    "key": "stream",
+    "arn": "arn:${Partition}:cassandra:${Region}:${Account}:/keyspace/${KeyspaceName}/table/${TableName}/stream/${StreamLabel}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   }
 }

iamdata/data/resourceTypes/chatbot.json

@@ -1,10 +1,16 @@
 {
   "chatbotconfiguration": {
     "key": "ChatbotConfiguration",
-    "arn": "arn:${Partition}:chatbot::${Account}:chat-configuration/${ConfigurationType}/${ChatbotConfigurationName}"
+    "arn": "arn:${Partition}:chatbot::${Account}:chat-configuration/${ConfigurationType}/${ChatbotConfigurationName}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "custom-action": {
     "key": "custom-action",
-    "arn": "arn:${Partition}:chatbot::${Account}:custom-action/${ActionName}"
+    "arn": "arn:${Partition}:chatbot::${Account}:custom-action/${ActionName}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   }
 }

iamdata/data/resourceTypes/cloudformation.json

@@ -28,6 +28,10 @@
     "key": "type",
     "arn": "arn:${Partition}:cloudformation:${Region}:${Account}:type/resource/${Type}"
   },
+  "typehook": {
+    "key": "typeHook",
+    "arn": "arn:${Partition}:cloudformation:${Region}:${Account}:type/hook/${Type}"
+  },
   "generatedtemplate": {
     "key": "generatedtemplate",
     "arn": "arn:${Partition}:cloudformation:${Region}:${Account}:generatedTemplate/${Id}"

iamdata/data/resourceTypes/dataexchange.json

@@ -38,7 +38,10 @@
   },
   "event-actions": {
     "key": "event-actions",
-    "arn": "arn:${Partition}:dataexchange:${Region}:${Account}:event-actions/${EventActionId}"
+    "arn": "arn:${Partition}:dataexchange:${Region}:${Account}:event-actions/${EventActionId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "data-grants": {
     "key": "data-grants",

iamdata/data/resourceTypes/deadline.json

@@ -45,7 +45,10 @@
   },
   "monitor": {
     "key": "monitor",
-    "arn": "arn:${Partition}:deadline:${Region}:${Account}:monitor/${MonitorId}"
+    "arn": "arn:${Partition}:deadline:${Region}:${Account}:monitor/${MonitorId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "queue": {
     "key": "queue",

iamdata/data/resourceTypes/ec2.json

@@ -15,6 +15,32 @@
       "ec2:ResourceTag/${TagKey}"
     ]
   },
+  "capacity-block": {
+    "key": "capacity-block",
+    "arn": "arn:${Partition}:ec2:${Region}:${Account}:capacity-block/${CapacityBlockId}",
+    "conditionKeys": [
+      "aws:RequestTag/${TagKey}",
+      "aws:ResourceTag/${TagKey}",
+      "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
+      "ec2:Region",
+      "ec2:ResourceTag/${TagKey}"
+    ]
+  },
+  "capacity-manager-data-export": {
+    "key": "capacity-manager-data-export",
+    "arn": "arn:${Partition}:ec2:${Region}:${Account}:capacity-manager-data-export/${CapacityManagerDataExportId}",
+    "conditionKeys": [
+      "aws:RequestTag/${TagKey}",
+      "aws:ResourceTag/${TagKey}",
+      "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
+      "ec2:Region",
+      "ec2:ResourceTag/${TagKey}"
+    ]
+  },
   "capacity-reservation-fleet": {
     "key": "capacity-reservation-fleet",
     "arn": "arn:${Partition}:ec2:${Region}:${Account}:capacity-reservation-fleet/${CapacityReservationFleetId}",
@@ -260,6 +286,17 @@
       "ec2:RootDeviceType"
     ]
   },
+  "image-usage-report": {
+    "key": "image-usage-report",
+    "arn": "arn:${Partition}:ec2:${Region}:${Account}:image-usage-report/${ImageUsageReportId}",
+    "conditionKeys": [
+      "aws:RequestTag/${TagKey}",
+      "aws:ResourceTag/${TagKey}",
+      "aws:TagKeys",
+      "ec2:Region",
+      "ec2:ResourceTag/${TagKey}"
+    ]
+  },
   "import-image-task": {
     "key": "import-image-task",
     "arn": "arn:${Partition}:ec2:${Region}:${Account}:import-image-task/${ImportImageTaskId}",
@@ -303,6 +340,8 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -317,6 +356,7 @@
       "ec2:Attribute",
       "ec2:Attribute/${AttributeName}",
       "ec2:AvailabilityZone",
+      "ec2:AvailabilityZoneId",
       "ec2:CpuOptionsAmdSevSnp",
       "ec2:EbsOptimized",
       "ec2:InstanceAutoRecovery",
@@ -410,6 +450,8 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -535,6 +577,7 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -561,6 +604,17 @@
       "ec2:ResourceTag/${TagKey}"
     ]
   },
+  "mac-modification-task": {
+    "key": "mac-modification-task",
+    "arn": "arn:${Partition}:ec2:${Region}:${Account}:mac-modification-task/${MacModificationTaskId}",
+    "conditionKeys": [
+      "aws:RequestTag/${TagKey}",
+      "aws:ResourceTag/${TagKey}",
+      "aws:TagKeys",
+      "ec2:Region",
+      "ec2:ResourceTag/${TagKey}"
+    ]
+  },
   "natgateway": {
     "key": "natgateway",
     "arn": "arn:${Partition}:ec2:${Region}:${Account}:natgateway/${NatGatewayId}",
@@ -653,6 +707,17 @@
       "ec2:Vpc"
     ]
   },
+  "outpost-lag": {
+    "key": "outpost-lag",
+    "arn": "arn:${Partition}:ec2:${Region}:${Account}:outpost-lag/${OutpostLagId}",
+    "conditionKeys": [
+      "aws:RequestTag/${TagKey}",
+      "aws:ResourceTag/${TagKey}",
+      "aws:TagKeys",
+      "ec2:Region",
+      "ec2:ResourceTag/${TagKey}"
+    ]
+  },
   "placement-group": {
     "key": "placement-group",
     "arn": "arn:${Partition}:ec2:${Region}:${Account}:placement-group/${PlacementGroupName}",
@@ -772,8 +837,6 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
-      "ec2:Attribute",
-      "ec2:Attribute/${AttributeName}",
       "ec2:IsLaunchTemplateResource",
       "ec2:LaunchTemplate",
       "ec2:Region",
@@ -811,7 +874,9 @@
       "ec2:Location",
       "ec2:OutpostArn",
       "ec2:Owner",
+      "ec2:ParentSnapshot",
       "ec2:ParentVolume",
+      "ec2:ProductCode",
       "ec2:Region",
       "ec2:Remove/group",
       "ec2:Remove/userId",
@@ -870,6 +935,9 @@
       "ec2:Attribute",
       "ec2:Attribute/${AttributeName}",
       "ec2:AvailabilityZone",
+      "ec2:AvailabilityZoneId",
+      "ec2:Ipv4IpamPoolId",
+      "ec2:Ipv6IpamPoolId",
       "ec2:IsLaunchTemplateResource",
       "ec2:LaunchTemplate",
       "ec2:Region",
@@ -1025,6 +1093,7 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -1047,6 +1116,8 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -1058,6 +1129,8 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -1080,6 +1153,8 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -1094,15 +1169,18 @@
       "ec2:Attribute",
       "ec2:Attribute/${AttributeName}",
       "ec2:AvailabilityZone",
+      "ec2:AvailabilityZoneId",
       "ec2:Encrypted",
       "ec2:IsLaunchTemplateResource",
       "ec2:KmsKeyId",
       "ec2:LaunchTemplate",
       "ec2:ManagedResourceOperator",
       "ec2:ParentSnapshot",
+      "ec2:ParentVolume",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}",
       "ec2:VolumeID",
+      "ec2:VolumeInitializationRate",
       "ec2:VolumeIops",
       "ec2:VolumeSize",
       "ec2:VolumeThroughput",
@@ -1116,6 +1194,8 @@
       "aws:RequestTag/${TagKey}",
       "aws:ResourceTag/${TagKey}",
       "aws:TagKeys",
+      "ec2:Attribute",
+      "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}"
     ]
@@ -1142,8 +1222,10 @@
       "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}",
+      "ec2:VpceMultiRegion",
       "ec2:VpceServiceName",
-      "ec2:VpceServiceOwner"
+      "ec2:VpceServiceOwner",
+      "ec2:VpceServiceRegion"
     ]
   },
   "vpc-endpoint-service": {
@@ -1157,10 +1239,10 @@
       "ec2:Attribute/${AttributeName}",
       "ec2:Region",
       "ec2:ResourceTag/${TagKey}",
+      "ec2:VpceMultiRegion",
       "ec2:VpceServicePrivateDnsName",
-      "ec2:vpceMultiRegion",
-      "ec2:vpceServiceRegion",
-      "ec2:vpceSupportedRegion"
+      "ec2:VpceServiceRegion",
+      "ec2:VpceSupportedRegion"
     ]
   },
   "vpc-endpoint-service-permission": {

iamdata/data/resourceTypes/eks-mcp.json

@@ -0,0 +1 @@
+{}

iamdata/data/resourceTypes/eks.json

@@ -63,5 +63,12 @@
   "access-policy": {
     "key": "access-policy",
     "arn": "arn:${Partition}:eks::aws:cluster-access-policy/${AccessPolicyName}"
+  },
+  "dashboard": {
+    "key": "dashboard",
+    "arn": "arn:${Partition}:eks:${Region}:${Account}:dashboard/${DashboardName}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   }
 }

iamdata/data/resourceTypes/emr-containers.json

@@ -33,9 +33,5 @@
     "conditionKeys": [
       "aws:ResourceTag/${TagKey}"
     ]
-  },
-  "certificate": {
-    "key": "certificate",
-    "arn": "arn:${Partition}:emr-containers:${Region}:${Account}:/certificates/${CertificateId}"
   }
 }

iamdata/data/resourceTypes/events.json

@@ -59,5 +59,13 @@
   "terminate-instance": {
     "key": "terminate-instance",
     "arn": "arn:${Partition}:events:${Region}:${Account}:target/terminate-instance"
+  },
+  "alias": {
+    "key": "alias",
+    "arn": "arn:${Partition}:kms:${Region}:${Account}:alias/${Alias}"
+  },
+  "key": {
+    "key": "key",
+    "arn": "arn:${Partition}:kms:${Region}:${Account}:key/${KeyId}"
   }
 }

iamdata/data/resourceTypes/evs.json

@@ -0,0 +1,9 @@
+{
+  "environment": {
+    "key": "environment",
+    "arn": "arn:${Partition}:evs:${Region}:${Account}:environment/${EnvironmentIdentifier}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  }
+}

iamdata/data/resourceTypes/guardduty.json

@@ -27,9 +27,26 @@
       "aws:ResourceTag/${TagKey}"
     ]
   },
+  "trustedentityset": {
+    "key": "trustedentityset",
+    "arn": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/trustedentityset/${TrustedEntitySetId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
+  "threatentityset": {
+    "key": "threatentityset",
+    "arn": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/threatentityset/${ThreatEntitySetId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
+  },
   "publishingdestination": {
     "key": "publishingDestination",
-    "arn": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/publishingDestination/${PublishingDestinationId}"
+    "arn": "arn:${Partition}:guardduty:${Region}:${Account}:detector/${DetectorId}/publishingdestination/${PublishingDestinationId}",
+    "conditionKeys": [
+      "aws:ResourceTag/${TagKey}"
+    ]
   },
   "malwareprotectionplan": {
     "key": "malwareprotectionplan",