@awsless/awsless 0.0.153 → 0.0.155

package/dist/bin.js

@@ -138,19 +138,25 @@ var formatName = (name) => {
   return paramCase2(name);
 };
 var formatArn = (props) => {
+  const regionPart = props.includeRegion === false ? "" : "${AWS::Region}";
+  const globalPart = "arn:${AWS::Partition}:${service}:" + regionPart + ":${AWS::AccountId}";
   if (!props.resource) {
-    return sub("arn:${AWS::Partition}:${service}:${AWS::Region}:${AWS::AccountId}", props);
+    return sub(globalPart, {
+      service: props.service
+    });
   }
   if (!props.resourceName) {
-    return sub("arn:${AWS::Partition}:${service}:${AWS::Region}:${AWS::AccountId}:${resource}", props);
+    return sub(globalPart + ":${resource}", {
+      service: props.service,
+      resource: props.resource
+    });
   }
-  return sub(
-    "arn:${AWS::Partition}:${service}:${AWS::Region}:${AWS::AccountId}:${resource}${seperator}${resourceName}",
-    {
-      seperator: "/",
-      ...props
-    }
-  );
+  return sub(globalPart + ":${resource}${seperator}${resourceName}", {
+    service: props.service,
+    resource: props.resource,
+    seperator: props.seperator ?? "/",
+    resourceName: props.resourceName
+  });
 };
 
 // src/formation/resource.ts
