From 9f77676a87f23c7d5963bb9aef91f07398706809 Mon Sep 17 00:00:00 2001
From: Ed Schouten <eschouten@apple.com>
Date: Thu, 23 Sep 2021 21:05:38 +0200
Subject: [PATCH] Make go_test() with embedsrcs work (#2936)

Even though there already is testing coverage for go_test() with
embedsrcs using generated files and such, I can't seem to get one of the
most trivial cases to work. The file to be embedded doesn't get placed
in the sandbox during GoCompilePkg.

This change addresses this by explicitly copying the embedsrcs from the
internal source to the external, which seems to make things work
properly.
---
 go/private/rules/test.bzl                      | 1 +
 tests/core/go_library/BUILD.bazel              | 6 ++++++
 tests/core/go_library/embedsrcs_simple_test.go | 6 ++++++
 3 files changed, 13 insertions(+)
 create mode 100644 tests/core/go_library/embedsrcs_simple_test.go

diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl
index a7936ca9e5..9c5b4a6324 100644
--- a/go/private/rules/test.bzl
+++ b/go/private/rules/test.bzl
@@ -76,6 +76,7 @@ def _go_test_impl(ctx):
     )
     external_source = go.library_to_source(go, struct(
         srcs = [struct(files = go_srcs)],
+        embedsrcs = [struct(files = internal_source.embedsrcs)],
         deps = internal_archive.direct + [internal_archive],
         x_defs = ctx.attr.x_defs,
     ), external_library, ctx.coverage_instrumented())
diff --git a/tests/core/go_library/BUILD.bazel b/tests/core/go_library/BUILD.bazel
index 88c27dd8af..13a3956cdf 100644
--- a/tests/core/go_library/BUILD.bazel
+++ b/tests/core/go_library/BUILD.bazel
@@ -140,3 +140,9 @@ go_bazel_test(
     size = "medium",
     srcs = ["embedsrcs_error_test.go"],
 )
+
+go_test(
+    name = "embedsrcs_simple_test",
+    srcs = ["embedsrcs_simple_test.go"],
+    embedsrcs = ["embedsrcs_static/no"],
+)
diff --git a/tests/core/go_library/embedsrcs_simple_test.go b/tests/core/go_library/embedsrcs_simple_test.go
new file mode 100644
index 0000000000..32b3fdee45
--- /dev/null
+++ b/tests/core/go_library/embedsrcs_simple_test.go
@@ -0,0 +1,6 @@
+package embedsrcs_simple_test
+
+import _ "embed"
+
+//go:embed embedsrcs_static/no
+var no []byte