make it work with gs but don't break tests

ONSdigital · Oct 28, 2021 · e8df355 · e8df355
1 parent 2cd54e0
commit e8df355
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/batch/build.sbt b/batch/build.sbt
@@ -23,11 +23,6 @@ val clouderaDeps = Seq(
 )
 
 val otherDeps = Seq(
-  // "com.databricks" %% "spark-csv" % "1.5.0",
- // "org.apache.spark" %% "spark-network-common" % "3.1.2",
- // "org.apache.spark" %% "spark-streaming" % "3.1.2",
- // "io.delta" % "delta-core_2.12" % "1.0.0",
- // "org.scoverage" %% "scalac-scoverage-plugin" % "1.4.9",
   "com.typesafe" % "config" % "1.4.1",
   "org.elasticsearch" %% "elasticsearch-spark-30" % "7.12.0" excludeAll ExclusionRule(organization = "javax.servlet"),
   "org.rogach" %% "scallop" % "4.0.3",

diff --git a/batch/src/main/scala/uk/gov/ons/addressindex/readers/AddressIndexFileReader.scala b/batch/src/main/scala/uk/gov/ons/addressindex/readers/AddressIndexFileReader.scala
@@ -121,7 +121,7 @@ object AddressIndexFileReader {
   private def resolveAbsolutePath(path: String) = {
     val currentDirectory = new java.io.File(".").getCanonicalPath
 
-    if (path.startsWith("hdfs://")) path
+    if (path.startsWith("hdfs://") || path.startsWith("gs://") ) path
     else {
       if (System.getProperty("os.name").toLowerCase.startsWith("windows")) {
         s"$currentDirectory/$path"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,4 @@
 logLevel := Level.Warn
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
-//addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")