Skip to content

Commit 8a998ca

Browse files
juergwcopybara-github
juergw
authored and
copybara-github
committed
Use tink deps from maven.
And remove archive_override for tink_java. This also means that we can't use test-only target anymore. PiperOrigin-RevId: 900567364 Change-Id: I9922af0bcb35ab86512b1043c09b2dcae5de07da
1 parent 35de9db commit 8a998ca

4 files changed

Lines changed: 17 additions & 46 deletions

File tree

‎MODULE.bazel‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ bazel_dep(name = "rules_license", version = "1.0.0")
2323
bazel_dep(name = "rules_android", version = "0.6.6", repo_name = "build_bazel_rules_android")
2424
bazel_dep(name = "platforms", version = "1.0.0")
2525

26-
bazel_dep(name = "tink_java")
27-
archive_override(
28-
module_name = "tink_java",
29-
integrity = "sha256-3cJVMyGLIAsKjxVAEVDBv+eU2moySVy733sgnQYXAk0=",
30-
strip_prefix = "tink-java-1.21.0",
31-
urls = ["https://github.com/tink-crypto/tink-java/archive/refs/tags/v1.21.0.tar.gz"],
32-
)
33-
3426
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
3527

3628
maven.install(
@@ -60,7 +52,7 @@ maven.install(
6052
"https://maven.google.com",
6153
"https://repo1.maven.org/maven2",
6254
],
63-
known_contributing_modules = ["bazel_worker_java", "protobuf", "tink_java", "tink_java_awskms"],
55+
known_contributing_modules = ["bazel_worker_java", "protobuf", "tink_java_awskms"],
6456
)
6557

6658
use_repo(maven, "maven")

