refactor: add evnironment spec for fc

packages/serverless-spec-builder/src/fc/builder.ts

@@ -55,6 +55,10 @@ export class FCSpecBuilder extends SpecBuilder {
           Timeout: funSpec.timeout || providerData.timeout || 30,
           InitializationTimeout: funSpec.initTimeout || 3,
           MemorySize: funSpec.memorySize || providerData.memorySize || 512,
+          EnvironmentVariables: {
+            ...providerData.environment,
+            ...funSpec.environment,
+          },
         },
         Events: {},
       };

packages/serverless-spec-builder/src/utils.ts

@@ -36,9 +36,11 @@ export function getLayers(...layersList: any) {
 }
 
 export function uppercaseObjectKey(obj) {
-  const json = JSON.stringify(obj);
-  const result = json.replace(/"([^"])([^"]*)":/gim, (...value) => {
-    return `"${value[1].toUpperCase()}${value[2]}":`;
-  });
-  return JSON.parse(result);
+  if (obj) {
+    const json = JSON.stringify(obj);
+    const result = json.replace(/"([^"])([^"]*)":/gim, (...value) => {
+      return `"${value[1].toUpperCase()}${value[2]}":`;
+    });
+    return JSON.parse(result);
+  }
 }

packages/serverless-spec-builder/test/fc.test.ts

@@ -25,7 +25,8 @@ describe('/test/fc.test.ts', () => {
     assert(funResult['Properties']['Handler'] === 'index.handler');
     assert(funResult['Properties']['Runtime'] === 'nodejs10');
     assert.deepStrictEqual(funResult['Events'], {});
-    const properties = result['Resources']['serverless-hello-world']['Properties'];
+    const properties =
+      result['Resources']['serverless-hello-world']['Properties'];
     assert(properties['VpcConfig']);
     assert(properties['Policies']);
     assert(properties['LogConfig']);
@@ -83,4 +84,22 @@ describe('/test/fc.test.ts', () => {
     assert(funResult['Properties']['Runtime'] === 'nodejs10');
     assert.deepStrictEqual(funResult['Events'], {});
   });
+
+  it('test transform environment', () => {
+    const result = generateFunctionsSpec(
+      path.join(__dirname, './fixtures/fc/f-environment.yml')
+    );
+    const funResult = result['Resources']['serverless-hello-world']['index'];
+    assert(funResult['Type'] === 'Aliyun::Serverless::Function');
+    assert(funResult['Properties']['Handler'] === 'index.handler');
+    assert(funResult['Properties']['Runtime'] === 'nodejs10');
+    assert(funResult['Properties']['EnvironmentVariables']['GLOBAL_PASS']);
+    assert(!funResult['Properties']['EnvironmentVariables']['MYSQL_USER']);
+    assert(!funResult['Properties']['EnvironmentVariables']['MYSQL_PASS']);
+
+    const funResult2 = result['Resources']['serverless-hello-world']['index2'];
+    assert(funResult2['Properties']['EnvironmentVariables']['GLOBAL_PASS']);
+    assert(funResult2['Properties']['EnvironmentVariables']['MYSQL_USER']);
+    assert(funResult2['Properties']['EnvironmentVariables']['MYSQL_PASS']);
+  });
 });

packages/serverless-spec-builder/test/fixtures/fc/f-environment.yml

@@ -0,0 +1,19 @@
+service:
+  name: serverless-hello-world
+
+provider:
+  name: aliyun
+  environment:
+    GLOBAL_PASS: admin
+
+functions:
+  index:
+    handler: index.handler
+  index2:
+    handler: index2.handler
+    environment:
+      MYSQL_USER: root
+      MYSQL_PASS: pass
+
+package:
+  artifact: code.zip