fix(bazel): fix recursive integration test file diffs (#744)

googleapis · Jun 1, 2021 · d4783a6 · d4783a6
1 parent fe4006e
commit d4783a6
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 33 deletions.
diff --git a/rules_bazel/java/integration_test.bzl b/rules_bazel/java/integration_test.bzl
@@ -23,7 +23,7 @@ def _diff_integration_goldens_impl(ctx):
     rm -rf $(find ./ -type f -name 'PlaceholderFile.java')
     rm -r $(find ./ -type d -empty)
     cd ..
-    diff codegen_tmp test/integration/goldens/{api_name}/ > {diff_output}
+    diff -r codegen_tmp test/integration/goldens/{api_name} > {diff_output}
     # Bash `diff` command will return exit code 1 when there are differences between the two
     # folders. So we explicitly `exit 0` after the diff command to avoid build failure.
     exit 0

diff --git a/test/integration/goldens/asset/BUILD.bazel b/test/integration/goldens/asset/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/credentials/BUILD.bazel b/test/integration/goldens/credentials/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/iam/BUILD.bazel b/test/integration/goldens/iam/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/kms/BUILD.bazel b/test/integration/goldens/kms/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/library/BUILD.bazel b/test/integration/goldens/library/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/logging/BUILD.bazel b/test/integration/goldens/logging/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/pubsub/BUILD.bazel b/test/integration/goldens/pubsub/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )
diff --git a/test/integration/goldens/redis/BUILD.bazel b/test/integration/goldens/redis/BUILD.bazel
@@ -2,8 +2,11 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "goldens_files",
-    srcs = glob([
-        "*.java",
-        "gapic_metadata.json",
-    ]),
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "BUILD.bazel",
+            ".*.sw*",
+        ],
+    ),
 )