feat: fc3 as defult fc runtime

Signed-off-by: seven <zilisheng1996@gmail.com>
geek-fun · Oct 22, 2024 · be209c4 · be209c4
1 parent c453097
commit be209c4
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 103 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",
@@ -50,10 +50,10 @@
   ],
   "dependencies": {
     "@alicloud/openapi-client": "^0.4.12",
-    "@alicloud/ros-cdk-apigateway": "^1.3.0",
-    "@alicloud/ros-cdk-core": "^1.3.0",
-    "@alicloud/ros-cdk-fc3": "^1.3.0",
-    "@alicloud/ros-cdk-ram": "^1.3.0",
+    "@alicloud/ros-cdk-apigateway": "^1.4.0",
+    "@alicloud/ros-cdk-core": "^1.4.0",
+    "@alicloud/ros-cdk-fc3": "^1.4.0",
+    "@alicloud/ros-cdk-ram": "^1.4.0",
     "@alicloud/ros20190910": "^3.5.0",
     "ajv": "^8.17.1",
     "chalk": "^5.3.0",

diff --git a/src/stack/iacStack.ts b/src/stack/iacStack.ts
@@ -139,7 +139,7 @@ export class IacStack extends ros.Stack {
                   fcRegionId: context.region,
                   functionName: trigger.backend,
                   roleArn: gatewayAccessRole.attrArn,
-                  // fcVersion: '3.0',
+                  fcVersion: '3.0',
                 },
               },
               resultSample: 'ServerlessInsight resultSample',

diff --git a/tests/fixtures/deployFixture.ts b/tests/fixtures/deployFixture.ts
@@ -78,7 +78,7 @@ export const oneFcOneGatewayRos = {
           FunctionComputeConfig: {
             FunctionName: 'demo_fn_gateway',
             RoleArn: { 'Fn::GetAtt': ['my-demo-service_role', 'Arn'] },
-            ServiceName: 'my-demo-service-service',
+            FcVersion: '3.0',
           },
           ServiceProtocol: 'FunctionCompute',
         },
@@ -95,17 +95,9 @@ export const oneFcOneGatewayRos = {
         Handler: 'index.handler',
         MemorySize: 128,
         Runtime: 'nodejs18',
-        ServiceName: 'my-demo-service-service',
         Timeout: 10,
       },
-      Type: 'ALIYUN::FC::Function',
-    },
-    'my-demo-service-service': {
-      Properties: {
-        ServiceName: 'my-demo-service-service',
-        Tags: [{ Key: 'owner', Value: 'geek-fun' }],
-      },
-      Type: 'ALIYUN::FC::Service',
+      Type: 'ALIYUN::FC3::Function',
     },
     'my-demo-service_apigroup': {
       Properties: {
@@ -199,17 +191,9 @@ export const oneFcRos = {
         Handler: 'index.handler',
         MemorySize: 128,
         Runtime: 'nodejs18',
-        ServiceName: 'my-demo-service-service',
         Timeout: 10,
       },
-      Type: 'ALIYUN::FC::Function',
-    },
-    'my-demo-service-service': {
-      Properties: {
-        ServiceName: 'my-demo-service-service',
-        Tags: [{ Key: 'owner', Value: 'geek-fun' }],
-      },
-      Type: 'ALIYUN::FC::Service',
+      Type: 'ALIYUN::FC3::Function',
     },
   },
 };

diff --git a/tests/fixtures/serverless-insight.yml b/tests/fixtures/serverless-insight.yml
@@ -30,17 +30,17 @@ functions:
       TEST_VAR: ${vars.testv}
       TEST_VAR_EXTRA: abcds-${vars.testv}-andyou
 
-databases:
-  insight_poc_db:
-    name: insight-poc-db
-    type: RDS
-    region: ${vars.region}
-    instance_class: rds.mysql.t5.xlarge
-    storage_size: 20
-    username: root
-    password: 123456
-    database: insight_poc_db
-
+#databases:
+#  insight_poc_db:
+#    name: insight-poc-db
+#    type: RDS
+#    region: ${vars.region}
+#    instance_class: rds.mysql.t5.xlarge
+#    storage_size: 20
+#    username: root
+#    password: 123456
+#    database: insight_poc_db
+#
 events:
   gateway_event:
     type: API_GATEWAY
@@ -49,8 +49,8 @@ events:
       - method: GET
         path: /api/hello
         backend: insight-poc-fn
-    custom_domain:
-      domain_name: test.com
-      certificate_name: test
-      certificate_private_key: test
-      certificate_body: test
+#    custom_domain:
+#      domain_name: test.com
+#      certificate_name: test
+#      certificate_private_key: test
+#      certificate_body: test