Derive RDAP link paths from the received query

The former method -- a config string -- was cumbersome, as each Nomulus system would have to configure the link base to its own URL.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173567021
This commit is contained in:
mountford 2017-10-26 11:36:40 -07:00 committed by jianglai
parent 30bfcf9c55
commit 11a218f9c3
25 changed files with 88 additions and 64 deletions

View file

@ -761,17 +761,6 @@ public final class RegistryConfig {
return 100;
}
/**
* Base for RDAP link paths.
*
* @see google.registry.rdap.RdapActionBase
*/
@Provides
@Config("rdapLinkBase")
public static String provideRdapLinkBase(RegistryConfigSettings config) {
return config.rdap.baseUrl;
}
/**
* WHOIS server displayed in RDAP query responses. As per Gustavo Lozano of ICANN, this should
* be omitted, but the ICANN operational profile doesn't actually say that, so it's good to have

View file

@ -32,7 +32,6 @@ public class RegistryConfigSettings {
public RegistrarConsole registrarConsole;
public Monitoring monitoring;
public Misc misc;
public Rdap rdap;
public Braintree braintree;
public Kms kms;
public RegistryTool registryTool;
@ -148,11 +147,6 @@ public class RegistryConfigSettings {
public String sheetExportId;
}
/** Configuration for RDAP. */
public static class Rdap {
public String baseUrl;
}
/** Configuration for Braintree credit card payment processing. */
public static class Braintree {
public String merchantId;

View file

@ -215,10 +215,6 @@ misc:
# to. Leave this null to disable syncing.
sheetExportId: null
rdap:
# Base URL (with trailing slash) for RDAP links.
baseUrl: http://domain-registry.example/rdap/
# Braintree is a credit card payment processor that is used on the registrar
# console to allow registrars to pay their invoices.
braintree:

View file

@ -58,9 +58,6 @@ registrarConsole:
misc:
sheetExportId: placeholder
rdap:
baseUrl: placeholder
# You only need to specify this section if using Braintree.
braintree:
merchantId: placeholder