Also enforce that version numbers are literal, rather than dynamic se…

…lectors, when services.gradle.org cannot be reached
openrewrite · Jul 2, 2024 · 29182e4 · 29182e4
1 parent f30237c
commit 29182e4
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpdateGradleWrapper.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpdateGradleWrapper.java
@@ -95,13 +95,13 @@ public String getDescription() {
     final Boolean addIfMissing;
 
     @Getter
-            @Option(example = "https://services.gradle.org/distributions/gradle-${version}-${distribution}.zip", displayName = "Wrapper URI",
-                    description = "The URI of the Gradle wrapper distribution. " +
-                            "Lookup of available versions still requires access to https://services.gradle.org " +
-                            "When this is specified the exact literal values supplied for `version` and `distribution` " +
-                            "will be interpolated into this string wherever `${version}` and `${distribution}` appear respectively. " +
-                            "Defaults to https://services.gradle.org/distributions/gradle-${version}-${distribution}.zip.",
-                    required = false)
+    @Option(example = "https://services.gradle.org/distributions/gradle-${version}-${distribution}.zip", displayName = "Wrapper URI",
+            description = "The URI of the Gradle wrapper distribution. " +
+                          "Lookup of available versions still requires access to https://services.gradle.org " +
+                          "When this is specified the exact literal values supplied for `version` and `distribution` " +
+                          "will be interpolated into this string wherever `${version}` and `${distribution}` appear respectively. " +
+                          "Defaults to https://services.gradle.org/distributions/gradle-${version}-${distribution}.zip.",
+            required = false)
     @Nullable
     final String wrapperUri;
 
@@ -124,14 +124,21 @@ private GradleWrapper getGradleWrapper(ExecutionContext ctx) {
             } catch (Exception e) {
                 // services.gradle.org is unreachable, possibly because of a firewall
                 // But if the user specified a wrapperUri to an internal repository things might still be workable
-                if(wrapperUri == null) {
-                    throw new IllegalStateException(
+                if (wrapperUri == null) {
+                    throw new IllegalArgumentException(
                             "Could not reach services.gradle.org and no alternative wrapper URI is provided. " +
                             "To use this recipe in environments where services.gradle.org is unavailable specify a wrapperUri.", e);
                 }
-                if(wrapperUri.contains("${version})") && version == null) {
-                    throw new IllegalStateException(
-                            "wrapperUri contains a ${version} interpolation specifier but no version parameter was specified.", e);
+                if (wrapperUri.contains("${version})")) {
+                    if (version == null) {
+                        throw new IllegalArgumentException(
+                                "wrapperUri contains a ${version} interpolation specifier but no version parameter was specified.", e);
+                    }
+                    if(!version.matches("[0-9.]+")) {
+                        throw new IllegalArgumentException(
+                                "Version selectors like \"" + version + "\" are unavailable when services.gradle.org cannot be reached. " +
+                                "Specify an exact, literal version number.", e);
+                    }
                 }
                 String effectiveWrapperUri = wrapperUri
                         .replace("${version}", version == null ? "" : version)
@@ -455,12 +462,12 @@ public Properties visitEntry(Properties.Entry entry, ExecutionContext ctx) {
                 String currentUrl = value.getText();
                 // Prefer wrapperUri specified directly in the recipe over other options
                 // If that isn't set, prefer the existing artifact repository URL over changing to services.gradle.org
-                if(wrapperUri != null) {
+                if (wrapperUri != null) {
                     String effectiveWrapperUri = formatUriForPropertiesFile(wrapperUri
                             .replace("${version}", gradleWrapper.getVersion())
                             .replace("${distribution}", distribution == null ? "bin" : distribution));
                     return entry.withValue(value.withText(effectiveWrapperUri));
-                } else if(currentUrl.startsWith("https\\://services.gradle.org/distributions/")) {
+                } else if (currentUrl.startsWith("https\\://services.gradle.org/distributions/")) {
                     return entry.withValue(value.withText(gradleWrapper.getPropertiesFormattedUrl()));
                 } else {
                     String gradleServicesDistributionUrl = gradleWrapper.getDistributionUrl();