Merge pull request #1388 from alexarchambault/config-proxy-keys

Add HTTP proxy-related keys in config module
VirtusLab · Sep 22, 2022 · 29bc194 · 29bc194
2 parents 06f07dc + f6266fe
commit 29bc194
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/modules/config/src/main/scala/scala/cli/config/Key.scala b/modules/config/src/main/scala/scala/cli/config/Key.scala
@@ -7,7 +7,7 @@ import scala.cli.config.Util._
 
 /** A configuration key
   */
-sealed abstract class Key[T] {
+abstract class Key[T] {
 
   /** Key prefix, such as "foo.a" in "foo.a.b" */
   def prefix: Seq[String]

diff --git a/modules/config/src/main/scala/scala/cli/config/Keys.scala b/modules/config/src/main/scala/scala/cli/config/Keys.scala
@@ -19,6 +19,10 @@ object Keys {
 
   val interactive = new Key.BooleanEntry(Seq.empty, "interactive")
 
+  val proxyAddress  = new Key.StringEntry(Seq("httpProxy"), "address")
+  val proxyUser     = new Key.PasswordEntry(Seq("httpProxy"), "user")
+  val proxyPassword = new Key.PasswordEntry(Seq("httpProxy"), "password")
+
   // setting indicating if the global interactive mode was suggested
   val globalInteractiveWasSuggested = new Key.BooleanEntry(Seq.empty, "interactive-was-suggested")
 
@@ -34,7 +38,10 @@ object Keys {
     pgpSecretKeyPassword,
     pgpPublicKey,
     sonatypeUser,
-    sonatypePassword
+    sonatypePassword,
+    proxyAddress,
+    proxyUser,
+    proxyPassword
   )
 
   lazy val map: Map[String, Key[_]] = all.map(e => e.fullName -> e).toMap