feat(artifacts): allow release status to be propagated to artifact se…

…rvice (#471)

gradle.properties

@@ -1,6 +1,6 @@
 #Mon Jun 24 19:58:20 UTC 2019
 fiatVersion=1.1.0
 enablePublishing=false
-korkVersion=5.6.3
+korkVersion=5.7.0
 spinnakerGradleVersion=6.5.0
 org.gradle.parallel=true

igor-web/src/main/java/com/netflix/spinnaker/igor/artifacts/ArtifactController.java

@@ -24,6 +24,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -43,13 +44,15 @@ public ArtifactController(ArtifactServices artifactServices) {
 
   @GetMapping("/{provider}/{name}")
   public List<String> getVersions(
-      @PathVariable("provider") String provider, @PathVariable("name") String name) {
+      @PathVariable("provider") String provider,
+      @PathVariable("name") String name,
+      @RequestParam(value = "releaseStatus", required = false) String releaseStatus) {
     ArtifactService artifactService = getService(provider);
-    return artifactService.getArtifactVersions(name);
+    return artifactService.getArtifactVersions(name, releaseStatus);
   }
 
   @GetMapping("/{provider}/{name}/{version:.+}")
-  public Artifact getVersions(
+  public Artifact getArtifact(
       @PathVariable("provider") String provider,
       @PathVariable("name") String name,
       @PathVariable("version") String version) {

igor-web/src/main/java/com/netflix/spinnaker/igor/artifacts/ArtifactService.java

@@ -33,7 +33,7 @@ public interface ArtifactService {
 
   /** Used to populate the manual trigger dropdown with options */
   @Nonnull
-  List<String> getArtifactVersions(@Nonnull String name);
+  List<String> getArtifactVersions(@Nonnull String name, String releaseStatus);
 
   /** Used to fetch a specific artifact for decorating a trigger */
   @Nonnull

igor-web/src/test/groovy/com/netflix/spinnaker/igor/artifacts/ArtifactServiceSpec.groovy

@@ -53,14 +53,25 @@ class ArtifactServiceSpec extends Specification {
   def "service finds artifact versions"() {
     when:
     def service = artifactServices.getService("artifactory")
-    def versions = service.getArtifactVersions("test")
+    def versions = service.getArtifactVersions("test", null)
 
     then:
     assertThat(versions).isNotNull()
     assertThat(versions).isNotEmpty()
     versions.size() > 0
   }
 
+  def "service finds only snapshot artifacts"() {
+    when:
+    def service = artifactServices.getService("artifactory")
+    def versions = service.getArtifactVersions("test", "snapshot")
+
+    then:
+    assertThat(versions).isNotNull()
+    assertThat(versions).isNotEmpty()
+    versions.size() == 1
+  }
+
   def "service finds artifact"() {
     when:
     def service = artifactServices.getService("artifactory")
@@ -75,7 +86,7 @@ class ArtifactServiceSpec extends Specification {
   def "versions list is empty when no versions found"() {
     when:
     def service = artifactServices.getService("artifactory")
-    def versions = service.getArtifactVersions("blah")
+    def versions = service.getArtifactVersions("blah", "")
 
     then:
     assertThat(versions).isNotNull()

igor-web/src/test/java/com/netflix/spinnaker/igor/artifacts/TestArtifactService.java

@@ -31,15 +31,20 @@ public ArtifactServiceProvider artifactServiceProvider() {
   }
 
   @Override
-  public List<String> getArtifactVersions(String name) {
+  public List<String> getArtifactVersions(String name, String releaseStatus) {
     if (!name.equals("test")) {
       return Collections.emptyList();
     }
     List<String> versions = new ArrayList<>();
-    versions.add("v0.1.0");
-    versions.add("v0.2.0");
-    versions.add("v0.3.0");
-    versions.add("v0.4.0");
+    if (releaseStatus == null || releaseStatus.isEmpty() || releaseStatus.contains("final")) {
+      versions.add("v0.1.0");
+      versions.add("v0.2.0");
+      versions.add("v0.3.0");
+      versions.add("v0.4.0");
+    }
+    if (releaseStatus == null || releaseStatus.isEmpty() || releaseStatus.contains("snapshot")) {
+      versions.add("v0.5.0~SNAPSHOT");
+    }
     return versions;
   }