From 65bacf2df63d3fbc0c3c3e51d47a609a9a9bd2c3 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Thu, 21 Nov 2019 11:32:25 +0100
Subject: [PATCH] CI: fix release script remove filtering (#20552)

---
 scripts/build/release_publisher/main.go       |  4 +-
 scripts/build/release_publisher/publisher.go  |  6 +--
 .../build/release_publisher/publisher_test.go | 52 +++++++++++++++----
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/scripts/build/release_publisher/main.go b/scripts/build/release_publisher/main.go
index eba3907f3a3..29418bede51 100644
--- a/scripts/build/release_publisher/main.go
+++ b/scripts/build/release_publisher/main.go
@@ -45,9 +45,9 @@ func main() {
 		product = "grafana-enterprise"
 		baseURL = createBaseURL(archiveProviderRoot, "enterprise", product, nightly)
 		var err error
-		buildArtifacts, err = filterBuildArtifacts([]artifactFilter{
+		buildArtifacts, err = filterBuildArtifacts(completeBuildArtifactConfigurations, Remove, []artifactFilter{
 			{os: "win-installer", arch: "amd64"},
-		}, Remove)
+		})
 
 		if err != nil {
 			log.Fatalf("Could not filter to the selected build artifacts, err=%v", err)
diff --git a/scripts/build/release_publisher/publisher.go b/scripts/build/release_publisher/publisher.go
index c4925c4272c..2be9032e936 100644
--- a/scripts/build/release_publisher/publisher.go
+++ b/scripts/build/release_publisher/publisher.go
@@ -193,10 +193,10 @@ const (
 	Remove filterType = "remove"
 )
 
-func filterBuildArtifacts(filters []artifactFilter, ft filterType) ([]buildArtifact, error) {
+func filterBuildArtifacts(filterFrom []buildArtifact, ft filterType, filters []artifactFilter) ([]buildArtifact, error) {
 	var artifacts []buildArtifact
 
-	for _, a := range completeBuildArtifactConfigurations {
+	for _, a := range filterFrom {
 		matched := false
 		var match buildArtifact
 
@@ -211,7 +211,7 @@ func filterBuildArtifacts(filters []artifactFilter, ft filterType) ([]buildArtif
 		if matched && ft == Add {
 			artifacts = append(artifacts, match)
 		} else if !matched && ft == Remove {
-			artifacts = append(artifacts, match)
+			artifacts = append(artifacts, a)
 		}
 	}
 	return artifacts, nil
diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go
index 47ad46ce228..6cff0fef9b2 100644
--- a/scripts/build/release_publisher/publisher_test.go
+++ b/scripts/build/release_publisher/publisher_test.go
@@ -1,6 +1,9 @@
 package main
 
-import "testing"
+import (
+	"reflect"
+	"testing"
+)
 
 func TestPreparingReleaseFromRemote(t *testing.T) {
 
@@ -148,33 +151,60 @@ func (mockHTTPGetter) getContents(url string) (string, error) {
 }
 
 func TestFilterBuildArtifacts(t *testing.T) {
-	buildArtifacts, _ := filterBuildArtifacts([]artifactFilter{
+	buildArtifacts, _ := filterBuildArtifacts(completeBuildArtifactConfigurations, Add, []artifactFilter{
 		{os: "deb", arch: "amd64"},
 		{os: "rhel", arch: "amd64"},
 		{os: "linux", arch: "amd64"},
 		{os: "win", arch: "amd64"},
-	}, Add)
+	})
 
 	if len(buildArtifacts) != 4 {
 		t.Errorf("Expected 4 build artifacts after filtering, but was %v", len(buildArtifacts))
 	}
 
-	buildArtifacts, err := filterBuildArtifacts([]artifactFilter{
-		{os: "win-installer", arch: "amd64"},
-	}, Remove)
+	buildArtifacts, err := filterBuildArtifacts([]buildArtifact{
+		{
+			os:   "linux",
+			arch: "amd64",
+		},
+		{
+			os:   "arm",
+			arch: "amd64",
+		},
+		{
+			os:   "darwin",
+			arch: "amd64",
+		},
+	}, Remove, []artifactFilter{
+		{os: "darwin", arch: "amd64"},
+	})
 
 	if err != nil {
-		t.Errorf("Expected all artifacts except win-msi, not error=%v", err)
+		t.Error()
 	}
 
-	if len(buildArtifacts) != len(completeBuildArtifactConfigurations)-1 {
-		t.Errorf("Expected %v artifacts but was %v", completeBuildArtifactConfigurations, buildArtifacts)
+	if len(buildArtifacts) != 2 {
+		t.Errorf("Expected 2 artifacts, was %v", len(buildArtifacts))
 	}
 
 	for _, ba := range buildArtifacts {
-		if ba.arch == "amd64" && ba.os == "win-installer" {
-			t.Errorf("win-installer/amd64 should be gone due to filtering")
+		if ba.arch == "amd64" && ba.os == "darwin" {
+			t.Errorf("darwin/amd64 should be gone due to filtering")
 		}
 	}
 
+	left := []buildArtifact{
+		{
+			os:   "linux",
+			arch: "amd64",
+		},
+		{
+			os:   "arm",
+			arch: "amd64",
+		},
+	}
+
+	if !reflect.DeepEqual(left, buildArtifacts) {
+		t.Errorf("Lists should have been equal but was, expected=%v, actual=%v", left, buildArtifacts)
+	}
 }