Add scrooge version tests back

bazelbuild · Oct 8, 2020 · 70d00c6 · 70d00c6
1 parent 58cbd21
commit 70d00c6
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 97 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -27,7 +27,7 @@ scala_repositories(fetch_sources = True)
 
 load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
 load("//scala:scala_maven_import_external.bzl", "scala_maven_import_external")
-load("//twitter_scrooge:twitter_scrooge.bzl", "scrooge_scala_library", "twitter_scrooge")
+load("//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
 
 twitter_scrooge()
 

diff --git a/test_version.sh b/test_version.sh
@@ -7,16 +7,10 @@ scala_2_12_version="2.12.11"
 
 SCALA_VERSION_DEFAULT=$scala_2_11_version
 SCALA_VERSION_SHAS_DEFAULT=$scala_2_11_shas
-TWITTER_SCROOGE_VERSION_SHAS_DEFAULT=''
-TWITTER_SCROOGE_EXTRA_IMPORTS_DEFAULT=''
-TWITTER_SCROOGE_BINDINGS_DEFAULT='twitter_scrooge(scala_version)'
+TWITTER_SCROOGE_ARTIFACTS='twitter_scrooge_artifacts={}'
 
 run_in_test_repo() {
   local SCALA_VERSION=${SCALA_VERSION:-$SCALA_VERSION_DEFAULT}
-  local SCALA_VERSION_SHAS=${SCALA_VERSION_SHAS:-$SCALA_VERSION_SHAS_DEFAULT}
-  local TWITTER_SCROOGE_BINDINGS=${TWITTER_SCROOGE_BINDINGS:-$TWITTER_SCROOGE_BINDINGS_DEFAULT}
-  local TWITTER_SCROOGE_EXTRA_IMPORTS=${TWITTER_SCROOGE_EXTRA_IMPORTS:-$TWITTER_SCROOGE_EXTRA_IMPORTS_DEFAULT}
-  local TWITTER_SCROOGE_VERSION_SHAS=${TWITTER_SCROOGE_VERSION_SHAS:-$TWITTER_SCROOGE_VERSION_SHAS_DEFAULT}
 
   local test_command=$1
   local test_dir_prefix=$2
@@ -31,9 +25,7 @@ run_in_test_repo() {
 
   sed \
       -e "s/\${scala_version}/$SCALA_VERSION/" \
-      -e "s%\${twitter_scrooge_bindings}%$TWITTER_SCROOGE_BINDINGS%" \
-      -e "s%\${twitter_scrooge_extra_imports}%$TWITTER_SCROOGE_EXTRA_IMPORTS%" \
-      -e "s%\${twitter_scrooge_version_shas}%$TWITTER_SCROOGE_VERSION_SHAS%" \
+      -e "s%\${twitter_scrooge_artifacts}%$TWITTER_SCROOGE_ARTIFACTS%" \
       WORKSPACE.template >> $NEW_TEST_DIR/WORKSPACE
 
   cd $NEW_TEST_DIR
@@ -61,23 +53,59 @@ test_scala_version() {
 test_twitter_scrooge_versions() {
   local version_under_test=$1
 
-  local TWITTER_SCROOGE_VERSION_SHAS='twitter_scrooge_version_shas= {\
-  "18.6.0": { \
-    "scrooge-generator": "0f0027e815e67985895a6f3caa137f02366ceeea4966498f34fb82cabb11dee6", \
-    "scrooge-core": "00351f73b555d61cfe7320ef3b1367a9641e694cfb8dfa8a733cfcf49df872e8", \
-    "util-core": "5336da4846dfc3db8ffe5ae076be1021828cfee35aa17bda9af461e203cf265c", \
-    "util-logging": "73ddd61cedabd4dab82b30e6c52c1be6c692b063b8ba310d716ead9e3b4e9267" \
-  }, \
-  "20.5.0": { \
-    "scrooge-generator": "a4cf7dd773e8c2ee0ccad52be1ebd4ae8a9defcbc9be28e370e44a46a34a005a", \
-    "scrooge-core": "b1aa0f3b9f10287644f1edc47b79a67b287656d97fbd157a806d69c82b27e21d", \
-    "util-core": "253cc631d3766e978bafd60dcee6976f7cf46d80106882c7b55b969ab14e3d7c", \
-    "util-logging": "77782dad82e4066a2b8aa1aa6c07c8c2d111f65365833a88592e303464a98654" \
-  } \
+  local TWITTER_SCROOGE_ARTIFACTS_18_6_0='twitter_scrooge_artifacts={ \
+    "io_bazel_rules_scala_scrooge_core": {\
+        "artifact": "com.twitter:scrooge-core_2.11:18.6.0",\
+        "sha256": "00351f73b555d61cfe7320ef3b1367a9641e694cfb8dfa8a733cfcf49df872e8",\
+    },\
+    "io_bazel_rules_scala_scrooge_generator": {\
+        "artifact": "com.twitter:scrooge-generator_2.11:18.6.0",\
+        "sha256": "0f0027e815e67985895a6f3caa137f02366ceeea4966498f34fb82cabb11dee6",\
+        "runtime_deps": [\
+            "@io_bazel_rules_scala_guava",\
+            "@io_bazel_rules_scala_mustache",\
+        ],\
+    },\
+    "io_bazel_rules_scala_util_core": {\
+        "artifact": "com.twitter:util-core_2.11:18.6.0",\
+        "sha256": "5336da4846dfc3db8ffe5ae076be1021828cfee35aa17bda9af461e203cf265c",\
+    },\
+    "io_bazel_rules_scala_util_logging": {\
+        "artifact": "com.twitter:util-logging_2.11:18.6.0",\
+        "sha256": "73ddd61cedabd4dab82b30e6c52c1be6c692b063b8ba310d716ead9e3b4e9267",\
+    },\
 }'
 
-  local TWITTER_SCROOGE_EXTRA_IMPORTS="load(\"//twitter_scrooge:twitter_scrooge_bindings.bzl\", \"twitter_scrooge_with_custom_dep_version\")"
-  local TWITTER_SCROOGE_BINDINGS="twitter_scrooge_with_custom_dep_version(\"${version_under_test}\", scala_version, twitter_scrooge_version_shas)"
+  local TWITTER_SCROOGE_ARTIFACTS_20_5_0='twitter_scrooge_artifacts={ \
+    "io_bazel_rules_scala_scrooge_core": {\
+        "artifact": "com.twitter:scrooge-core_2.11:20.5.0",\
+        "sha256": "b1aa0f3b9f10287644f1edc47b79a67b287656d97fbd157a806d69c82b27e21d",\
+    },\
+    "io_bazel_rules_scala_scrooge_generator": {\
+        "artifact": "com.twitter:scrooge-generator_2.11:20.5.0",\
+        "sha256": "a4cf7dd773e8c2ee0ccad52be1ebd4ae8a9defcbc9be28e370e44a46a34a005a",\
+        "runtime_deps": [\
+            "@io_bazel_rules_scala_guava",\
+            "@io_bazel_rules_scala_mustache",\
+        ],\
+    },\
+    "io_bazel_rules_scala_util_core": {\
+        "artifact": "com.twitter:util-core_2.11:20.5.0",\
+        "sha256": "253cc631d3766e978bafd60dcee6976f7cf46d80106882c7b55b969ab14e3d7c",\
+    },\
+    "io_bazel_rules_scala_util_logging": {\
+        "artifact": "com.twitter:util-logging_2.11:20.5.0",\
+        "sha256": "77782dad82e4066a2b8aa1aa6c07c8c2d111f65365833a88592e303464a98654",\
+    },\
+}'
+
+  if [ "18.6.0" = $version_under_test ]; then
+    TWITTER_SCROOGE_ARTIFACTS=$TWITTER_SCROOGE_ARTIFACTS_18_6_0
+  elif [ "20.5.0" = $version_under_test ]; then
+    TWITTER_SCROOGE_ARTIFACTS=$TWITTER_SCROOGE_ARTIFACTS_20_5_0
+  else
+    echo "Unknown Twitter Scrooge version given $version_under_test"
+  fi
 
   run_in_test_repo "test //twitter_scrooge/... --test_arg=${version_under_test}" "scrooge_version"
 }
@@ -95,5 +123,5 @@ runner=$(get_test_runner "${1:-local}")
 $runner test_scala_version "${scala_2_11_version}"
 $runner test_scala_version "${scala_2_12_version}"
 
-#$runner test_twitter_scrooge_versions "18.6.0"
-#$runner test_twitter_scrooge_versions "20.5.0"
+$runner test_twitter_scrooge_versions "18.6.0"
+$runner test_twitter_scrooge_versions "20.5.0"
diff --git a/test_version/WORKSPACE.template b/test_version/WORKSPACE.template
@@ -30,11 +30,9 @@ scala_repositories(
     fetch_sources = True
 )
 
-load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge", "scrooge_scala_library")
-
-${twitter_scrooge_version_shas}
-${twitter_scrooge_extra_imports}
-${twitter_scrooge_bindings}
+load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
+${twitter_scrooge_artifacts}
+twitter_scrooge(scala_version, overriden_artifacts = twitter_scrooge_artifacts)
 
 load("@io_bazel_rules_scala//tut_rule:tut.bzl", "tut_repositories")
 

diff --git a/test_version/version_specific_tests_dir/twitter_scrooge/twitter_scrooge_bindings.bzl b/test_version/version_specific_tests_dir/twitter_scrooge/twitter_scrooge_bindings.bzl