@@ -243,7 +249,7 @@ var LogGroup = class extends Resource {
     this.props = props;
   }
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   properties() {
     return {
@@ -292,7 +298,7 @@ var Role = class extends Resource {
   inlinePolicies = /* @__PURE__ */ new Set();
   managedPolicies = /* @__PURE__ */ new Set();
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   addManagedPolicy(...policies) {
     for (const policy of policies) {
@@ -337,10 +343,10 @@ var Rule = class extends Resource {
   }
   name;
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   properties() {
     return {
@@ -410,7 +416,7 @@ var Url = class extends Resource {
     this.props = props;
   }
   get url() {
-    return getAtt(this.logicalId, "FunctionUrl");
+    return this.getAtt("FunctionUrl");
   }
   properties() {
     return {
@@ -982,7 +988,7 @@ var rollupBundle = ({
       },
       plugins: [
         // @ts-ignore
-        commonjs({ sourceMap: true }),
+        commonjs({ sourceMap: true, ignoreDynamicRequires: true }),
         // @ts-ignore
         nodeResolve({ preferBuiltins: true }),
         swc({
@@ -1479,7 +1485,7 @@ var UserPoolClient = class extends Resource {
   }
   name;
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   formatAuthFlows() {
     const authFlows = [];
@@ -1559,10 +1565,10 @@ var UserPoolDomain = class extends Resource {
     this.props = props;
   }
   get domain() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get cloudFrontDistribution() {
-    return getAtt(this.logicalId, "CloudFrontDistribution");
+    return this.getAtt("CloudFrontDistribution");
   }
   properties() {
     return {
@@ -1581,16 +1587,16 @@ var UserPool = class extends Resource {
   }
   name;
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   get providerName() {
-    return getAtt(this.logicalId, "ProviderName");
+    return this.getAtt("ProviderName");
   }
   get providerUrl() {
-    return getAtt(this.logicalId, "ProviderURL");
+    return this.getAtt("ProviderURL");
   }
   addDomain(props) {
     const domain = new UserPoolDomain(this.logicalId, {
@@ -1725,7 +1731,7 @@ var CustomResource = class extends Resource {
     this.props = props;
   }
   getAtt(name) {
-    return getAtt(this.logicalId, name);
+    return super.getAtt(name);
   }
   properties() {
     return {
@@ -1938,7 +1944,7 @@ var SecurityGroup = class extends Resource {
   ingress = [];
   egress = [];
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   addIngressRule(peer, port, description) {
     this.ingress.push({
@@ -1984,7 +1990,7 @@ var SubnetGroup = class extends Resource {
   }
   name;
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   properties() {
     return {
@@ -2306,7 +2312,7 @@ var HostedZone = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -2322,7 +2328,7 @@ var Certificate = class extends Resource {
     this.props = props;
   }
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -2658,16 +2664,16 @@ var GraphQLApi = class extends Resource {
   name;
   defaultAuthorization;
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get id() {
-    return getAtt(this.logicalId, "ApiId");
+    return this.getAtt("ApiId");
   }
   get url() {
-    return getAtt(this.logicalId, "GraphQLUrl");
+    return this.getAtt("GraphQLUrl");
   }
   get dns() {
-    return getAtt(this.logicalId, "GraphQLDns");
+    return this.getAtt("GraphQLDns");
   }
   setDefaultAuthorization(auth) {
     this.defaultAuthorization = auth;
@@ -2946,7 +2952,7 @@ var DataSource = class _DataSource extends Resource {
   }
   name;
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -2973,10 +2979,10 @@ var FunctionConfiguration = class extends Resource {
   }
   name;
   get id() {
-    return getAtt(this.logicalId, "FunctionId");
+    return this.getAtt("FunctionId");
   }
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -3057,13 +3063,13 @@ var DomainName = class extends Resource {
     this.props = props;
   }
   get appSyncDomainName() {
-    return getAtt(this.logicalId, "AppSyncDomainName");
+    return this.getAtt("AppSyncDomainName");
   }
   get domainName() {
-    return getAtt(this.logicalId, "DomainName");
+    return this.getAtt("DomainName");
   }
   get hostedZoneId() {
-    return getAtt(this.logicalId, "HostedZoneId");
+    return this.getAtt("HostedZoneId");
   }
   properties() {
     return {
@@ -3293,13 +3299,13 @@ var LoadBalancer = class extends Resource {
   }
   name;
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get dnsName() {
-    return getAtt(this.logicalId, "DNSName");
+    return this.getAtt("DNSName");
   }
   get hostedZoneId() {
-    return getAtt(this.logicalId, "CanonicalHostedZoneID");
+    return this.getAtt("CanonicalHostedZoneID");
   }
   properties() {
     return {
@@ -3320,10 +3326,10 @@ var Listener = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get arn() {
-    return getAtt(this.logicalId, "ListenerArn");
+    return this.getAtt("ListenerArn");
   }
   properties() {
     return {
@@ -3419,10 +3425,10 @@ var ListenerRule = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get arn() {
-    return getAtt(this.logicalId, "ListenerArn");
+    return this.getAtt("ListenerArn");
   }
   properties() {
     return {
@@ -3481,10 +3487,10 @@ var TargetGroup = class extends Resource {
   }
   name;
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get fullName() {
-    return getAtt(this.logicalId, "TargetGroupFullName");
+    return this.getAtt("TargetGroupFullName");
   }
   properties() {
     return {
@@ -3764,10 +3770,10 @@ var Queue = class extends Resource {
     return this;
   }
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   get url() {
-    return getAtt(this.logicalId, "QueueUrl");
+    return this.getAtt("QueueUrl");
   }
   get permissions() {
     return {
@@ -3839,7 +3845,7 @@ var TopicRule = class extends Resource {
   }
   name;
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   properties() {
     return {
@@ -3985,10 +3991,10 @@ var Api = class extends Resource {
   }
   name;
   get endpoint() {
-    return getAtt(this.logicalId, "ApiEndpoint");
+    return this.getAtt("ApiEndpoint");
   }
   get id() {
-    return getAtt(this.logicalId, "ApiId");
+    return this.getAtt("ApiId");
   }
   properties() {
     return {
@@ -4014,7 +4020,7 @@ var Integration = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -4035,7 +4041,7 @@ var Route = class extends Resource {
     this.props = props;
   }
   get id() {
-    return getAtt(this.logicalId, "RouteId");
+    return this.getAtt("RouteId");
   }
   properties() {
     return {
@@ -4081,13 +4087,13 @@ var DomainName2 = class extends Resource {
     this.props = props;
   }
   get name() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get regionalDomainName() {
-    return getAtt(this.logicalId, "RegionalDomainName");
+    return this.getAtt("RegionalDomainName");
   }
   get regionalHostedZoneId() {
-    return getAtt(this.logicalId, "RegionalHostedZoneId");
+    return this.getAtt("RegionalHostedZoneId");
   }
   properties() {
     return {
@@ -4127,7 +4133,7 @@ var ApiMapping = class extends Resource {
     this.props = props;
   }
   get id() {
-    return getAtt(this.logicalId, "ApiMappingId");
+    return this.getAtt("ApiMappingId");
   }
   properties() {
     return {
@@ -4204,13 +4210,13 @@ var Collection = class extends Resource {
   }
   name;
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   get endpoint() {
-    return getAtt(this.logicalId, "CollectionEndpoint");
+    return this.getAtt("CollectionEndpoint");
   }
   get permissions() {
     return {
@@ -4273,7 +4279,7 @@ var Distribution = class extends Resource {
   }
   name;
   get id() {
-    return getAtt(this.logicalId, "Id");
+    return this.getAtt("Id");
   }
   get arn() {
     return sub("arn:${AWS::Partition}:cloudfront::${AWS::AccountId}:distribution/${id}", {
@@ -4400,19 +4406,19 @@ var Bucket = class extends Resource {
   }
   name;
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   get domainName() {
-    return getAtt(this.logicalId, "DomainName");
+    return this.getAtt("DomainName");
   }
   get dealStackDomainName() {
-    return getAtt(this.logicalId, "DualStackDomainName");
+    return this.getAtt("DualStackDomainName");
   }
   get regionalDomainName() {
-    return getAtt(this.logicalId, "RegionalDomainName");
+    return this.getAtt("RegionalDomainName");
   }
   get url() {
-    return getAtt(this.logicalId, "WebsiteURL");
+    return this.getAtt("WebsiteURL");
   }
   get permissions() {
     return {
@@ -4424,10 +4430,8 @@ var Bucket = class extends Resource {
         "s3:GetObjectAttributes"
       ],
       resources: [
-        sub("arn:${AWS::Partition}:${service}:${AWS::AccountId}:${resource}${seperator}${resourceName}", {
-          seperator: "/",
+        sub("arn:${AWS::Partition}:${service}:::${resourceName}", {
           service: "s3",
-          resource: "bucket",
           resourceName: this.name
         })
       ]
@@ -4462,7 +4466,7 @@ var OriginRequestPolicy = class extends Resource {
   }
   name;
   get id() {
-    return getAtt(this.logicalId, "Id");
+    return this.getAtt("Id");
   }
   properties() {
     return {
@@ -4494,7 +4498,7 @@ var CachePolicy = class extends Resource {
   }
   name;
   get id() {
-    return getAtt(this.logicalId, "Id");
+    return this.getAtt("Id");
   }
   properties() {
     return {
@@ -4627,7 +4631,7 @@ var OriginAccessControl = class extends Resource {
   }
   name;
   get id() {
-    return getAtt(this.logicalId, "Id");
+    return this.getAtt("Id");
   }
   properties() {
     return {
@@ -4650,7 +4654,7 @@ var ResponseHeadersPolicy = class extends Resource {
   }
   name;
   get id() {
-    return getAtt(this.logicalId, "Id");
+    return this.getAtt("Id");
   }
   properties() {
     return {
@@ -4956,13 +4960,13 @@ var Table = class extends Resource {
     this.indexes[name] = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get arn() {
-    return getAtt(this.logicalId, "Arn");
+    return this.getAtt("Arn");
   }
   get streamArn() {
-    return getAtt(this.logicalId, "StreamArn");
+    return this.getAtt("StreamArn");
   }
   get permissions() {
     const permissions = [
@@ -5162,7 +5166,7 @@ var Topic = class extends Resource {
   }
   name;
   get arn() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get permissions() {
     return {
@@ -5311,13 +5315,13 @@ var Vpc = class extends Resource {
     this.tag("Name", props.name);
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   get defaultNetworkAcl() {
-    return getAtt(this.logicalId, "DefaultNetworkAcl");
+    return this.getAtt("DefaultNetworkAcl");
   }
   get defaultSecurityGroup() {
-    return getAtt(this.logicalId, "DefaultSecurityGroup");
+    return this.getAtt("DefaultSecurityGroup");
   }
   properties() {
     return {
@@ -5334,7 +5338,7 @@ var RouteTable = class extends Resource {
   }
   name;
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -5347,7 +5351,7 @@ var InternetGateway = class extends Resource {
     super("AWS::EC2::InternetGateway", logicalId);
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {};
@@ -5359,7 +5363,7 @@ var VPCGatewayAttachment = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -5374,7 +5378,7 @@ var Route2 = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -5390,7 +5394,7 @@ var Subnet = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {
@@ -5406,7 +5410,7 @@ var SubnetRouteTableAssociation = class extends Resource {
     this.props = props;
   }
   get id() {
-    return ref(this.logicalId);
+    return this.ref();
   }
   properties() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.153",
+  "version": "0.0.155",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,9 +28,9 @@
     }
   },
   "peerDependencies": {
-    "@awsless/redis": "^0.0.10",
     "@awsless/lambda": "^0.0.15",
     "@awsless/s3": "^0.0.8",
+    "@awsless/redis": "^0.0.10",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",