feat: ✨ few type changes

distinction-dev · Mar 28, 2023 · 2ab6a44 · 2ab6a44
1 parent f0bc2d5
commit 2ab6a44
Show file tree

Hide file tree

Showing 4 changed files with 903 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "mocha": "^10.1.0",
     "prettier": "^2.2.1",
     "semantic-release": "^19.0.2",
+    "serverless-schema": "^1.26.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.0-dev.20220916"
   },

diff --git a/src/compiler.ts b/src/compiler.ts
@@ -1,16 +1,22 @@
-const toIdentifier = name => {
-  const id = name.replace(/[^0-9A-Za-z]/g, "");
-  return id.charAt(0).toUpperCase() + id.slice(1);
-};
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/restrict-plus-operands */
+// const toIdentifier = (name: string) => {
+//   const id = name.replace(/[^0-9A-Za-z]/g, "");
+//   return id.charAt(0).toUpperCase() + id.slice(1);
+// };
 
 const toTags = (tags = {}) => {
   return Object.entries(tags).map(([Key, Value]) => ({ Key, Value }));
 };
 
-const toEnvironment = tags =>
-  Object.entries(tags).map(([Name, Value]) => ({ Name, Value }));
+// const toEnvironment = tags =>
+//   Object.entries(tags).map(([Name, Value]) => ({ Name, Value }));
 
-const compileCluster = (config, images, service) => ({
+const compileCluster = (
+  config: Record<string, any>,
+  images: Record<string, any>,
+  service: Record<string, any>
+) => ({
   Resources: {
     [service.name + "AppRunnerService"]: {
       Type: "AWS::AppRunner::Service",
@@ -172,38 +178,38 @@ const compileIamRoles = config => ({
 //   },
 // });
 
-const compileScheduledTask = (identifier, task) => ({
-  Type: "AWS::Events::Rule",
-  DependsOn: task.dependsOn,
-  Properties: {
-    ScheduleExpression: task.schedule,
-    Targets: [
-      {
-        Id: identifier,
-        Arn: {
-          "Fn::GetAtt": ["FargateTasksCluster", "Arn"],
-        },
-        RoleArn: {
-          "Fn::GetAtt": ["FargateIamExecutionRole", "Arn"],
-        },
-        EcsParameters: {
-          TaskDefinitionArn: {
-            "Fn::Sub": "${" + identifier + "Task}",
-          },
-          TaskCount: 1,
-          LaunchType: "FARGATE",
-          NetworkConfiguration: {
-            AwsVpcConfiguration: {
-              AssignPublicIp: task.vpc.assignPublicIp ? "ENABLED" : "DISABLED",
-              SecurityGroups: task.vpc.securityGroupIds,
-              Subnets: task.vpc.subnetIds,
-            },
-          },
-        },
-      },
-    ],
-  },
-});
+// const compileScheduledTask = (identifier, task) => ({
+//   Type: "AWS::Events::Rule",
+//   DependsOn: task.dependsOn,
+//   Properties: {
+//     ScheduleExpression: task.schedule,
+//     Targets: [
+//       {
+//         Id: identifier,
+//         Arn: {
+//           "Fn::GetAtt": ["FargateTasksCluster", "Arn"],
+//         },
+//         RoleArn: {
+//           "Fn::GetAtt": ["FargateIamExecutionRole", "Arn"],
+//         },
+//         EcsParameters: {
+//           TaskDefinitionArn: {
+//             "Fn::Sub": "${" + identifier + "Task}",
+//           },
+//           TaskCount: 1,
+//           LaunchType: "FARGATE",
+//           NetworkConfiguration: {
+//             AwsVpcConfiguration: {
+//               AssignPublicIp: task.vpc.assignPublicIp ? "ENABLED" : "DISABLED",
+//               SecurityGroups: task.vpc.securityGroupIds,
+//               Subnets: task.vpc.subnetIds,
+//             },
+//           },
+//         },
+//       },
+//     ],
+//   },
+// });
 
 // const compileService = (identifier, task) => ({
 //   Type: 'AWS::ECS::Service',
@@ -274,7 +280,10 @@ const compileScheduledTask = (identifier, task) => ({
 //   };
 // };
 
-export const compile = (images, config) => {
+export const compile = (
+  images: Record<string, any>,
+  config: Record<string, any>
+) => {
   const iamRoles = compileIamRoles(config);
   const services = config.services.reduce(({ Resources, Outputs }, service) => {
     const compiled = compileCluster(config, images, service);

diff --git a/src/index.ts b/src/index.ts
@@ -3,16 +3,20 @@ import { get } from "./util";
 import { parser } from "./parser";
 import { compile } from "./compiler";
 import { schema } from "./schema";
+import { ServerlessFrameworkConfiguration } from "serverless-schema";
 
 interface ServerlessPluginOptions {
   globalOptions?: boolean;
 }
 class ServerlessPlugin {
-  serverless: Serverless;
+  serverless: ServerlessFrameworkConfiguration;
   options: ServerlessPluginOptions;
   config: any;
   hooks: { "package:compileFunctions": any };
-  constructor(serverless: Serverless, options: ServerlessPluginOptions) {
+  constructor(
+    serverless: ServerlessFrameworkConfiguration,
+    options: ServerlessPluginOptions
+  ) {
     this.serverless = serverless;
     this.options = options;