refactor: restructure the folders #5

Signed-off-by: seven <[email protected]>
geek-fun · Sep 22, 2024 · 9e093da · 9e093da
1 parent 733aeb9
commit 9e093da
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts
@@ -1,6 +1,5 @@
-import { deployStack } from '../stack';
+import { deployStack, parseYaml } from '../stack';
 import { printer, constructActionContext } from '../common';
-import { parseYaml } from '../iac';
 
 export const deploy = async (
   stackName: string,

diff --git a/src/commands/validate.ts b/src/commands/validate.ts
@@ -1,6 +1,5 @@
-import { parseYaml } from '../iac';
-import { printer } from '../common';
-import { constructActionContext } from '../common/actionContext';
+import { printer, constructActionContext } from '../common';
+import { parseYaml } from '../stack';
 
 export const validate = (location?: string) => {
   const context = constructActionContext({ location });

diff --git a/src/iac/index.ts b/src/iac/index.ts
diff --git a/src/iac/iacSchema.ts → src/stack/iacSchema.ts b/src/iac/iacSchema.ts → src/stack/iacSchema.ts
diff --git a/src/stack/index.ts b/src/stack/index.ts
@@ -1 +1,3 @@
 export { deployStack } from './deploy';
+export * from './parse';
+export * from './iacSchema';
diff --git a/src/iac/parse.ts → src/stack/parse.ts b/src/iac/parse.ts → src/stack/parse.ts
diff --git a/tests/fixtures/serverless-insignt.yml b/tests/fixtures/serverless-insignt.yml
@@ -4,6 +4,7 @@ provider: aliyun
 vars:
   region: cn-hangzhou
   testv: testVarValue
+  handler: index.handler
 
 stages:
   dev:
@@ -18,7 +19,7 @@ functions:
   insight_poc_fn:
     name: insight-poc-fn
     runtime: nodejs18
-    handler: index.handler
+    handler: ${vars.handler}
     code: artifacts/artifact.zip
     memory: 512
     timeout: 10

diff --git a/tests/validate.test.ts b/tests/validate.test.ts
@@ -1,8 +1,8 @@
-import { validateYaml } from '../src/iac';
 import { readFileSync } from 'node:fs';
 import * as path from 'node:path';
 import { parse } from 'yaml';
 import { RawServerlessIac } from '../src/types';
+import { validateYaml } from '../src/stack';
 
 const jsonIac = parse(
   readFileSync(path.resolve(__dirname, './fixtures/serverless-insignt.yml'), 'utf8'),