Fix scala_import stamp label (#1231)

Author: liucijus

scala/scala_import.bzl

@@ -26,7 +26,7 @@ def _stamp_jar(ctx, jar):
         arguments = [
             "--nostrip_jar",
             "--target_label",
-            ctx.label.name,
+            str(ctx.label),
             jar.path,
             stamped_file.path,
         ],

test/shell/test_deps.sh

@@ -69,9 +69,20 @@ test_plus_one_ast_analyzer_strict_deps() {
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message_warn}" ${test_target} "--extra_toolchains=//test/toolchains:ast_plus_one_deps_strict_deps_warn" "ne"
 }
 
+test_stamped_target_label_loading() {
+  local test_target="//test_expect_failure/missing_direct_deps/external_deps:java_lib_with_a_transitive_external_dep"
+  local expected_message="buildozer 'add deps @io_bazel_rules_scala_guava//:io_bazel_rules_scala_guava' ${test_target}"
+
+  test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
+    "${expected_message}" ${test_target} \
+    "--extra_toolchains=//test/toolchains:ast_plus_one_deps_unused_deps_error" \
+    "eq"
+}
+
 $runner test_scala_import_library_passes_labels_of_direct_deps
 $runner test_plus_one_deps_only_works_for_java_info_targets
 $runner scala_pb_library_targets_do_not_have_host_deps
 $runner scrooge_library_targets_do_not_have_host_deps
 $runner test_scala_import_expect_failure_on_missing_direct_deps_warn_mode
 $runner test_plus_one_ast_analyzer_strict_deps
+$runner test_stamped_target_label_loading

test_expect_failure/missing_direct_deps/external_deps/BUILD

@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 load("//scala:scala.bzl", "scala_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -37,3 +38,18 @@ scala_library(
     ],
     deps = ["@com_google_guava_guava_21_0_with_file//jar"],
 )
+
+# tests if external jars are stamped with a correct label
+java_library(
+    name = "java_lib_with_unused_external_dep",
+    testonly = True,
+    srcs = ["Empty.java"],
+    deps = ["@io_bazel_rules_scala_guava"],
+)
+
+java_library(
+    name = "java_lib_with_a_transitive_external_dep",
+    testonly = True,
+    srcs = ["UsesExternalDep.java"],
+    deps = [":java_lib_with_unused_external_dep"],
+)

test_expect_failure/missing_direct_deps/external_deps/Empty.java

@@ -0,0 +1,2 @@
+public class Empty {
+}

test_expect_failure/missing_direct_deps/external_deps/UsesExternalDep.java

@@ -0,0 +1,10 @@
+import com.google.common.base.Charsets;
+
+public class UsesExternalDep {
+
+  public void dependsOnExternalDep() {
+    Empty useDirectDep = new Empty();
+    System.out.println(useDirectDep);
+    System.out.println(Charsets.ISO_8859_1);
+  }
+}