fix: env work without s.yaml

zxypro1 · zxypro1 · commit cab786d13e8b · 2024-07-30T14:26:31.000+08:00
Signed-off-by: zxypro1 &lt;1018995004@qq.com&gt;
diff --git a/__tests__/env.test.ts b/__tests__/env.test.ts
@@ -6,6 +6,7 @@ import { ENVIRONMENT_FILE_NAME } from '@serverless-devs/parse-spec';
 import { find, get } from 'lodash';
 const s = path.resolve(__dirname, process.platform === 'win32' ? '../bin/s.cmd' : '../bin/s');
 const cwd = path.resolve(__dirname, './fixtures/env');
+const cwdEmpty = path.resolve(__dirname, './fixtures/empty');
 
 test('set', async () => {
   const res = spawnSync(s, ['env', 'set', '--component', 'ServerlessDevsAdmin@dev'], { cwd });
@@ -183,4 +184,57 @@ test('list v2', async () => {
   const stdout = res.stdout.toString();
   console.log(stdout);
   expect(stdout).toContain('Not support template');
-})
+})
+
+test('init with no s.yaml', async () => {
+  const name = 'dev';
+  const args = [
+    '--name',
+    name,
+    '--project',
+    'custom-project',
+    '--description',
+    'this is a description',
+    '--type',
+    'testing',
+    '--overlays',
+    '{"components":{"fc3test":{"region":"hangzhou"}}}',
+    '--debug',
+  ];
+  const res = spawnSync(s, ['env', 'init', ...args], { cwd: cwdEmpty, stdio: 'inherit' });
+  console.log(res);
+  expect(res.status).toBe(0);
+  expect(fs.existsSync(path.join(cwd, 'env.yaml'))).toBeTruthy();
+});
+
+test('describe with no s.yaml', async () => {
+  const name = 'dev';
+  const args = ['--name', name];
+  const res = spawnSync(s, ['env', 'describe', ...args], { cwd: cwdEmpty, stdio: 'inherit' });
+  console.log(res);
+  expect(res.status).toBe(0);
+  expect(res).toContain('this is a description');
+});
+
+test('list with no s.yaml', async () => {
+  const res = spawnSync(s, ['env', 'list'], { cwd: cwdEmpty, stdio: 'inherit' });
+  console.log(res);
+  expect(res.status).toBe(0);
+  expect(res).toContain('this is a description');
+});
+
+test('default with no s.yaml', async () => {
+  const res = spawnSync(s, ['env', 'default'], { cwd: cwdEmpty, stdio: 'inherit' });
+  console.log(res);
+  expect(res.status).toBe(1);
+  expect(res).toContain('the s.yaml/s.yml file was not found.');
+});
+
+test('destroy with no s.yaml', async () => {
+  const name = 'dev';
+  const args = ['--name', name];
+  const res = spawnSync(s, ['env', 'destroy', ...args], { cwd: cwdEmpty, stdio: 'inherit' });
+  console.log(res);
+  expect(res.status).toBe(0);
+  expect(res).toContain('The environment dev was destroyed successfully');
+});
diff --git a/__tests__/fixtures/empty/test b/__tests__/fixtures/empty/test
@@ -0,0 +1 @@
+empty file path
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,11 +66,11 @@
   "devDependencies": {
     "@serverless-devs/core": "^0.1.67-beta.1",
     "@serverless-devs/credential": "^0.0.9-beta.1",
-    "@serverless-devs/engine": "^0.1.4-beta.13",
+    "@serverless-devs/engine": "^0.1.4-beta.14",
     "@serverless-devs/load-application": "^0.0.14-beta.9",
     "@serverless-devs/load-component": "^0.0.8-beta.1",
     "@serverless-devs/logger": "^0.0.5",
-    "@serverless-devs/parse-spec": "^0.0.28-beta.10",
+    "@serverless-devs/parse-spec": "^0.0.28-beta.11",
     "@serverless-devs/registry": "^0.0.10",
     "@serverless-devs/secret": "^0.0.2-beta.5",
     "@serverless-devs/utils": "^0.0.16-beta.1",
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -229,12 +229,18 @@ export const getSchema = async (componentName: string) => {
 // 检查模版是否为3.x版本
 export const checkTemplateVersion = async (program: Command): Promise<boolean> => {
   const { template } = program.optsWithGlobals();
-  const spec = await new ParseSpec(template, { logger }).start();
-  if (!get(spec, 'yaml.use3x')) {
-    logger.tips(`Not support template: ${get(spec, 'yaml.path')}, you can update template to 3.x version`);
-    return false;
+  try {
+    const spec = await new ParseSpec(template, { logger }).start();
+    if (!get(spec, 'yaml.use3x')) {
+      logger.tips(`Not support template: ${get(spec, 'yaml.path')}, you can update template to 3.x version`);
+      return false;
+    }
+    return true;
+  } catch {
+    // fix: env work without s.yaml
+    logger.debug('no s.yaml, env work without s.yaml');
+    return true;
   }
-  return true;
 }
 
 export const mount = async (module: string, program: Command) => {
@@ -248,7 +254,13 @@ export const mountAsync = async (module: string, program: Command) => {
 }
 
 export const getEnvFilePath = async (template: string): Promise<string> => {
-  const spec = await new ParseSpec(template, { logger }).start();
-  const envPath = utils.getAbsolutePath(get(spec, 'yaml.content.env', ENVIRONMENT_FILE_NAME));
-  return envPath;
+  try {
+    const spec = await new ParseSpec(template, { logger }).start();
+    const envPath = utils.getAbsolutePath(get(spec, 'yaml.content.env', ENVIRONMENT_FILE_NAME));
+    return envPath;
+  } catch (error) {
+    logger.debug('no template file, use default env.yaml');
+    // fix: use default env.yaml
+    return utils.getAbsolutePath(ENVIRONMENT_FILE_NAME);
+  }
 }
