Add 'connector' to help, interactive, and error text

Author: erichaagdev

components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh

@@ -391,11 +391,11 @@ collect_remote_build_cache() {
 
 collect_remote_build_cache_type() {
   local default_remote_cache_type="<project default>"
-  prompt_for_setting "What is the remote build cache type to use? [develocity, gradle-enterprise, http, or <BLANK>]" "${remote_build_cache_type}" "${default_remote_cache_type}" remote_build_cache_type
+  prompt_for_setting "What is the remote build cache connector type to use? [develocity, gradle-enterprise, http, or <BLANK>]" "${remote_build_cache_type}" "${default_remote_cache_type}" remote_build_cache_type
 
   if [[ -n "${remote_build_cache_type}" && "${remote_build_cache_type}" != 'http' && "${remote_build_cache_type}" != 'gradle-enterprise' && "${remote_build_cache_type}" != 'develocity' ]]; then
     print_bl
-    die "ERROR: Invalid value for remote build cache type. Values are 'develocity', 'gradle-enterprise', 'http', or <BLANK> for project default." "${INVALID_INPUT}"
+    die "ERROR: Invalid value for remote build cache connector type. Values are 'develocity', 'gradle-enterprise', 'http', or <BLANK> for project default." "${INVALID_INPUT}"
   fi
 
   if [[ "${remote_build_cache_type}" == "${default_remote_cache_type}" ]]; then

components/scripts/gradle/gradle-init-scripts/configure-remote-build-caching.gradle

@@ -95,7 +95,7 @@ static String toServerPart(URI uri) {
 // This is for the sake of completeness since this init script assumes it's valid.
 static void failInvalidRemoteBuildCacheType(String remoteBuildCacheType, String expDir) {
     def errorFile = new File(expDir, 'errors.txt')
-    def message = "Invalid value '${remoteBuildCacheType}' for remote build cache type. Values are 'develocity', 'gradle-enterprise', or 'http'."
+    def message = "Invalid value '${remoteBuildCacheType}' for remote build cache connector type. Values are 'develocity', 'gradle-enterprise', or 'http'."
     errorFile.text = message
     throw new IllegalStateException(message)
 }
@@ -104,16 +104,16 @@ static void failInvalidRemoteBuildCacheType(String remoteBuildCacheType, String
 // Only fail if the top-level build is missing the required extension.
 static void failMissingRequiredPlugin(String remoteBuildCacheType, String expDir, String docsRoot) {
     def errorFile = new File(expDir, 'errors.txt')
-    errorFile.text = "Remote build cache type '${remoteBuildCacheType}' requested, but the required plugin is not applied."
+    errorFile.text = "Remote build cache connector type '${remoteBuildCacheType}' requested, but the required plugin is not applied."
     if (remoteBuildCacheType == 'develocity') {
-        throw new IllegalStateException("Remote build cache type 'develocity' requested,\n" +
+        throw new IllegalStateException("Remote build cache connector type 'develocity' requested,\n" +
             "but the Develocity Gradle plugin is not applied.\n" +
             "Either apply it directly (see $docsRoot/current/#applying_the_plugin),\n" +
             "use --enable-develocity to enable the plugin,\n" +
-            "or use --remote-build-cache-type to choose a different remote build cache type\n" +
+            "or use --remote-build-cache-type to choose a different remote build cache connector type\n" +
             "when running the build validation script.")
     } else {
-        throw new IllegalStateException("Remote build cache type 'gradle-enterprise' requested,\n" +
+        throw new IllegalStateException("Remote build cache connector type 'gradle-enterprise' requested,\n" +
             "but the Gradle Enterprise Gradle plugin is not applied (see $docsRoot/legacy/#applying_the_plugin).")
     }
 }

components/scripts/lib/cli-parsers/gradle/05-cli-parser.m4

@@ -31,7 +31,7 @@ function print_help() {
   print_option_usage -p
   print_option_usage -t
   print_option_usage -a
-  print_option_usage "-y, --remote-build-cache-type" "Specifies the type of remote build cache to use in the second build run locally. Values are 'develocity', 'gradle-enterprise', or 'http'."
+  print_option_usage "-y, --remote-build-cache-type" "Specifies the remote build cache connector type to use in the second build run locally. Values are 'develocity', 'gradle-enterprise', or 'http'."
   print_option_usage "-u, --remote-build-cache-url" "Specifies the URL for the remote build cache to access in the second build run locally."
   print_option_usage -s
   print_option_usage -e