From 3cb41e0ccc413ba6eeeeaa577287425ab8b8aaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pra=C5=BCak?= <pprazak@virtuslab.com>
Date: Mon, 4 Dec 2023 09:58:29 +0100
Subject: [PATCH] Address code review issues

---
 scripts/Packages.scala | 14 +++++++-------
 scripts/common.scala   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/Packages.scala b/scripts/Packages.scala
index c679bb612..c650571bd 100644
--- a/scripts/Packages.scala
+++ b/scripts/Packages.scala
@@ -35,15 +35,15 @@ import scala.util.control.NonFatal
     "aws-iam", // aws-iam:index:Account: property name "id" is reserved
     "digitalocean", // digitalocean:index/reservedIp:ReservedIp: property name "urn"
     // kubernetes:helm.sh/v3:Chart: property name "urn" is reserved
-    // Exception in thread "main" besom.codegen.TypeMapperError: 
+    // Exception in thread "main" besom.codegen.TypeMapperError:
     // Failed to map type: 'NamedType(/kubernetes/v4.4.0/schema.json#/resources/kubernetes:core%2Fv1:ConfigMap,None)', asArgsType: false
     "eks",
     "iosxe", // schemaOnlyProvider does not implement runtime operation InitLogging
     // error: error binding resource kubernetes:helm.sh/v3:Chart: failed to bind properties for kubernetes:helm.sh/v3:Chart: property name "urn" is reserved
-    // Exception in thread "main" besom.codegen.GeneralCodegenException: 
+    // Exception in thread "main" besom.codegen.GeneralCodegenException:
     // Failed to download schema 'pulumi --logtostderr package get-schema kubernetes@4.5.5' into '.out/schemas/kubernetes/4.5.5/schema.json'
     "kubernetes",
-    "nuage", // nuage:aws:Repository: property name "id" is reserved
+    "nuage" // nuage:aws:Repository: property name "id" is reserved
   )
 
   val brokenPackages = pluginDownloadProblemPackages ++ codegenProblemPackages
@@ -73,7 +73,7 @@ import scala.util.control.NonFatal
           ).call()
         catch
           case NonFatal(_) =>
-            Progress.failure(s"Code generation failed for provider '${name}' version '${version}'")
+            Progress.fail(s"Code generation failed for provider '${name}' version '${version}'")
         finally Progress.end
       }
     }
@@ -97,7 +97,7 @@ import scala.util.control.NonFatal
             .call(stdout = logFile, stderr = logFile)
         catch
           case NonFatal(_) =>
-            Progress.failure(s"Publish failed for provider '${name}' version '${version}'")
+            Progress.fail(s"Publish failed for provider '${name}' version '${version}'")
         finally Progress.end
       }
     }
@@ -119,7 +119,7 @@ import scala.util.control.NonFatal
           println(s"Successfully published provider '${name}' version '${version}'")
         catch
           case NonFatal(_) =>
-            Progress.failure(s"Publish failed for provider '${name}' version '${version}'")
+            Progress.fail(s"Publish failed for provider '${name}' version '${version}'")
         finally Progress.end
       }
     }
@@ -203,7 +203,7 @@ import scala.util.control.NonFatal
               Right(PackageMetadata(m.name, m.version).withUrl(m.repo_url))
 
         metadata match
-          case Left(error) => Progress.failure(error)
+          case Left(error) => Progress.fail(error)
           case Right(value) =>
             os.write.over(targetPath / s"${packageName}.metadata.json", value.toJson, createFolders = true)
 
diff --git a/scripts/common.scala b/scripts/common.scala
index 299fce17b..c406747f4 100644
--- a/scripts/common.scala
+++ b/scripts/common.scala
@@ -161,11 +161,11 @@ def withProgress[A](title: String, total: Int)(f: Progress ?=> A): A =
 
   def elapsed(from: Temporal, to: Temporal = LocalTime.now()): String =
     Duration.fromNanos(java.time.Duration.between(from, to).toNanos) match
-      case d if d.toHours > 0   => f"${d.toHours} h ${d.toMinutes % 60} m ${d.toSeconds % 60} s"
-      case d if d.toMinutes > 0 => f"${d.toMinutes} m ${d.toSeconds % 60} s"
-      case d if d.toSeconds > 0 => f"${d.toSeconds} s ${d.toMillis % 1000} ms"
-      case d if d.toMillis > 0  => f"${d.toMillis} ms ${d.toMicros % 1000} µs"
-      case d                    => f"${d.toMicros} µs"
+      case d if d.toHours > 0   => s"${d.toHours} h ${d.toMinutes % 60} m ${d.toSeconds % 60} s"
+      case d if d.toMinutes > 0 => s"${d.toMinutes} m ${d.toSeconds % 60} s"
+      case d if d.toSeconds > 0 => s"${d.toSeconds} s ${d.toMillis % 1000} ms"
+      case d if d.toMillis > 0  => s"${d.toMillis} ms ${d.toMicros % 1000} µs"
+      case d                    => s"${d.toMicros} µs"
 
   def end(lbl: String, start: Temporal, end: Temporal) =
     if !failed.contains(lbl)
@@ -189,11 +189,11 @@ def withProgress[A](title: String, total: Int)(f: Progress ?=> A): A =
   finally
     println()
     println(s"Successes [${succeeded.size}/$total]:")
-    succeeded.toSeq.sortBy(_._1).foreach((name, msg) => println(s"  - $name: $msg"))
+    succeeded.toVector.sortBy(_._1).foreach((name, msg) => println(s"  - $name: $msg"))
     println()
     if failed.nonEmpty then
       println(s"Failures [${failed.size}/$total]:")
-      failed.toSeq.sortBy(_._1).foreach((name, error) => println(s"  - $name: $error"))
+      failed.toVector.sortBy(_._1).foreach((name, error) => println(s"  - $name: $error"))
     println()
     println(s"Total [${succeeded.size}/$total] time: ${elapsed(first)}")
     println()