@sk8metal/michi-cli 0.4.0 → 0.7.0

package/scripts/utils/__tests__/config-validator.test.ts

@@ -147,6 +147,22 @@ describe('config-validator', () => {
   });
 
   describe('validateForConfluenceSync', () => {
+    let savedConfluenceSpace: string | undefined;
+
+    beforeEach(() => {
+      // 環境変数を保存
+      savedConfluenceSpace = process.env.CONFLUENCE_PRD_SPACE;
+    });
+
+    afterEach(() => {
+      // 環境変数を復元
+      if (savedConfluenceSpace !== undefined) {
+        process.env.CONFLUENCE_PRD_SPACE = savedConfluenceSpace;
+      } else {
+        delete process.env.CONFLUENCE_PRD_SPACE;
+      }
+    });
+
     it('spaces設定がない場合は警告を返す', () => {
       // 環境変数をクリア
       delete process.env.CONFLUENCE_PRD_SPACE;
@@ -236,6 +252,7 @@ describe('config-validator', () => {
     });
 
     it('環境変数CONFLUENCE_PRD_SPACEがある場合は情報メッセージ', () => {
+      // 環境変数を明示的に設定
       process.env.CONFLUENCE_PRD_SPACE = 'Michi';
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
@@ -259,23 +276,48 @@ describe('config-validator', () => {
   });
 
   describe('validateForJiraSync', () => {
+    let savedStoryEnv: string | undefined;
+    let savedSubtaskEnv: string | undefined;
+
     beforeEach(() => {
-      // 環境変数をクリア
+      // 環境変数を保存して削除
+      savedStoryEnv = process.env.JIRA_ISSUE_TYPE_STORY;
+      savedSubtaskEnv = process.env.JIRA_ISSUE_TYPE_SUBTASK;
       delete process.env.JIRA_ISSUE_TYPE_STORY;
       delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
     });
 
-    it('issueTypes.story設定がない場合はエラー', () => {
+    afterEach(() => {
+      // 環境変数を復元
+      if (savedStoryEnv !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_STORY = savedStoryEnv;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_STORY;
+      }
+      if (savedSubtaskEnv !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_SUBTASK = savedSubtaskEnv;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
+      }
+    });
+
+    it('issueTypes.story設定がない場合はエラー（デフォルト設定なし）', () => {
       const configPath = join(testProjectRoot, '.michi/config.json');
+      // issueTypes.storyを明示的にnullに設定してデフォルト値を無効化
       writeFileSync(
         configPath,
         JSON.stringify({
-          jira: {},
+          jira: {
+            issueTypes: {
+              story: null,
+            },
+          },
         }),
       );
 
       const result = validateForJiraSync(testProjectRoot);
 
+      // story=nullの場合、環境変数もないのでエラーになる
       expect(result.valid).toBe(false);
       expect(result.errors.length).toBeGreaterThan(0);
       expect(result.errors[0]).toContain('issueTypes.story');
@@ -301,6 +343,7 @@ describe('config-validator', () => {
     });
 
     it('環境変数JIRA_ISSUE_TYPE_STORYがある場合は情報メッセージ', () => {
+      // 環境変数を明示的に設定
       process.env.JIRA_ISSUE_TYPE_STORY = '10036';
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
@@ -322,7 +365,7 @@ describe('config-validator', () => {
       }
     });
 
-    it('issueTypes.subtask設定がない場合は警告', () => {
+    it('issueTypes.subtask設定がない場合は警告（デフォルト設定なし）', () => {
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
         configPath,
@@ -330,6 +373,7 @@ describe('config-validator', () => {
           jira: {
             issueTypes: {
               story: '10036',
+              subtask: null, // 明示的にnullに設定してデフォルト値を無効化
             },
           },
         }),
@@ -337,6 +381,7 @@ describe('config-validator', () => {
 
       const result = validateForJiraSync(testProjectRoot);
 
+      // subtask=nullの場合、環境変数もないので警告になる
       expect(result.valid).toBe(true);
       expect(result.warnings.length).toBeGreaterThan(0);
       expect(result.warnings[0]).toContain('subtask');
@@ -365,8 +410,23 @@ describe('config-validator', () => {
   });
 
   describe('validateForJiraSyncAsync', () => {
+    let savedEnv: {
+      JIRA_ISSUE_TYPE_STORY?: string;
+      JIRA_ISSUE_TYPE_SUBTASK?: string;
+      ATLASSIAN_URL?: string;
+      ATLASSIAN_EMAIL?: string;
+      ATLASSIAN_API_TOKEN?: string;
+    };
+
     beforeEach(() => {
-      // 環境変数をクリア
+      // 環境変数を保存して削除
+      savedEnv = {
+        JIRA_ISSUE_TYPE_STORY: process.env.JIRA_ISSUE_TYPE_STORY,
+        JIRA_ISSUE_TYPE_SUBTASK: process.env.JIRA_ISSUE_TYPE_SUBTASK,
+        ATLASSIAN_URL: process.env.ATLASSIAN_URL,
+        ATLASSIAN_EMAIL: process.env.ATLASSIAN_EMAIL,
+        ATLASSIAN_API_TOKEN: process.env.ATLASSIAN_API_TOKEN,
+      };
       delete process.env.JIRA_ISSUE_TYPE_STORY;
       delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
       delete process.env.ATLASSIAN_URL;
@@ -374,6 +434,35 @@ describe('config-validator', () => {
       delete process.env.ATLASSIAN_API_TOKEN;
     });
 
+    afterEach(() => {
+      // 環境変数を復元
+      if (savedEnv.JIRA_ISSUE_TYPE_STORY !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_STORY = savedEnv.JIRA_ISSUE_TYPE_STORY;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_STORY;
+      }
+      if (savedEnv.JIRA_ISSUE_TYPE_SUBTASK !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_SUBTASK = savedEnv.JIRA_ISSUE_TYPE_SUBTASK;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
+      }
+      if (savedEnv.ATLASSIAN_URL !== undefined) {
+        process.env.ATLASSIAN_URL = savedEnv.ATLASSIAN_URL;
+      } else {
+        delete process.env.ATLASSIAN_URL;
+      }
+      if (savedEnv.ATLASSIAN_EMAIL !== undefined) {
+        process.env.ATLASSIAN_EMAIL = savedEnv.ATLASSIAN_EMAIL;
+      } else {
+        delete process.env.ATLASSIAN_EMAIL;
+      }
+      if (savedEnv.ATLASSIAN_API_TOKEN !== undefined) {
+        process.env.ATLASSIAN_API_TOKEN = savedEnv.ATLASSIAN_API_TOKEN;
+      } else {
+        delete process.env.ATLASSIAN_API_TOKEN;
+      }
+    });
+
     it('認証情報が未設定の場合は同期版と同じ結果を返す', async () => {
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
@@ -393,6 +482,8 @@ describe('config-validator', () => {
       writeFileSync(
         projectJsonPath,
         JSON.stringify({
+          projectId: 'test-project',
+          projectName: 'Test Project',
           jiraProjectKey: 'TEST',
         }),
       );
@@ -404,6 +495,7 @@ describe('config-validator', () => {
     });
 
     it('認証情報が設定されていて、Issue Type IDが存在する場合は成功', async () => {
+      // 環境変数を明示的に設定
       process.env.ATLASSIAN_URL = 'https://test.atlassian.net';
       process.env.ATLASSIAN_EMAIL = 'test@example.com';
       process.env.ATLASSIAN_API_TOKEN = 'test-token';
@@ -449,16 +541,23 @@ describe('config-validator', () => {
     });
 
     it('認証情報が設定されていて、Issue Type IDが存在しない場合はエラー', async () => {
+      // 環境変数を明示的に設定（既存の環境変数を上書き）
       process.env.ATLASSIAN_URL = 'https://test.atlassian.net';
       process.env.ATLASSIAN_EMAIL = 'test@example.com';
       process.env.ATLASSIAN_API_TOKEN = 'test-token';
       process.env.JIRA_ISSUE_TYPE_STORY = '99999'; // 存在しないID
 
       const configPath = join(testProjectRoot, '.michi/config.json');
+      // issueTypes.storyを環境変数から取得するように空にする
+      // （デフォルト値を使わないように明示的にnullに設定）
       writeFileSync(
         configPath,
         JSON.stringify({
-          jira: {},
+          jira: {
+            issueTypes: {
+              story: null, // 環境変数から取得
+            },
+          },
         }),
       );
 
@@ -499,6 +598,7 @@ describe('config-validator', () => {
     });
 
     it('JIRA API取得に失敗した場合は警告を追加するがエラーにはしない', async () => {
+      // 環境変数を明示的に設定
       process.env.ATLASSIAN_URL = 'https://test.atlassian.net';
       process.env.ATLASSIAN_EMAIL = 'test@example.com';
       process.env.ATLASSIAN_API_TOKEN = 'test-token';

package/scripts/utils/__tests__/env-config.test.ts

@@ -185,7 +185,6 @@ URL_WITH_PARAMS=https://example.com?param1=value1&param2=value2
         ['ATLASSIAN_API_TOKEN', 'token123'],
         ['GITHUB_ORG', 'myorg'],
         ['GITHUB_TOKEN', 'ghp_xxx'],
-        ['GITHUB_REPO', 'myorg/myrepo'],
         ['CONFLUENCE_PRD_SPACE', 'PRD'],
         ['CONFLUENCE_QA_SPACE', 'QA'],
         ['CONFLUENCE_RELEASE_SPACE', 'RELEASE'],
@@ -217,7 +216,6 @@ ATLASSIAN_API_TOKEN=test_token_123
 # GitHub設定
 GITHUB_ORG=testorg
 GITHUB_TOKEN=ghp_test123
-GITHUB_REPO=testorg/testrepo
 
 # Confluence共有スペース
 CONFLUENCE_PRD_SPACE=PRD

package/scripts/utils/__tests__/multi-repo-validator.test.ts

@@ -0,0 +1,335 @@
+/**
+ * Multi-Repo バリデーション関数のテスト
+ * Task 1.2: バリデーション関数の実装
+ */
+
+import { describe, it, expect } from 'vitest';
+import {
+  validateProjectName,
+  validateJiraKey,
+  validateRepositoryUrl,
+} from '../multi-repo-validator';
+
+describe('validateProjectName', () => {
+  describe('正常ケース', () => {
+    it('有効なプロジェクト名を受け入れる', () => {
+      const validNames = [
+        'my-project',
+        'プロジェクト名',
+        'project_v2',
+        'My Project 123',
+        'a',
+        'a'.repeat(100),
+      ];
+
+      validNames.forEach((name) => {
+        const result = validateProjectName(name);
+        expect(result.isValid).toBe(true);
+        expect(result.errors).toHaveLength(0);
+      });
+    });
+  });
+
+  describe('パストラバーサル対策', () => {
+    it('スラッシュ（/）を含む場合はエラー', () => {
+      const result = validateProjectName('project/name');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain path traversal characters (/, \\)',
+      );
+    });
+
+    it('バックスラッシュ（\\）を含む場合はエラー', () => {
+      const result = validateProjectName('project\\name');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain path traversal characters (/, \\)',
+      );
+    });
+
+    it('../を含む場合はエラー', () => {
+      const result = validateProjectName('../etc/passwd');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain path traversal characters (/, \\)',
+      );
+    });
+
+    it('/を含む場合はエラー', () => {
+      const result = validateProjectName('/etc/passwd');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain path traversal characters (/, \\)',
+      );
+    });
+  });
+
+  describe('相対パス対策', () => {
+    it('ドット（.）単独の場合はエラー', () => {
+      const result = validateProjectName('.');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not be relative path components (., ..)',
+      );
+    });
+
+    it('ダブルドット（..）単独の場合はエラー', () => {
+      const result = validateProjectName('..');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not be relative path components (., ..)',
+      );
+    });
+  });
+
+  describe('制御文字対策', () => {
+    it('ヌル文字（\\x00）を含む場合はエラー', () => {
+      const result = validateProjectName('project\x00name');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain control characters',
+      );
+    });
+
+    it('タブ文字（\\t）を含む場合はエラー', () => {
+      const result = validateProjectName('project\tname');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain control characters',
+      );
+    });
+
+    it('改行文字（\\n）を含む場合はエラー', () => {
+      const result = validateProjectName('project\nname');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain control characters',
+      );
+    });
+
+    it('改行文字（\\r）を含む場合はエラー', () => {
+      const result = validateProjectName('project\rname');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain control characters',
+      );
+    });
+
+    it('エスケープ文字（\\x1B）を含む場合はエラー', () => {
+      const result = validateProjectName('project\x1Bname');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain control characters',
+      );
+    });
+
+    it('削除文字（\\x7F）を含む場合はエラー', () => {
+      const result = validateProjectName('project\x7Fname');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must not contain control characters',
+      );
+    });
+  });
+
+  describe('長さチェック', () => {
+    it('101文字以上の場合はエラー', () => {
+      const longName = 'a'.repeat(101);
+      const result = validateProjectName(longName);
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must be between 1 and 100 characters',
+      );
+    });
+
+    it('空文字列の場合はエラー', () => {
+      const result = validateProjectName('');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Project name must be between 1 and 100 characters',
+      );
+    });
+
+    it('100文字の場合は正常', () => {
+      const name = 'a'.repeat(100);
+      const result = validateProjectName(name);
+      expect(result.isValid).toBe(true);
+    });
+
+    it('1文字の場合は正常', () => {
+      const result = validateProjectName('a');
+      expect(result.isValid).toBe(true);
+    });
+  });
+});
+
+describe('validateJiraKey', () => {
+  describe('正常ケース', () => {
+    it('2-10文字の大文字英字を受け入れる', () => {
+      const validKeys = ['AB', 'PROJ', 'TICKET', 'ABCDEFGHIJ'];
+
+      validKeys.forEach((key) => {
+        const result = validateJiraKey(key);
+        expect(result.isValid).toBe(true);
+        expect(result.errors).toHaveLength(0);
+      });
+    });
+  });
+
+  describe('異常ケース', () => {
+    it('小文字を含む場合はエラー', () => {
+      const result = validateJiraKey('abc');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+
+    it('1文字の場合はエラー', () => {
+      const result = validateJiraKey('A');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+
+    it('11文字以上の場合はエラー', () => {
+      const result = validateJiraKey('ABCDEFGHIJK');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+
+    it('数字を含む場合はエラー', () => {
+      const result = validateJiraKey('ABC123');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+
+    it('空文字列の場合はエラー', () => {
+      const result = validateJiraKey('');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+
+    it('ハイフンを含む場合はエラー', () => {
+      const result = validateJiraKey('ABC-DEF');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+
+    it('スペースを含む場合はエラー', () => {
+      const result = validateJiraKey('ABC DEF');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'JIRA key must be 2-10 uppercase letters',
+      );
+    });
+  });
+});
+
+describe('validateRepositoryUrl', () => {
+  describe('正常ケース', () => {
+    it('有効なGitHub HTTPS URLを受け入れる', () => {
+      const validUrls = [
+        'https://github.com/owner/repo',
+        'https://github.com/my-org/my-repo',
+        'https://github.com/user123/project-name',
+      ];
+
+      validUrls.forEach((url) => {
+        const result = validateRepositoryUrl(url);
+        expect(result.isValid).toBe(true);
+        expect(result.errors).toHaveLength(0);
+      });
+    });
+  });
+
+  describe('異常ケース', () => {
+    it('GitLab URLの場合はエラー', () => {
+      const result = validateRepositoryUrl(
+        'https://gitlab.com/owner/repo',
+      );
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Repository URL must be in GitHub format: https://github.com/{owner}/{repo}',
+      );
+    });
+
+    it('HTTP URLの場合はエラー', () => {
+      const result = validateRepositoryUrl('http://github.com/owner/repo');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Repository URL must use HTTPS protocol',
+      );
+    });
+
+    it('SSH URLの場合はエラー', () => {
+      const result = validateRepositoryUrl('git@github.com:owner/repo.git');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Repository URL must be in GitHub format: https://github.com/{owner}/{repo}',
+      );
+    });
+
+    it('不完全なURLの場合はエラー', () => {
+      const result = validateRepositoryUrl('https://github.com/owner');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Repository URL must be in GitHub format: https://github.com/{owner}/{repo}',
+      );
+    });
+
+    it('空文字列の場合はエラー', () => {
+      const result = validateRepositoryUrl('');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain('Repository URL is empty');
+    });
+
+    it('無効なURL形式の場合はエラー', () => {
+      const result = validateRepositoryUrl('not-a-url');
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain('Repository URL format is invalid');
+    });
+
+    it('.git拡張子を含む場合はエラー', () => {
+      const result = validateRepositoryUrl(
+        'https://github.com/owner/repo.git',
+      );
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain(
+        'Repository URL must not include .git extension',
+      );
+    });
+  });
+
+  describe('プレースホルダー検出', () => {
+    it('プレースホルダーURLの場合はエラー', () => {
+      const placeholders = [
+        'https://github.com/your-org/your-repo',
+        'https://github.com/owner/repo-name',
+      ];
+
+      placeholders.forEach((url) => {
+        const result = validateRepositoryUrl(url);
+        if (
+          url.includes('your-org') ||
+          url.includes('your-repo') ||
+          url.includes('repo-name')
+        ) {
+          expect(result.isValid).toBe(false);
+          expect(result.errors).toContain(
+            'Repository URL contains placeholder values',
+          );
+        }
+      });
+    });
+  });
+});