release 2023-04-28: privatelink report tuning

Author: steveloughran

BUILDING.md

@@ -28,7 +28,7 @@ mvn clean install -Phadoop-3.3.2 -Pextra
 To publish the release use the gui or the github command line
 
 ```bash
-set -gx date 2023-03-03
+set -gx date 2023-04-28
 git add .
 git commit -S -m "release $date"
 git push

src/main/java/org/apache/hadoop/fs/store/diag/S3ADiagnosticsInfo.java

@@ -650,6 +650,7 @@ protected void validateConfig(final Printout printout,
     String endpoint = conf.getTrimmed(ENDPOINT, "").toLowerCase(Locale.ROOT);
     String region = conf.getTrimmed(REGION, "").toLowerCase(Locale.ROOT);
     String bucket = getFsURI().getHost();
+    boolean privateLink = false;
 
 
     boolean secureConnections = conf.getBoolean(SECURE_CONNECTIONS,
@@ -660,15 +661,6 @@ protected void validateConfig(final Printout printout,
     printout.println("%s = \"%s\"", PATH_STYLE_ACCESS, pathStyleAccess);
     printout.println("%s = \"%s\"", SECURE_CONNECTIONS, secureConnections);
 
-    if (endpoint.startsWith("https:") || endpoint.startsWith("http:")) {
-      printout.warn("Value of %s looks like a URL: %s", ENDPOINT, endpoint);
-      printout.println("It SHOULD normally be a hostname or IP address");
-      printout.println("Unless you have a private store with a non-standard port or"
-          + " are using AWS S3 PrivateLink");
-      if (!pathStyleAccess) {
-        printout.warn("You should probably set %s to true", PATH_STYLE_ACCESS);
-      }
-    }
     boolean isUsingAws = false;
     if (endpoint.isEmpty()) {
       isUsingAws = true;
@@ -680,11 +672,12 @@ protected void validateConfig(final Printout printout,
             + " tune " + PATH_STYLE_ACCESS
             + " and " + SECURE_CONNECTIONS + " as appropriate");
       }
-    } else if (endpoint.endsWith("amazonaws.cn")) {
+    } else if (endpoint.endsWith("amazonaws.cn") || endpoint.endsWith("amazonaws.cn/")) {
       isUsingAws = true;
       printout.println("AWS china is in use");
-    } else if (endpoint.endsWith(".vpce.amazonaws.com")) {
+    } else if (endpoint.endsWith(".vpce.amazonaws.com") || endpoint.endsWith(".vpce.amazonaws.com/")) {
       isUsingAws = true;
+      privateLink = true;
       printout.println("AWS VPCE is being used for a VPN connection to S3");
       printout.warn("you MUST set %s to the region of this store; it is currently \"%s\"",
           REGION, region);
@@ -721,7 +714,17 @@ protected void validateConfig(final Printout printout,
       }
 
     }
-    if (isUsingAws) {
+
+    if (!privateLink && (endpoint.startsWith("https:") || endpoint.startsWith("http:"))) {
+      printout.warn("Value of %s looks like a URL: %s", ENDPOINT, endpoint);
+      printout.println("It SHOULD normally be a hostname or IP address");
+      printout.println("Unless you have a private store with a non-standard port or"
+          + " are using AWS S3 PrivateLink");
+      if (!pathStyleAccess) {
+        printout.warn("You should probably set %s to true", PATH_STYLE_ACCESS);
+      }
+    }
+    if (!privateLink && isUsingAws) {
       printout.println("Important: if you are working with a third party store,");
       printout.println(" this client is still trying to connect to to AWS S3");
       printout.println("Expect failure until %s is set to the private endpoint", ENDPOINT);