Implemented small improvements based on feedback (#16)

mrhamburg · Jan 11, 2022 · 78847de · 78847de
1 parent 349aeae
commit 78847de
Show file tree

Hide file tree

Showing 9 changed files with 170 additions and 151 deletions.
diff --git a/Airbyte.Cdk/InitCli.cs b/Airbyte.Cdk/InitCli.cs
@@ -30,6 +30,7 @@ await AnsiConsole.Status()
 
                         await CheckDotnet();
                         await CheckDocker();
+                        await CheckIfDockerIsRunning();
                     });
 
                 string connectorname = AnsiConsole.Ask<string>("Connector name:");
@@ -52,9 +53,9 @@ await AnsiConsole.Status()
                 var location = Path.Combine(MoveToUpperPath(Assembly.GetExecutingAssembly().Location, 5, true), "airbyte-integrations", "connectors", $"{connectortype.Split('-')[0]}-{connectorname}");
                 if (location.Any(Path.GetInvalidPathChars().Contains))
                     throw new Exception($"Path is invalid: " + location);
-                //if (!AnsiConsole.Confirm("Is this destination correct? " + location))
-                //    return;
 
+                if (Directory.Exists(location))
+                    throw new Exception($"Destination path already exists: {location}");
                 var dir = Directory.CreateDirectory(location);
 
                 await AnsiConsole.Status()
@@ -318,6 +319,25 @@ private static async Task CheckDocker()
             }
         }
 
+        private static async Task CheckIfDockerIsRunning()
+        {
+            ToConsole(Check, "Validating Docker is running...");
+            var stdOutBuffer = new StringBuilder();
+            var stdOutError = new StringBuilder();
+            var cmd = Cli.Wrap("docker")
+                .WithStandardErrorPipe(PipeTarget.ToStringBuilder(stdOutError))
+                .WithValidation(CommandResultValidation.None)
+                .WithArguments("version") | stdOutBuffer;
+            await cmd.ExecuteAsync();
+            if(stdOutError.Length == 0)
+                ToConsole(Check, "Docker is running...", Emoji.Known.CheckMark);
+            else
+            {
+                ToConsole(Check, "Docker is running...", Emoji.Known.CrossMark);
+                throw new Exception("Docker is currently not running, please start docker first!");
+            }
+        }
+
         private static void ToConsole(params string[] lines) => AnsiConsole.MarkupLine(string.Concat(lines));
     }
 }
diff --git a/Airbyte.Cdk/Publish.cs b/Airbyte.Cdk/Publish.cs
@@ -43,6 +43,7 @@ public static async Task Process(PublishOptions options)
                         throw new Exception("Could not acquire semver from changelog");
 
                     await CheckDocker();
+                    await CheckIfDockerIsRunning();
                     if (!await TryBuildAndPush(connectorpath, semver, image, !options.IsBuildOnly))
                         throw new Exception("Failed to build and publish connector image");   
                 }
@@ -112,6 +113,10 @@ private static string[] GetConnectorsFromChanges(string[] filechanges) =>
             filechanges.Where(x => x.StartsWith("airbyte-integrations/connectors/"))
                 .Select(x => x.Split("connectors/").Last().Split("/").First()).Distinct().ToArray();
 
+        /// <summary>
+        /// TODO: this should be a generic check, InitCli has the same implementation
+        /// </summary>
+        /// <exception cref="Exception"></exception>
         private static async Task CheckDocker()
         {
             ToConsole(Check, "Validating Docker...");
@@ -126,6 +131,29 @@ private static async Task CheckDocker()
                 throw new Exception("Could not find docker, please download at: https://docs.docker.com/get-docker/");
             }
         }
+
+        /// <summary>
+        /// TODO: this should be a generic check, InitCli has the same implementation
+        /// </summary>
+        /// <exception cref="Exception"></exception>
+        private static async Task CheckIfDockerIsRunning()
+        {
+            ToConsole(Check, "Validating Docker is running...");
+            var stdOutBuffer = new StringBuilder();
+            var stdOutError = new StringBuilder();
+            var cmd = Cli.Wrap("docker")
+                .WithStandardErrorPipe(PipeTarget.ToStringBuilder(stdOutError))
+                .WithValidation(CommandResultValidation.None)
+                .WithArguments("version") | stdOutBuffer;
+            await cmd.ExecuteAsync();
+            if(stdOutError.Length == 0)
+                ToConsole(Check, "Docker is running...", Emoji.Known.CheckMark);
+            else
+            {
+                ToConsole(Check, "Docker is running...", Emoji.Known.CrossMark);
+                throw new Exception("Docker is currently not running, please start docker first!");
+            }
+        }
 
         private static async Task<bool> TryBuildAndPush(string folderpath, string semver, string connectorname,
             bool pushimages)