@geek-fun/serverlessinsight 0.3.1 → 0.3.3

package/dist/src/stack/rosStack/bootstrap.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareBootstrapStack = void 0;
 const common_1 = require("../../common");
 const getBootstrapTemplate = async (context) => {
-    const iamInfo = await (0, common_1.getIamInfo)(context);
-    const stackName = `si-bootstrap-${iamInfo?.accountId}-${context.region}`;
+    const stackName = `si-bootstrap-${context.accountId}-${context.region}`;
     const template = {
         Description: 'ServerlessInsight Bootstrap Stack',
         Metadata: {
@@ -17,9 +16,7 @@ const getBootstrapTemplate = async (context) => {
             si_auto_artifacts_bucket: {
                 Type: 'ALIYUN::OSS::Bucket',
                 Properties: {
-                    BucketName: {
-                        'Fn::Sub': 'si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}',
-                    },
+                    BucketName: `${common_1.SI_BOOTSTRAP_BUCKET_PREFIX}-${context.accountId}-${context.region}`,
                     AccessControl: 'private',
                     DeletionForce: false,
                     EnableOssHdfsService: false,
@@ -29,6 +26,157 @@ const getBootstrapTemplate = async (context) => {
                     },
                 },
             },
+            si_auto_bootstrap_api_lambda: {
+                Type: 'ALIYUN::FC3::Function',
+                Properties: {
+                    FunctionName: `${common_1.SI_BOOTSTRAP_FC_PREFIX}-${context.accountId}-${context.region}`,
+                    Description: 'ServerlessInsight Bootstrap API',
+                    Handler: 'index.handler',
+                    Runtime: 'nodejs20',
+                    Layers: [
+                        `acs:fc:${context.region}:${context.accountId}:layers/si-bootstrap-sdk/versions/18`,
+                    ],
+                    Code: {
+                        SourceCode: `
+const { bootstrapHandler } = require('@geek-fun/si-bootstrap-sdk');
+
+module.exports.handler = async (rawEvent, context) => {
+  // 处理 Buffer 类型的事件
+  const event = parseEvent(rawEvent);
+
+  const commonResponse = {
+    RequestId: event.requestId,
+    LogicalResourceId: event.logicalResourceId,
+    StackId: event.stackId
+  };
+
+  try {
+    // 处理业务逻辑
+    const result = await bootstrapHandler(event);
+
+    // 构建符合 ROS 要求的响应结构
+    const rosResponse = {
+      ...commonResponse,
+      Status: result.status,
+      Reason: result.reason,
+      PhysicalResourceId: result.physicalResourceId,
+      Data: result.data || {}       // 业务数据
+    };
+
+    // 如果是删除操作，不需要返回数据
+    if (event.requestType === 'Delete') {
+      delete rosResponse.Data;
+    }
+
+    // 发送响应到 ROS 服务（如果提供了 ResponseURL）
+    if (event.responseURL) {
+      await sendResponse(event.responseURL, rosResponse);
+    }
+
+    // 返回成功响应
+    return {
+      statusCode: 200,
+      body: JSON.stringify({
+        message: 'Request processed successfully',
+        rosResponse
+      })
+    };
+  } catch (error) {
+    console.error('Error:', error);
+
+    // 构建错误响应
+    const errorResponse = {
+      ...commonResponse,
+      Status: 'FAILED',
+      Reason: error.message || 'Internal Server Error',
+      PhysicalResourceId: 'error-' + Date.now()
+    };
+
+    // 发送错误响应到 ROS 服务
+    if (event.responseURL) {
+      try {
+        await sendResponse(event.responseURL, errorResponse);
+      } catch (err) {
+        console.error('Failed to send error response:', err);
+      }
+    }
+
+    // 返回错误响应
+    return {
+      statusCode: 500,
+      body: JSON.stringify({
+        error: 'Internal Server Error',
+        details: error.message,
+        rosErrorResponse: errorResponse
+      })
+    };
+  }
+};
+
+// 使用原生 fetch API 发送响应
+async function sendResponse(responseUrl, responseBody) {
+
+  try {
+    const body = JSON.stringify(responseBody);
+
+    const response = await fetch(responseUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(body).toString(),
+        'Date': new Date().toUTCString()
+      },
+      body: body
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(\`Failed to send response. Status: \${response.status}, Body: \${errorText}\`);
+    }
+
+    console.log('Response sent successfully');
+  } catch (error) {
+    console.error('Error sending response:', error);
+    throw error;
+  }
+}
+
+
+const parseEvent = (rawEvent) => {
+// 处理 Buffer 类型的事件
+  let event;
+  if (Buffer.isBuffer(rawEvent)) {
+    event = JSON.parse(rawEvent.toString('utf8'));
+  } else if (typeof rawEvent === 'string') {
+    event = JSON.parse(rawEvent);
+  } else {
+    event = rawEvent;
+  }
+
+  const { credentials, ...resourceProperties } = event.ResourceProperties
+  return {
+    stackId: event.StackId,
+    responseURL: event.ResponseURL,
+    resourceOwnerId: event.ResourceOwnerId,
+    callerId: event.CallerId,
+    resourceProperties,
+    eventType: event.ResourceType,
+    requestType: event.RequestType?.toUpperCase(),
+    resourceType: resourceProperties.resource,
+    regionId: event.RegionId,
+    stackName: event.StackName,
+    requestId: event.RequestId,
+    intranetResponseURL: event.IntranetResponseURL,
+    logicalResourceId: event.LogicalResourceId,
+    physicalResourceId: event.PhysicalResourceId,
+    credentials
+  };
+};`,
+                    },
+                    MemorySize: 512,
+                    Timeout: 900, // 15 minutes
+                },
+            },
         },
     };
     return { stackName, template };

package/dist/src/stack/rosStack/bucket.js

@@ -81,6 +81,7 @@ const resolveBuckets = (scope, buckets, context) => {
         const ossBucket = new oss.Bucket(scope, bucket.key, {
             bucketName: (0, common_1.calcRefs)(bucket.name, context),
             accessControl: aclMap.get((0, common_1.calcRefs)(bucket.security?.acl, context) ?? ''),
+            blockPublicAccess: (0, common_1.calcRefs)(bucket.security?.acl, context) === types_1.BucketAccessEnum.PRIVATE,
             websiteConfigurationV2: bucket.website
                 ? {
                     indexDocument: {

package/dist/src/stack/rosStack/database.js

@@ -223,8 +223,7 @@ const resolveDatabases = (scope, databases, context) => {
                     ],
                 },
                 quotaInfo: {
-                    cu: db.cu.min,
-                    storage: db.storage.min,
+                    minCu: db.cu.min,
                     appType: category,
                 },
                 // network: [

package/dist/src/stack/rosStack/function.js

@@ -39,7 +39,6 @@ const common_1 = require("../../common");
 const fc = __importStar(require("@alicloud/ros-cdk-fc3"));
 const lodash_1 = require("lodash");
 const ossDeployment = __importStar(require("@alicloud/ros-cdk-ossdeployment"));
-const ros = __importStar(require("@alicloud/ros-cdk-core"));
 const sls = __importStar(require("@alicloud/ros-cdk-sls"));
 const nas = __importStar(require("@alicloud/ros-cdk-nas"));
 const ecs = __importStar(require("@alicloud/ros-cdk-ecs"));
@@ -123,7 +122,7 @@ const resolveFunctions = (scope, functions, tags, context, service) => {
         const fcName = (0, common_1.calcRefs)(name, context);
         return { fcName, ...(0, common_1.getFileSource)(fcName, code.path) };
     });
-    const destinationBucketName = ros.Fn.sub('si-bootstrap-artifacts-${ALIYUN::AccountId}-${ALIYUN::Region}');
+    const destinationBucketName = `${common_1.SI_BOOTSTRAP_BUCKET_PREFIX}-${context.accountId}-${context.region}`;
     const ossDeploymentId = 'si_auto_artifacts_code_deployment';
     if (!(0, lodash_1.isEmpty)(fileSources)) {
         new ossDeployment.BucketDeployment(scope, ossDeploymentId, {

package/dist/src/stack/rosStack/index.js

@@ -46,6 +46,7 @@ const vars_1 = require("./vars");
 const database_1 = require("./database");
 const event_1 = require("./event");
 const bucket_1 = require("./bucket");
+const table_1 = require("./table");
 __exportStar(require("./bootstrap"), exports);
 class RosStack extends ros.Stack {
     constructor(scope, iac, context) {
@@ -65,6 +66,8 @@ class RosStack extends ros.Stack {
         (0, event_1.resolveEvents)(this, iac.events, iac.tags, context, this.service);
         // Define Databases
         (0, database_1.resolveDatabases)(this, iac.databases, context);
+        // Define Tables
+        (0, table_1.resolveTables)(this, iac.tables, iac.tags, context);
         // Define Buckets
         (0, bucket_1.resolveBuckets)(this, iac.buckets, context);
     }

package/dist/src/stack/rosStack/table.js

@@ -0,0 +1,95 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveTables = void 0;
+const rosRos = __importStar(require("@alicloud/ros-cdk-ros"));
+const lodash_1 = require("lodash");
+const common_1 = require("../../common");
+const tableEngineMap = new Map([
+    [
+        "TABLE_STORE_C" /* TableEnum.TABLE_STORE_C */,
+        {
+            clusterType: 'HYBRID',
+        },
+    ],
+    [
+        "TABLE_STORE_H" /* TableEnum.TABLE_STORE_H */,
+        {
+            clusterType: 'SSD',
+        },
+    ],
+]);
+const resolveTables = (scope, tables, tags, context) => {
+    if ((0, lodash_1.isEmpty)(tables)) {
+        return undefined;
+    }
+    tables.forEach((tableDomain) => {
+        const { collection, throughput, attributes, keySchema, network } = tableDomain;
+        const primaryKey = keySchema.map((key) => {
+            const name = (0, common_1.calcRefs)(key.name, context);
+            const type = attributes.find((attribute) => (0, common_1.calcRefs)(attribute.name, context) === name)?.type ||
+                'STRING';
+            return { name, type: (0, common_1.calcRefs)(type, context) };
+        });
+        const columns = attributes
+            ?.filter(({ name }) => !primaryKey.find((pk) => pk.name === (0, common_1.calcRefs)(name, context)))
+            .map((attribute) => ({
+            name: (0, common_1.calcRefs)(attribute.name, context),
+            type: (0, common_1.calcRefs)(attribute.type, context),
+        })) || [];
+        const clusterType = tableEngineMap.get((0, common_1.calcRefs)(tableDomain.type, context))?.clusterType;
+        new rosRos.RosCustomResource(scope, tableDomain.key, {
+            serviceToken: `acs:fc:${context.region}:${context.accountId}:functions/${common_1.SI_BOOTSTRAP_FC_PREFIX}-${context.accountId}-${context.region}`,
+            timeout: 600,
+            parameters: {
+                resource: (0, common_1.calcRefs)(tableDomain.type, context),
+                instanceName: (0, common_1.calcRefs)(collection, context),
+                tableName: (0, common_1.calcRefs)(tableDomain.name, context),
+                primaryKey,
+                columns,
+                clusterType,
+                network,
+                reservedThroughput: (0, common_1.calcRefs)(throughput?.reserved, context),
+                tags,
+                credentials: {
+                    accessKeyId: context.accessKeyId,
+                    accessKeySecret: context.accessKeySecret,
+                    securityToken: context.securityToken,
+                },
+            },
+        }, true);
+    });
+};
+exports.resolveTables = resolveTables;

package/dist/src/types/domains/table.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeyTypeEnum = exports.AttributeTypeEnum = void 0;
+var AttributeTypeEnum;
+(function (AttributeTypeEnum) {
+    AttributeTypeEnum["STRING"] = "STRING";
+    AttributeTypeEnum["INTEGER"] = "INTEGER";
+    AttributeTypeEnum["DOUBLE"] = "DOUBLE";
+    AttributeTypeEnum["BOOLEAN"] = "BOOLEAN";
+    AttributeTypeEnum["BINARY"] = "BINARY";
+})(AttributeTypeEnum || (exports.AttributeTypeEnum = AttributeTypeEnum = {}));
+var KeyTypeEnum;
+(function (KeyTypeEnum) {
+    KeyTypeEnum["HASH"] = "HASH";
+    KeyTypeEnum["RANGE"] = "RANGE";
+})(KeyTypeEnum || (exports.KeyTypeEnum = KeyTypeEnum = {}));

package/dist/src/types/index.d.ts

@@ -5,6 +5,7 @@ import { DatabaseDomain, DatabaseRaw } from './domains/database';
 import { FunctionDomain, FunctionRaw } from './domains/function';
 import { Provider } from './domains/provider';
 import { BucketDomain, BucketRaw } from './domains/bucket';
+import { TableDomain, TableRaw } from './domains/table';
 export * from './domains/database';
 export * from './domains/event';
 export * from './domains/function';
@@ -29,6 +30,9 @@ export type ServerlessIacRaw = {
     databases: {
         [key: string]: DatabaseRaw;
     };
+    tables: {
+        [key: string]: TableRaw;
+    };
     buckets: {
         [key: string]: BucketRaw;
     };
@@ -46,5 +50,6 @@ export type ServerlessIac = {
     functions?: Array<FunctionDomain>;
     events?: Array<EventDomain>;
     databases?: Array<DatabaseDomain>;
+    tables?: Array<TableDomain>;
     buckets?: Array<BucketDomain>;
 };

package/dist/src/validator/iacSchema.js

@@ -11,6 +11,7 @@ const databaseSchema_1 = require("./databaseSchema");
 const eventSchema_1 = require("./eventSchema");
 const functionSchema_1 = require("./functionSchema");
 const bucketSchema_1 = require("./bucketSchema");
+const tableschema_1 = require("./tableschema");
 class IacSchemaErrors extends Error {
     constructor(errors) {
         super(`Invalid yaml`);
@@ -31,6 +32,7 @@ const validate = ajv
     .addSchema(functionSchema_1.functionSchema)
     .addSchema(eventSchema_1.eventSchema)
     .addSchema(databaseSchema_1.databaseSchema)
+    .addSchema(tableschema_1.tableSchema)
     .addSchema(bucketSchema_1.bucketSchema)
     .compile(rootSchema_1.rootSchema);
 const validateYaml = (iacJson) => {

package/dist/src/validator/rootSchema.js

@@ -49,6 +49,9 @@ exports.rootSchema = {
         buckets: {
             $ref: 'https://serverlessinsight.geekfun.club/schemas/bucketschema.json',
         },
+        tables: {
+            $ref: 'https://serverlessinsight.geekfun.club/schemas/tableschema.json',
+        },
     },
     required: ['version', 'provider', 'service'],
     additionalProperties: false,

package/dist/src/validator/tableschema.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableSchema = void 0;
+exports.tableSchema = {
+    $id: 'https://serverlessinsight.geekfun.club/schemas/tableschema.json',
+    type: 'object',
+    patternProperties: {
+        '.*': {
+            type: 'object',
+            properties: {
+                collection: { type: 'string' },
+                name: { type: 'string' },
+                type: { type: 'string', enum: ['TABLE_STORE_C', 'TABLE_STORE_H'] },
+                desc: { type: 'string', maxLength: 256 },
+                network: {
+                    type: 'object',
+                    properties: {
+                        type: { type: 'string', enum: ['PUBLIC', 'PRIVATE'] },
+                        ingress_rules: {
+                            type: 'array',
+                            items: { type: 'string' },
+                        },
+                    },
+                    required: ['type'],
+                },
+                throughput: {
+                    type: 'object',
+                    properties: {
+                        reserved: {
+                            type: 'object',
+                            properties: {
+                                read: { type: 'integer' },
+                                write: { type: 'integer' },
+                            },
+                        },
+                        on_demand: {
+                            type: 'object',
+                            properties: {
+                                read: { type: 'integer' },
+                                write: { type: 'integer' },
+                            },
+                        },
+                    },
+                },
+                key_schema: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            name: { type: 'string' },
+                            type: { type: 'string', enum: ['HASH', 'RANGE'] },
+                        },
+                        required: ['name', 'type'],
+                    },
+                },
+                attributes: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            name: { type: 'string' },
+                            type: { type: 'string', enum: ['STRING', 'INTEGER', 'DOUBLE', 'BOOLEAN', 'BINARY'] },
+                        },
+                        required: ['name', 'type'],
+                    },
+                },
+            },
+            required: ['collection', 'name', 'type', 'key_schema', 'attributes'],
+            additionalProperties: false,
+        },
+    },
+};

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/index.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/domainHelper.ts","../src/common/getVersion.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/rosAssets.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/bucketParser.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/tagParser.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/rosStack/bootstrap.ts","../src/stack/rosStack/bucket.ts","../src/stack/rosStack/database.ts","../src/stack/rosStack/event.ts","../src/stack/rosStack/function.ts","../src/stack/rosStack/index.ts","../src/stack/rosStack/stage.ts","../src/stack/rosStack/tag.ts","../src/stack/rosStack/vars.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/domains/bucket.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/provider.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/validator/bucketSchema.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts"],"version":"5.8.3"}
+{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/index.ts","../src/commands/local.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/domainHelper.ts","../src/common/getVersion.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/rosAssets.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/bucketParser.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/tableParser.ts","../src/parser/tagParser.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/localStack/event.ts","../src/stack/localStack/index.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/rosStack/bootstrap.ts","../src/stack/rosStack/bucket.ts","../src/stack/rosStack/database.ts","../src/stack/rosStack/event.ts","../src/stack/rosStack/function.ts","../src/stack/rosStack/index.ts","../src/stack/rosStack/stage.ts","../src/stack/rosStack/table.ts","../src/stack/rosStack/tag.ts","../src/stack/rosStack/vars.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/domains/bucket.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/provider.ts","../src/types/domains/table.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/validator/bucketSchema.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts","../src/validator/tableschema.ts"],"version":"5.9.2"}

package/layers/si-bootstrap-sdk/Dockerfile-aliyuncli

@@ -0,0 +1,12 @@
+FROM alpine:latest
+
+RUN apk update && apk add --no-cache jq
+
+# install aliyuncli
+RUN wget https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz
+RUN tar -xvzf aliyun-cli-linux-latest-amd64.tgz
+RUN rm aliyun-cli-linux-latest-amd64.tgz
+RUN mv aliyun /usr/local/bin/
+
+# 注意：alpine需要额外创建 lib64 的动态链接库软连接
+RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2

package/layers/si-bootstrap-sdk/README.md

@@ -0,0 +1 @@
+# ServerlessInsight bootstrap SDK