Turn off version checks, translate Spring-style wildcards (#100)

* Update staging settings, fix broken test

* when deploying, use env.SLOT_NAME instead of vars.STAGING_SLOT_NAME

---------

Co-authored-by: Tim Hess <[email protected]>

Author: bart-vmware

.github/workflows/build-and-stage.yml

@@ -100,7 +100,7 @@ jobs:
       with:
         app-name: ${{ vars.AZURE_WEBAPP_NAME }}
         package: '.'
-        slot-name: ${{ vars.STAGING_SLOT_NAME }}
+        slot-name: ${{ env.SLOT_NAME }}
 
     - name: If PR, comment with the preview link
       if: ${{ github.event_name == 'pull_request' }}

src/InitializrService/Controllers/ProjectController.cs

@@ -73,13 +73,6 @@ public async Task<ActionResult> GetProjectArchive([FromQuery] ProjectSpec spec)
                 Dependencies = spec.Dependencies ?? defaults?.Dependencies?.Default,
             };
 
-            if (new ReleaseRange("3.0.0").Accepts(normalizedSpec.SteeltoeVersion)
-                && !new ReleaseRange("netcoreapp3.1").Accepts(normalizedSpec.DotNetFramework))
-            {
-                return NotFound(
-                    $".NET framework version {normalizedSpec.DotNetFramework} not found for Steeltoe version {normalizedSpec.SteeltoeVersion}");
-            }
-
             if (normalizedSpec.Dependencies != null)
             {
                 var deps = normalizedSpec.Dependencies.Split(',');
@@ -95,19 +88,25 @@ public async Task<ActionResult> GetProjectArchive([FromQuery] ProjectSpec spec)
                                 continue;
                             }
 
+                            // This is effectively unreachable. InitializrWeb filters out incompatible dependencies.
+                            /*
                             var steeltoeRange = new ReleaseRange(dep.SteeltoeVersionRange);
                             if (!steeltoeRange.Accepts(normalizedSpec.SteeltoeVersion))
                             {
                                 return NotFound(
                                     $"No dependency '{deps[i]}' found for Steeltoe version {normalizedSpec.SteeltoeVersion}.");
                             }
+                            */
 
+                            // This is effectively unreachable. InitializrWeb filters out incompatible dependencies.
+                            /*
                             var frameworkRange = new ReleaseRange(dep.DotNetFrameworkRange);
                             if (!frameworkRange.Accepts(normalizedSpec.DotNetFramework))
                             {
                                 return NotFound(
                                     $"No dependency '{deps[i]}' found for .NET framework {normalizedSpec.DotNetFramework}.");
                             }
+                            */
 
                             deps[i] = dep.Id;
                             found = true;
@@ -133,6 +132,10 @@ public async Task<ActionResult> GetProjectArchive([FromQuery] ProjectSpec spec)
             Logger.LogInformation("Project specification: {ProjectSpec}", normalizedSpec);
             try
             {
+                // Translate Spring-style wildcard 'x' to NuGet-style wildcard '*'.
+                // See https://docs.spring.io/initializr/docs/current-SNAPSHOT/reference/html/#dependencies-compatibility-range.
+                normalizedSpec.SteeltoeVersion = normalizedSpec.SteeltoeVersion.Replace('x', '*');
+
                 var projectPackage = await _projectGenerator.GenerateProjectArchive(normalizedSpec);
                 return File(
                     projectPackage,

src/InitializrService/Controllers/RootController.cs

@@ -97,8 +97,8 @@ from dependency in @group.Values
                 {
                     dependency.Id,
                     dependency.Description,
-                    new ReleaseRange(dependency.SteeltoeVersionRange).ToPrettyString(),
-                    new ReleaseRange(dependency.DotNetFrameworkRange).ToPrettyString(),
+                    dependency.SteeltoeVersionRange ?? string.Empty,
+                    dependency.DotNetFrameworkRange ?? string.Empty,
                 });
 
             help.AddRange(ToTable(table));

test/InitializrService.Test.Unit/Controllers/ProjectControllerTests.cs

@@ -185,7 +185,7 @@ public async Task Null_Archive_Format_Should_Return_500_Internal_Server_Error()
             result.Value.Should().Be("Default packaging not configured.");
         }
 
-        [Fact]
+        [Fact(Skip = "This is effectively unreachable. InitilizrWeb filters out incompatible dependencies.")]
         public async Task Unsupported_Steeltoe_Version_Should_Return_404_NotFound()
         {
             // Arrange
@@ -230,7 +230,7 @@ public async Task Unsupported_Steeltoe_Version_Should_Return_404_NotFound()
             result.Value.ToString().Should().Be("No dependency 'mydep' found for Steeltoe version 0.0.");
         }
 
-        [Fact]
+        [Fact(Skip = "This is effectively unreachable. InitilizrWeb filters out incompatible dependencies.")]
         public async Task Unsupported_DotNet_Framework_Should_Return_404_NotFound()
         {
             // Arrange

test/InitializrService.Test.Unit/Controllers/RootControllerTests.cs

@@ -119,7 +119,7 @@ public void Get_Should_Return_Help()
             help.Should().MatchRegex(@"\|\s+Id\s+\|\s+Description\s+\|\s+Steeltoe Version\s+\|\s+.NET Framework\s+\|");
             help.Should().MatchRegex(@"\|\s+dep1\s+\|\s+DependencyOne\s+\|\s+\|");
             help.Should().MatchRegex(@"\|\s+dep2\s+\|\s+DependencyTwo\s+\|\s+\|");
-            help.Should().MatchRegex(@"\|\s+anotherdep\s+\|\s+AnotherDependency\s+\|\s+>=1.0 and <1.9\s+\|\s+>=2.0\s+\|");
+            help.Should().MatchRegex(@"\|\s+anotherdep\s+\|\s+AnotherDependency\s+\|\s+\[1\.0,1\.9\)\s+\|\s+2.0\s+\|");
         }
 
         /* ----------------------------------------------------------------- *