Rename RESTRICTED_CRYPTO_KEY_URI and AWS_CRYPTO_URI.

PiperOrigin-RevId: 477126357

5 files changed, 6 insertions, 5 deletions

diff --git a/tools/testing/java/com/google/crypto/tink/testing/AeadCli.java b/tools/testing/java/com/google/crypto/tink/testing/AeadCli.java
index 304f6bc70..6fd0f27ae 100644
--- a/tools/testing/java/com/google/crypto/tink/testing/AeadCli.java
+++ b/tools/testing/java/com/google/crypto/tink/testing/AeadCli.java
@@ -45,7 +45,8 @@ public class AeadCli {
     String outputFilename = args[4];
 
     GcpKmsClient.register(Optional.empty(), Optional.of(TestUtil.SERVICE_ACCOUNT_FILE));
-    AwsKmsClient.register(Optional.of(TestUtil.AWS_CRYPTO_URI), Optional.of(TestUtil.AWS_CREDS));
+    AwsKmsClient.register(
+        Optional.of(TestUtil.AWS_KMS_TEST_KEY_URI), Optional.of(TestUtil.AWS_CREDS));
     AeadConfig.register();
 
     if (!(operation.equals("encrypt") || operation.equals("decrypt"))) {
diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java
index fb71f6e3a..8766c26ea 100644
--- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java
+++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/AddKeyCommandTest.java
@@ -113,7 +113,7 @@ public class AddKeyCommandTest {
     // This test requires KMS/internet access and thus cannot run on RBE.
     assumeFalse(TestUtil.isRemoteBuildExecution());
     // Create an input stream containing an encrypted keyset.
-    String masterKeyUri = TestUtil.RESTRICTED_CRYPTO_KEY_URI;
+    String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI;
     String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE;
     InputStream inputStream =
         TinkeyUtil.createKeyset(existingTemplate, INPUT_FORMAT, masterKeyUri, credentialPath);
diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java
index d2fcdb96b..b67b108ce 100644
--- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java
+++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreateKeysetCommandTest.java
@@ -77,7 +77,7 @@ public class CreateKeysetCommandTest {
     // This test requires KMS/internet access and thus cannot run on RBE.
     assumeFalse(TestUtil.isRemoteBuildExecution());
     // Create an encrypted keyset.
-    String masterKeyUri = TestUtil.RESTRICTED_CRYPTO_KEY_URI;
+    String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI;
     String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE;
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     CreateKeysetCommand.create(outputStream, outFormat, masterKeyUri, credentialPath, template);
diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java
index 4cbd7c49b..ccfed4de9 100644
--- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java
+++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/CreatePublicKeysetCommandTest.java
@@ -121,7 +121,7 @@ public class CreatePublicKeysetCommandTest {
     // This test requires KMS/internet access and thus cannot run on RBE.
     assumeFalse(TestUtil.isRemoteBuildExecution());
     // Create an input stream containing a cleartext private keyset.
-    String masterKeyUri = TestUtil.RESTRICTED_CRYPTO_KEY_URI;
+    String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI;
     String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE;
     InputStream inputStream1 = TinkeyUtil.createKeyset(
         template, INPUT_FORMAT, masterKeyUri, credentialPath);
diff --git a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java
index defa599e4..69cf315b4 100644
--- a/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java
+++ b/tools/tinkey/src/test/java/com/google/crypto/tink/tinkey/RotateKeysetCommandTest.java
@@ -113,7 +113,7 @@ public class RotateKeysetCommandTest {
     // This test requires KMS/internet access and thus cannot run on RBE.
     assumeFalse(TestUtil.isRemoteBuildExecution());
     // Create an input stream containing an encrypted keyset.
-    String masterKeyUri = TestUtil.RESTRICTED_CRYPTO_KEY_URI;
+    String masterKeyUri = TestUtil.GCP_KMS_TEST_KEY_URI;
     String credentialPath = TestUtil.SERVICE_ACCOUNT_FILE;
     InputStream inputStream =
         TinkeyUtil.createKeyset(existingTemplate, INPUT_FORMAT, masterKeyUri, credentialPath);