@awsless/awsless 0.0.579 → 0.0.580

package/dist/bin.js

@@ -3963,7 +3963,7 @@ var onFailureFeature = defineFeature({
   }
 });
 
-// src/feature/pubsub/appsync/index.ts
+// src/feature/pubsub/index.ts
 import { $ as $9, Group as Group9 } from "@awsless/formation";
 import { constantCase as constantCase5 } from "change-case";
 
@@ -3985,141 +3985,91 @@ var formatFullDomainName = (config2, id, subDomain) => {
   return domain2;
 };
 
-// src/feature/pubsub/appsync/index.ts
+// src/feature/pubsub/index.ts
 var pubsubFeature = defineFeature({
   name: "pubsub",
   onApp(ctx) {
-    for (const [id, props] of Object.entries(ctx.appConfig.defaults?.pubsub ?? {})) {
+    ctx.addGlobalPermission({
+      actions: ["iot:Publish"],
+      resources: [
+        //
+        `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`,
+        `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/${ctx.app.name}/pubsub/*`
+      ]
+    });
+    for (const [id, props] of Object.entries(ctx.appConfig.defaults.pubsub ?? {})) {
       const group = new Group9(ctx.base, "pubsub", id);
-      const shortName = `${ctx.app.name}--${id}`;
+      const { lambda } = createLambdaFunction(group, ctx, "pubsub-authorizer", id, props.auth);
       const name = formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "pubsub",
         resourceName: id
       });
-      const authGroup = new Group9(group, "auth", "lambda");
-      const { lambda: authLambda } = createLambdaFunction(authGroup, ctx, "pubsub", `${id}-auth`, {
-        ...props.auth,
-        description: `PubSub ${id} authorizer`
-      });
-      let loggingRole;
-      if (props.logLevel) {
-        loggingRole = new $9.aws.iam.Role(group, "logging-role", {
-          name: shortId(`${name}-logging-role`),
-          assumeRolePolicy: JSON.stringify({
-            Version: "2012-10-17",
-            Statement: [
-              {
-                Effect: "Allow",
-                Principal: {
-                  Service: "appsync.amazonaws.com"
-                },
-                Action: "sts:AssumeRole"
-              }
-            ]
-          })
-        });
-        new $9.aws.iam.RolePolicyAttachment(group, "logs-policy", {
-          role: loggingRole.name,
-          policyArn: "arn:aws:iam::aws:policy/service-role/AWSAppSyncPushToCloudWatchLogs"
-        });
-      }
-      const api = new $9.aws.appsync.Api(group, "api", {
-        name: shortName,
-        eventConfig: [
-          {
-            connectionAuthMode: [{ authType: "AWS_IAM" }, { authType: "AWS_LAMBDA" }],
-            authProvider: [
-              {
-                authType: "AWS_LAMBDA",
-                lambdaAuthorizerConfig: [
-                  {
-                    authorizerUri: authLambda.arn,
-                    authorizerResultTtlInSeconds: 300
-                  }
-                ]
-              },
-              {
-                authType: "AWS_IAM"
-              }
-            ],
-            defaultPublishAuthMode: [
-              {
-                authType: "AWS_IAM"
-              }
-            ],
-            defaultSubscribeAuthMode: [
-              {
-                authType: "AWS_LAMBDA"
-              },
-              {
-                authType: "AWS_IAM"
-              }
-            ],
-            logConfig: props.logLevel ? [
-              {
-                logLevel: props.logLevel.toUpperCase(),
-                cloudwatchLogsRoleArn: loggingRole.arn
-              }
-            ] : void 0
-          }
-        ]
+      const authorizer = new $9.aws.iot.Authorizer(group, "authorizer", {
+        name,
+        authorizerFunctionArn: lambda.arn,
+        status: "ACTIVE",
+        signingDisabled: true,
+        enableCachingForHttp: false
       });
-      const namespaces = props.namespaces ?? ["default"];
-      for (const namespace of namespaces) {
-        new $9.aws.appsync.ChannelNamespace(group, `namespace-${namespace}`, {
-          name: namespace,
-          apiId: api.apiId
-        });
-      }
-      new $9.aws.lambda.Permission(group, "auth-permission", {
+      new $9.aws.lambda.Permission(group, "permission", {
+        functionName: lambda.functionName,
         action: "lambda:InvokeFunction",
-        principal: "appsync.amazonaws.com",
-        functionName: authLambda.functionName,
-        sourceArn: api.apiArn
+        principal: "iot.amazonaws.com",
+        sourceArn: authorizer.arn
+      });
+      ctx.bind(`PUBSUB_${constantCase5(id)}_AUTHORIZER`, name);
+      const endpoint = $9.aws.iot.getEndpoint(group, "endpoint", {
+        endpointType: "iot:Data-ATS"
       });
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
-        const zoneId = ctx.shared.entry("domain", `zone-id`, props.domain);
-        const certificateArn = ctx.shared.entry("domain", `certificate-arn`, props.domain);
-        const apiDomain = new $9.aws.appsync.DomainName(group, "domain", {
+        new $9.aws.iot.DomainConfiguration(group, "domain", {
+          name,
           domainName,
-          certificateArn
-        });
-        new $9.aws.appsync.DomainNameApiAssociation(group, "domain-association", {
-          apiId: api.apiArn,
-          domainName: apiDomain.domainName
+          serverCertificateArns: [ctx.shared.entry("domain", `certificate-arn`, props.domain)],
+          authorizerConfig: {
+            defaultAuthorizerName: authorizer.name
+          }
+          // validationCertificate: ctx.shared.get(`global-certificate-${props.domain}-arn`),
         });
         new $9.aws.route53.Record(group, "record", {
-          zoneId,
-          type: "CNAME",
+          zoneId: ctx.shared.entry("domain", `zone-id`, props.domain),
           name: domainName,
-          records: [apiDomain.appsyncDomainName],
-          ttl: 300
+          type: "CNAME",
+          records: [endpoint.endpointAddress]
         });
-        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, `${domainName}/event`);
-        ctx.bind(`PUBSUB_${constantCase5(id)}_REALTIME_ENDPOINT`, `${domainName}/event/realtime`);
+        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, domainName);
       } else {
-        ctx.bind(
-          `PUBSUB_${constantCase5(id)}_ENDPOINT`,
-          api.dns.pipe((dns) => dns.HTTP)
-        );
-        ctx.bind(
-          `PUBSUB_${constantCase5(id)}_REALTIME_ENDPOINT`,
-          api.dns.pipe((dns) => dns.REALTIME)
-        );
+        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, endpoint.endpointAddress);
       }
     }
+  },
+  onStack(ctx) {
+    for (const [id, props] of Object.entries(ctx.stackConfig.pubsub ?? {})) {
+      const group = new Group9(ctx.stack, "pubsub", id);
+      const { lambda } = createAsyncLambdaFunction(group, ctx, `pubsub`, id, props.consumer);
+      const name = formatLocalResourceName({
+        appName: ctx.app.name,
+        stackName: ctx.stack.name,
+        resourceType: "pubsub",
+        resourceName: id
+      });
+      const topic = new $9.aws.iot.TopicRule(group, "rule", {
+        name: name.replaceAll("-", "_"),
+        enabled: true,
+        sql: props.sql,
+        sqlVersion: props.sqlVersion,
+        lambda: [{ functionArn: lambda.arn }]
+      });
+      new $9.aws.lambda.Permission(group, "permission", {
+        action: "lambda:InvokeFunction",
+        principal: "iot.amazonaws.com",
+        functionName: lambda.functionName,
+        sourceArn: topic.arn
+      });
+    }
   }
-  // Note: The onStack method would handle channel namespaces and subscriptions
-  // but is commented out for now as it needs to be refactored for AppSync Event API
-  // onStack(ctx) {
-  // 	// Channel namespaces and event handlers would be configured here
-  // 	// This would include:
-  // 	// 1. Creating channel namespaces with their own auth modes (overriding defaults)
-  // 	// 2. Setting up event handlers (Lambda functions) for specific channels
-  // 	// 3. Configuring event filtering and routing rules
-  // },
 });
 
 // src/feature/queue/index.ts
@@ -7166,9 +7116,10 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
                     // 'awslogs-group': `/aws/ecs/${name}`,
                     "awslogs-group": `/aws/lambda/${name}`,
                     "awslogs-region": ctx.appConfig.region,
-                    "awslogs-stream-prefix": "ecs"
-                    // mode: 'non-blocking',
-                    // 'max-buffer-size': '1m',
+                    "awslogs-stream-prefix": "ecs",
+                    mode: "non-blocking"
+                    // 'awslogs-multiline-pattern': '',
+                    // 'max-buffer-size': '100m',
                   }
                 }
               },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.579",
+  "version": "0.0.580",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -35,11 +35,11 @@
   "peerDependencies": {
     "@awsless/big-float": "^0.1.4",
     "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/dynamodb": "^0.2.10",
     "@awsless/duration": "^0.0.3",
     "@awsless/clui": "^0.0.7",
     "@awsless/iot": "^0.0.3",
     "@awsless/json": "^0.0.10",
-    "@awsless/dynamodb": "^0.2.10",
     "@awsless/lambda": "^0.0.33",
     "@awsless/mqtt": "^0.0.2",
     "@awsless/open-search": "^0.0.21",
@@ -135,13 +135,13 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.4",
-    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/clui": "^0.0.7",
+    "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/duration": "^0.0.3",
     "@awsless/formation": "^0.0.80",
     "@awsless/graphql": "^0.0.9",
-    "@awsless/duration": "^0.0.3",
-    "@awsless/json": "^0.0.10",
     "@awsless/scheduler": "^0.0.4",
+    "@awsless/json": "^0.0.10",
     "@awsless/size": "^0.0.2",
     "@awsless/validate": "^0.0.19",
     "@awsless/ts-file-cache": "^0.0.12"