Merge pull request #283 from meshcloud/feature/colliehub-version-tag

Feature/colliehub version tag
meshcloud · Mar 13, 2024 · c55f39e · c55f39e
2 parents 50d186a + c170cac
commit c55f39e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/api/CliApiFacadeFactory.ts b/src/api/CliApiFacadeFactory.ts
@@ -117,16 +117,13 @@ export class CliApiFacadeFactory {
   public buildGit() {
     const detectorRunner = this.buildQuietLoggingProcessRunner();
     const detector = new GitCliDetector(detectorRunner);
-
-    const processRunner = this.buildQuietLoggingProcessRunner();
-
     const resultHandler = new ProcessRunnerErrorResultHandler(detector);
     const quietRunner = new ResultHandlerProcessRunnerDecorator(
       new QuietProcessRunner(),
       resultHandler,
     );
 
-    return new GitCliFacade(processRunner, quietRunner);
+    return new GitCliFacade(detectorRunner, quietRunner);
   }
 
   public buildTerragrunt() {

diff --git a/src/api/git/GitCliFacade.ts b/src/api/git/GitCliFacade.ts
@@ -27,6 +27,7 @@ export class GitCliFacade {
       "--tags",
       "--abbrev=0",
     ], { cwd: repoDir });
+
     return result.stdout.trim();
   }
 
@@ -35,6 +36,7 @@ export class GitCliFacade {
       "git",
       "tag",
     ], { cwd: repoDir });
+
     return result.stdout.trim();
   }
 

diff --git a/src/model/CollieHub.ts b/src/model/CollieHub.ts
@@ -66,17 +66,14 @@ export class CollieHub {
       await this.git.checkout(hubCacheDir, collieHubVersion);
       this.config.setProperty("colliehubVersion", collieHubVersion!);
     }
-    try {
-      const allTags = await this.git.getTags(hubCacheGitDir);
-      if (!allTags.includes(collieHubVersion)) {
-        throw new Error(
-          `version tag does not exist, possible are: ${allTags.split("\n")}`,
-        );
-      }
-    } catch (error) {
-      this.logger.error(`${error}`);
+    const allTags = await this.git.getTags(hubCacheGitDir);
+    if (!allTags.includes(collieHubVersion)) {
+      this.logger.error(
+        `version tag does not exist, possible are: ${allTags.split("\n")}`,
+      );
       Deno.exit(1);
     }
+
     //collie-hub version is set by the if block
     await this.git.checkout(hubCacheDir, collieHubVersion!);