Rename DNL and SMDRL "login" to "loginAndPassword"

They are passed around in the format username:password, whereas just saying
"login" implies it's just a username and not necessarily also a secret
password. Putting password in the variable name makes it obvious what this is
and reduces the likelihood of anyone ever logging it or otherwise using it
inappropriately.

Note that this does not require data migrations as the actual key used to store
the data in KMS remains unchanged.

This is a follow-up to []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=231253964

java/google/registry/keyring/api/InMemoryKeyring.java

@@ -35,9 +35,9 @@ public final class InMemoryKeyring implements Keyring {
   private final String rdeSshClientPrivateKey;
   private final String icannReportingPassword;
   private final String safeBrowsingAPIKey;
-  private final String marksdbDnlLogin;
+  private final String marksdbDnlLoginAndPassword;
   private final String marksdbLordnPassword;
-  private final String marksdbSmdrlLogin;
+  private final String marksdbSmdrlLoginAndPassword;
   private final String jsonCredential;
 
   public InMemoryKeyring(
@@ -50,9 +50,9 @@ public final class InMemoryKeyring implements Keyring {
       String rdeSshClientPrivateKey,
       String icannReportingPassword,
       String safeBrowsingAPIKey,
-      String marksdbDnlLogin,
+      String marksdbDnlLoginAndPassword,
       String marksdbLordnPassword,
-      String marksdbSmdrlLogin,
+      String marksdbSmdrlLoginAndPassword,
       String jsonCredential) {
     checkArgument(PgpHelper.isSigningKey(rdeSigningKey.getPublicKey()),
         "RDE signing key must support signing: %s", rdeSigningKey.getKeyID());
@@ -73,9 +73,11 @@ public final class InMemoryKeyring implements Keyring {
     this.rdeSshClientPrivateKey = checkNotNull(rdeSshClientPrivateKey, "rdeSshClientPrivateKey");
     this.icannReportingPassword = checkNotNull(icannReportingPassword, "icannReportingPassword");
     this.safeBrowsingAPIKey = checkNotNull(safeBrowsingAPIKey, "safeBrowsingAPIKey");
-    this.marksdbDnlLogin = checkNotNull(marksdbDnlLogin, "marksdbDnlLogin");
+    this.marksdbDnlLoginAndPassword =
+        checkNotNull(marksdbDnlLoginAndPassword, "marksdbDnlLoginAndPassword");
     this.marksdbLordnPassword = checkNotNull(marksdbLordnPassword, "marksdbLordnPassword");
-    this.marksdbSmdrlLogin = checkNotNull(marksdbSmdrlLogin, "marksdbSmdrlLogin");
+    this.marksdbSmdrlLoginAndPassword =
+        checkNotNull(marksdbSmdrlLoginAndPassword, "marksdbSmdrlLoginAndPassword");
     this.jsonCredential = checkNotNull(jsonCredential, "jsonCredential");
   }
 
@@ -130,8 +132,8 @@ public final class InMemoryKeyring implements Keyring {
   }
 
     @Override
-  public String getMarksdbDnlLogin() {
-    return marksdbDnlLogin;
+  public String getMarksdbDnlLoginAndPassword() {
+    return marksdbDnlLoginAndPassword;
   }
 
   @Override
@@ -140,8 +142,8 @@ public final class InMemoryKeyring implements Keyring {
   }
 
   @Override
-  public String getMarksdbSmdrlLogin() {
-    return marksdbSmdrlLogin;
+  public String getMarksdbSmdrlLoginAndPassword() {
+    return marksdbSmdrlLoginAndPassword;
   }
 
   @Override

java/google/registry/keyring/api/KeyModule.java

@@ -55,9 +55,9 @@ public final class KeyModule {
   }
 
   @Provides
-  @Key("marksdbDnlLogin")
-  static Optional<String> provideMarksdbDnlLogin(Keyring keyring) {
-    return Optional.ofNullable(emptyToNull(keyring.getMarksdbDnlLogin()));
+  @Key("marksdbDnlLoginAndPassword")
+  static Optional<String> provideMarksdbDnlLoginAndPassword(Keyring keyring) {
+    return Optional.ofNullable(emptyToNull(keyring.getMarksdbDnlLoginAndPassword()));
   }
 
   @Provides
@@ -67,9 +67,9 @@ public final class KeyModule {
   }
 
   @Provides
-  @Key("marksdbSmdrlLogin")
-  static Optional<String> provideMarksdbSmdrlLogin(Keyring keyring) {
-    return Optional.ofNullable(emptyToNull(keyring.getMarksdbSmdrlLogin()));
+  @Key("marksdbSmdrlLoginAndPassword")
+  static Optional<String> provideMarksdbSmdrlLoginAndPassword(Keyring keyring) {
+    return Optional.ofNullable(emptyToNull(keyring.getMarksdbSmdrlLoginAndPassword()));
   }
 
   @Provides

java/google/registry/keyring/api/Keyring.java

@@ -129,7 +129,7 @@ public interface Keyring extends AutoCloseable {
    *
    * @see google.registry.tmch.TmchDnlAction
    */
-  String getMarksdbDnlLogin();
+  String getMarksdbDnlLoginAndPassword();
 
   /**
    * Returns password for TMCH MarksDB HTTP server LORDN interface.
@@ -143,7 +143,7 @@ public interface Keyring extends AutoCloseable {
    *
    * @see google.registry.tmch.TmchSmdrlAction
    */
-  String getMarksdbSmdrlLogin();
+  String getMarksdbSmdrlLoginAndPassword();
 
   /**
    * Returns the credentials for a service account on the Google AppEngine project downloaded from