review comments

Author: rnro

Plugins/GRPCProtobufGeneratorCommand/CommandPluginError.swift

@@ -23,8 +23,8 @@ enum CommandPluginError: Error {
   case conflictingFlags(String, String)
   case generationFailure(
     errorDescription: String,
-    executable: String?,
-    arguments: [String]?,
+    executable: String,
+    arguments: [String],
     stdErr: String?
   )
   case tooManyParameterSeparators
@@ -46,16 +46,16 @@ extension CommandPluginError: CustomStringConvertible {
     case .conflictingFlags(let flag1, let flag2):
       return "Provided flags conflict: '\(flag1)' and '\(flag2)'."
     case .generationFailure(let errorDescription, let executable, let arguments, let stdErr):
-      var message = "Code generation failed with: \(errorDescription)."
-      if let executable {
-        message += "\n\tExecutable: \(executable)"
-      }
-      if let arguments {
-        message += "\n\tArguments: \(arguments.joined(separator: " "))"
-      }
+      var message = """
+        Code generation failed with: \(errorDescription).
+        \tExecutable: \(executable)
+        \tArguments: \(arguments.joined(separator: " "))
+        """
       if let stdErr {
-        message += "\n\tprotoc error output:"
-        message += "\n\t\(stdErr)"
+        message += """
+          \n\tprotoc error output:
+          \t\(stdErr)
+          """
       }
       return message
     case .tooManyParameterSeparators:

Plugins/GRPCProtobufGeneratorCommand/Plugin.swift

@@ -129,7 +129,7 @@ struct GRPCProtobufGeneratorCommandPlugin {
         dryRun: commandConfig.dryRun
       )
 
-      if !commandConfig.dryRun {
+      if !commandConfig.dryRun, commandConfig.verbose {
         Stderr.print("Generated gRPC Swift files for \(inputFiles.joined(separator: ", ")).")
       }
     }
@@ -152,7 +152,7 @@ struct GRPCProtobufGeneratorCommandPlugin {
         dryRun: commandConfig.dryRun
       )
 
-      if !commandConfig.dryRun {
+      if !commandConfig.dryRun, commandConfig.verbose {
         Stderr.print(
           "Generated protobuf message Swift files for \(inputFiles.joined(separator: ", "))."
         )
@@ -212,21 +212,23 @@ func executeProtocInvocation(
 
   try printProtocOutput(outputPipe, verbose: verbose)
 
-  guard process.terminationReason == .exit && process.terminationStatus == 0 else {
-    let stdErr: String?
-    if let errorData = try errorPipe.fileHandleForReading.readToEnd() {
-      stdErr = String(decoding: errorData, as: UTF8.self)
-    } else {
-      stdErr = nil
-    }
-    let problem = "\(process.terminationReason):\(process.terminationStatus)"
-    throw CommandPluginError.generationFailure(
-      errorDescription: problem,
-      executable: executableURL.absoluteStringNoScheme,
-      arguments: arguments,
-      stdErr: stdErr
-    )
+  if process.terminationReason == .exit && process.terminationStatus == 0 {
+    return
+  }
+
+  let stdErr: String?
+  if let errorData = try errorPipe.fileHandleForReading.readToEnd() {
+    stdErr = String(decoding: errorData, as: UTF8.self)
+  } else {
+    stdErr = nil
   }
+  let problem = "\(process.terminationReason):\(process.terminationStatus)"
+  throw CommandPluginError.generationFailure(
+    errorDescription: problem,
+    executable: executableURL.absoluteStringNoScheme,
+    arguments: arguments,
+    stdErr: stdErr
+  )
 
   return
 }