Skip to content

Commit f700331

Browse files
chanseokohchanseokoh
authored
Merge branch 'main' into default-memory-settings
2 parents 46e6099 + 00aab45 commit f700331

5 files changed

Lines changed: 51 additions & 116 deletions

File tree

‎rules_bazel/java/integration_test.bzl‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎scripts/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package(default_visibility = ["//test/integration:__pkg__"])
22

3-
exports_files(["diff_gen_and_golden.sh"])
3+
exports_files(["diff_gen_and_golden.sh", "update_golden.sh"])

‎scripts/diff_gen_and_golden.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ RAW_SRCJAR=$( find . -name '*_java_gapic_srcjar_raw.srcjar' )
88
mkdir unpacked src
99
cd unpacked
1010
unzip -q -c "../${RAW_SRCJAR}" temp-codegen.srcjar | jar x
11-
cp -rf src/main/java/* ../src
12-
cp -rf src/test/java/* ../src
13-
[ -d proto ] && cp -rf proto/src/main/java/* ../src
11+
cp -r src/main/java/* ../src
12+
cp -r src/test/java/* ../src
13+
[ -d proto ] && cp -r proto/src/main/java/* ../src
1414
cd ..
1515

1616
# Remove unneeded non-Java files, like MANIFEST

‎scripts/update_golden.sh‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
3+
set -o errexit
4+
5+
API_NAME=$1
6+
RAW_SRCJAR=$( find . -name '*_java_gapic_srcjar_raw.srcjar' )
7+
8+
rm -rf srcjar_unpacked
9+
mkdir srcjar_unpacked
10+
cd srcjar_unpacked
11+
UNPACK_DIR=$PWD
12+
unzip -q -c "../${RAW_SRCJAR}" temp-codegen.srcjar | jar x
13+
14+
cd ${BUILD_WORKSPACE_DIRECTORY}/test/integration/goldens/${API_NAME}
15+
16+
# clear out existing Java and JSON files.
17+
find . -name '*.java' -delete
18+
find . -name 'gapic_metadata.json' -delete
19+
20+
cp -r ${UNPACK_DIR}/src/main/java/* .
21+
cp -r ${UNPACK_DIR}/src/test/java/* .
22+
[ -d ${UNPACK_DIR}/proto ] && cp -r ${UNPACK_DIR}/proto/src/main/java/* .
23+
24+
find . -name 'PlaceholderFile.java' -delete
25+
find . -type d -empty -delete

‎test/integration/BUILD.bazel‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ load(
99
"java_gapic_assembly_gradle_pkg",
1010
)
1111
load("@rules_gapic//:gapic.bzl", "proto_library_with_info")
12-
load("//:rules_bazel/java/integration_test.bzl", "golden_update")
1312
load("@rules_proto//proto:defs.bzl", "proto_library")
1413

1514
package(default_visibility = ["//visibility:public"])
@@ -18,30 +17,26 @@ package(default_visibility = ["//visibility:public"])
1817
# Integration Test Rules
1918
####################################################
2019

21-
INTEGRATION_TEST_LIBRARIES = [
22-
"asset", # Basic case.
23-
"credentials", # Check that the capital name edge case is handled.
24-
"iam", # Mixin-only special-case API can build on its own.
25-
"kms", # Mixins, with an override in the proto file.
26-
"pubsub", # Special=case handling for "_deleted-topic_" resource name patterns.
27-
"logging", # Java package remapping in gapic.yaml.
28-
"redis", # Has a gapic.yaml.
29-
"storage", # Exercises storage-specific edge cases.
30-
"library", # No gRPC service config.
31-
"compute", # REGAPIC test.
32-
]
33-
34-
# Keys must match the values in INTEGRATION_TEST_LIBRARIES above.
3520
API_GAPIC_TARGETS = {
21+
# basic case
3622
"asset": "@com_google_googleapis//google/cloud/asset/v1:asset_java_gapic",
23+
# Check that the capital name edge case is handled.
3724
"credentials": "@com_google_googleapis//google/iam/credentials/v1:credentials_java_gapic",
38-
"iam": ":iam_java_gapic", # Googleapis' LRO does not have a Java Gapic.
39-
"kms": ":kms_java_gapic", # Local target because mixins are not rolled out yet.
25+
# Mixin-only special-case API can build on its own.
26+
"iam": ":iam_java_gapic", # local target: Googleapis' LRO does not have a Java Gapic.
27+
# mixins, with an override in the proto file
28+
"kms": ":kms_java_gapic", # local target: mixins are not rolled out yet.
29+
# Special=case handling for "_deleted-topic_" resource name patterns.
4030
"pubsub": ":pubsub_java_gapic",
31+
# Java package remapping in gapic.yaml
4132
"logging": "@com_google_googleapis//google/logging/v2:logging_java_gapic",
33+
# Has a gapic.yaml.
4234
"redis": "@com_google_googleapis//google/cloud/redis/v1beta1:redis_java_gapic",
35+
# Exercises storage-specific edge cases.
4336
"storage": "@com_google_googleapis//google/storage/v2:storage_java_gapic",
37+
# No gRPC service config.
4438
"library": "@com_google_googleapis//google/example/library/v1:library_java_gapic",
39+
# REGAPIC test.
4540
"compute": "@com_google_googleapis_discovery//google/cloud/compute/v1:compute_small_java_gapic",
4641
}
4742

@@ -50,16 +45,20 @@ API_GAPIC_TARGETS = {
5045
srcs = ["//scripts:diff_gen_and_golden.sh"],
5146
args = [lib_name],
5247
data = [
53-
API_GAPIC_TARGETS[lib_name] + "_srcjar_raw.srcjar",
48+
gapic_target + "_srcjar_raw.srcjar",
5449
"//test/integration/goldens/%s:goldens_files" % lib_name,
5550
],
56-
) for lib_name in INTEGRATION_TEST_LIBRARIES]
51+
) for lib_name, gapic_target in API_GAPIC_TARGETS.items()]
5752

58-
[golden_update(
53+
[sh_binary(
5954
name = "%s_update" % lib_name,
60-
data = ["//test/integration/goldens/%s:goldens_files" % lib_name],
61-
target = API_GAPIC_TARGETS[lib_name],
62-
) for lib_name in INTEGRATION_TEST_LIBRARIES]
55+
srcs = ["//scripts:update_golden.sh"],
56+
args = [lib_name],
57+
data = [
58+
gapic_target + "_srcjar_raw.srcjar",
59+
"//test/integration/goldens/%s:goldens_files" % lib_name,
60+
],
61+
) for lib_name, gapic_target in API_GAPIC_TARGETS.items()]
6362

6463
####################################################
6564
# API Library Rules

0 commit comments

Comments
 (0)