‎src/main/java/com/google/crypto/tink/integration/awskms/BUILD.bazel‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ java_library(
66
name = "aws_kms_aead",
77
srcs = ["AwsKmsAead.java"],
88
deps = [
9-
"@tink_java//src/main/java/com/google/crypto/tink:aead",
9+
"@maven//:com_google_crypto_tink_tink",
1010
"@maven//:com_google_guava_guava",
1111
"@maven//:software_amazon_awssdk_auth",
1212
"@maven//:software_amazon_awssdk_kms",
@@ -22,11 +22,9 @@ java_library(
2222
plugins = [":auto_service_plugin"],
2323
deps = [
2424
":aws_kms_aead",
25-
"@tink_java//src/main/java/com/google/crypto/tink:aead",
26-
"@tink_java//src/main/java/com/google/crypto/tink:kms_client",
27-
"@tink_java//src/main/java/com/google/crypto/tink:kms_clients",
2825
"@maven//:com_google_auto_service_auto_service_annotations",
2926
"@maven//:com_google_code_findbugs_jsr305",
27+
"@maven//:com_google_crypto_tink_tink",
3028
"@maven//:com_google_errorprone_error_prone_annotations",
3129
"@maven//:com_google_guava_guava",
3230
"@maven//:software_amazon_awssdk_auth",
@@ -42,10 +40,7 @@ java_library(
4240
testonly = 1,
4341
srcs = ["FakeAwsKms.java"],
4442
deps = [
45-
"@tink_java//src/main/java/com/google/crypto/tink:aead",
46-
"@tink_java//src/main/java/com/google/crypto/tink:key_templates",
47-
"@tink_java//src/main/java/com/google/crypto/tink:registry_cluster",
48-
"@tink_java//src/main/java/com/google/crypto/tink:registry_configuration",
43+
"@maven//:com_google_crypto_tink_tink",
4944
"@maven//:software_amazon_awssdk_kms",
5045
"@maven//:software_amazon_awssdk_sdk_core",
5146
],

‎src/test/java/com/google/crypto/tink/integration/awskms/AwsKmsClientTest.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.crypto.tink.KeyTemplates;
2727
import com.google.crypto.tink.KeysetHandle;
2828
import com.google.crypto.tink.KmsClient;
29-
import com.google.crypto.tink.KmsClientsTestUtil;
3029
import com.google.crypto.tink.RegistryConfiguration;
3130
import com.google.crypto.tink.aead.AeadConfig;
3231
import com.google.crypto.tink.aead.KmsAeadKeyManager;
@@ -35,7 +34,6 @@
3534
import com.google.crypto.tink.aead.PredefinedAeadParameters;
3635
import java.security.GeneralSecurityException;
3736
import java.util.Optional;
38-
import org.junit.Before;
3937
import org.junit.BeforeClass;
4038
import org.junit.Test;
4139
import org.junit.runner.RunWith;
@@ -50,11 +48,6 @@ public static void setUpClass() throws Exception {
5048
AeadConfig.register();
5149
}
5250

53-
@Before
54-
public void setUp() {
55-
KmsClientsTestUtil.reset();
56-
}
57-
5851
@Test
5952
public void clientBoundToASingleKey_onlySupportsSpecifiedKeyUri() throws Exception {
6053
String keyId = "arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab";
@@ -159,6 +152,8 @@ public void registerBoundWithFakeAwsKms_kmsEnvelopeAeadCanOnlyBeCreatedForBounde
159152
String kekUri2 =
160153
"aws-kms://arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890xy";
161154

155+
// This has a global side effect: it registers the client with the Tink global registry.
156+
// But that's fine because we only use these key URIs in this test.
162157
AwsKmsClient.registerWithAwsKms(
163158
Optional.of(kekUri), Optional.empty(), new FakeAwsKms(asList(kekId, kekId2)));
164159

@@ -179,14 +174,17 @@ public void registerBoundWithFakeAwsKms_kmsEnvelopeAeadCanOnlyBeCreatedForBounde
179174

180175
@Test
181176
public void registerTwoBoundWithFakeAwsKms_kmsAeadWorks() throws Exception {
182-
String kekId = "arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab";
183-
String kekId2 = "arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890xy";
177+
String kekId = "arn:aws:kms:us-west-2:222233334444:key/1234abcd-12ab-34cd-56ef-1234567890ab";
178+
String kekId2 = "arn:aws:kms:us-west-2:222233334444:key/1234abcd-12ab-34cd-56ef-1234567890xy";
184179
String kekUri =
185-
"aws-kms://arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab";
180+
"aws-kms://arn:aws:kms:us-west-2:222233334444:key/1234abcd-12ab-34cd-56ef-1234567890ab";
186181
String kekUri2 =
187-
"aws-kms://arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890xy";
182+
"aws-kms://arn:aws:kms:us-west-2:222233334444:key/1234abcd-12ab-34cd-56ef-1234567890xy";
188183

189184
FakeAwsKms fakeKms = new FakeAwsKms(asList(kekId, kekId2));
185+
186+
// This has a global side effect: it registers the client with the Tink global registry.
187+
// But that's fine because we only use these key URIs in this test.
190188
AwsKmsClient.registerWithAwsKms(Optional.of(kekUri), Optional.empty(), fakeKms);
191189
AwsKmsClient.registerWithAwsKms(Optional.of(kekUri2), Optional.empty(), fakeKms);
192190

‎src/test/java/com/google/crypto/tink/integration/awskms/BUILD.bazel‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ java_test(
55
size = "small",
66
srcs = ["AwsKmsAeadTest.java"],
77
deps = [
8-
"@tink_java//src/main/java/com/google/crypto/tink:aead",
9-
"@tink_java//src/main/java/com/google/crypto/tink/aead:aead_config",
108
"//src/main/java/com/google/crypto/tink/integration/awskms:aws_kms_aead",
119
"//src/main/java/com/google/crypto/tink/integration/awskms:fake_aws_kms",
12-
"@tink_java//src/main/java/com/google/crypto/tink/subtle:random",
10+
"@maven//:com_google_crypto_tink_tink",
1311
"@maven//:com_google_truth_truth",
1412
"@maven//:junit_junit",
1513
"@maven//:software_amazon_awssdk_kms",
@@ -21,20 +19,9 @@ java_test(
2119
size = "small",
2220
srcs = ["AwsKmsClientTest.java"],
2321
deps = [
24-
"@tink_java//src/main/java/com/google/crypto/tink:aead",
25-
"@tink_java//src/main/java/com/google/crypto/tink:key_template",
26-
"@tink_java//src/main/java/com/google/crypto/tink:key_templates",
27-
"@tink_java//src/main/java/com/google/crypto/tink:kms_client",
28-
"@tink_java//src/main/java/com/google/crypto/tink:kms_clients_test_util",
29-
"@tink_java//src/main/java/com/google/crypto/tink:registry_cluster",
30-
"@tink_java//src/main/java/com/google/crypto/tink:registry_configuration",
31-
"@tink_java//src/main/java/com/google/crypto/tink/aead:aead_config",
32-
"@tink_java//src/main/java/com/google/crypto/tink/aead:kms_aead_key_manager",
33-
"@tink_java//src/main/java/com/google/crypto/tink/aead:kms_envelope_aead",
34-
"@tink_java//src/main/java/com/google/crypto/tink/aead:kms_envelope_aead_key_manager",
35-
"@tink_java//src/main/java/com/google/crypto/tink/aead:predefined_aead_parameters",
3622
"//src/main/java/com/google/crypto/tink/integration/awskms:aws_kms_client",
3723
"//src/main/java/com/google/crypto/tink/integration/awskms:fake_aws_kms",
24+
"@maven//:com_google_crypto_tink_tink",
3825
"@maven//:com_google_truth_truth",
3926
"@maven//:junit_junit",
4027
],
@@ -46,9 +33,8 @@ java_test(
4633
srcs = ["AwsKmsIntegrationTest.java"],
4734
data = ["//testdata/aws:credentials"],
4835
deps = [
49-
"@tink_java//src/main/java/com/google/crypto/tink:aead",
5036
"//src/main/java/com/google/crypto/tink/integration/awskms:aws_kms_client",
51-
"@tink_java//src/main/java/com/google/crypto/tink/subtle:hex",
37+
"@maven//:com_google_crypto_tink_tink",
5238
"@maven//:com_google_truth_truth",
5339
"@maven//:junit_junit",
5440
],
@@ -59,8 +45,8 @@ java_test(
5945
size = "small",
6046
srcs = ["FakeAwsKmsTest.java"],
6147
deps = [
62-
"@tink_java//src/main/java/com/google/crypto/tink/aead:aead_config",
6348
"//src/main/java/com/google/crypto/tink/integration/awskms:fake_aws_kms",
49+
"@maven//:com_google_crypto_tink_tink",
6450
"@maven//:com_google_truth_truth",
6551
"@maven//:junit_junit",
6652
"@maven//:software_amazon_awssdk_kms",

0 commit comments

Comments
 (0)