From dc738334596a6041d86207fba1a15ac39ade3792 Mon Sep 17 00:00:00 2001
From: Luke Kingland <luke@lukekingland.com>
Date: Wed, 24 Apr 2024 14:11:18 +0900
Subject: [PATCH] chore: fix build and test tags

The current build tagging system was predicated on the idea that
integraion, e2e and unit tests are entirely separate.  The correct way
to treat these is as inclusive with unit tests.  Thus this pr removes
the exclusion of unit test from integration tests runs, treating -tags
integration as indicating "unit tests plus integration tests".
---
 pkg/docker/creds/credentials_test.go           | 3 ---
 pkg/docker/pusher_test.go                      | 3 ---
 pkg/docker/runner_test.go                      | 3 ---
 pkg/functions/client_test.go                   | 3 ---
 pkg/functions/config_test.go                   | 3 ---
 pkg/functions/function_envs_unit_test.go       | 3 ---
 pkg/functions/function_git_unit_test.go        | 3 ---
 pkg/functions/function_labels_unit_test.go     | 3 ---
 pkg/functions/function_migrations_unit_test.go | 3 ---
 pkg/functions/function_options_unit_test.go    | 3 ---
 pkg/functions/function_test.go                 | 3 ---
 pkg/functions/function_unit_test.go            | 3 ---
 pkg/functions/function_volumes_unit_test.go    | 3 ---
 pkg/functions/instances_test.go                | 3 ---
 pkg/functions/job_test.go                      | 3 ---
 pkg/functions/repositories_test.go             | 3 ---
 pkg/functions/repository_test.go               | 3 ---
 pkg/functions/runner_test.go                   | 3 ---
 pkg/functions/templates_test.go                | 3 ---
 pkg/knative/deployer_test.go                   | 3 ---
 pkg/pipelines/tekton/validate_test.go          | 3 ---
 pkg/scaffolding/detectors_test.go              | 3 ---
 pkg/scaffolding/scaffold_test.go               | 3 ---
 23 files changed, 69 deletions(-)

diff --git a/pkg/docker/creds/credentials_test.go b/pkg/docker/creds/credentials_test.go
index 91c3212f15..679f9c8b3f 100644
--- a/pkg/docker/creds/credentials_test.go
+++ b/pkg/docker/creds/credentials_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package creds_test
 
 import (
diff --git a/pkg/docker/pusher_test.go b/pkg/docker/pusher_test.go
index 82410f288f..d94eaca182 100644
--- a/pkg/docker/pusher_test.go
+++ b/pkg/docker/pusher_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package docker_test
 
 import (
diff --git a/pkg/docker/runner_test.go b/pkg/docker/runner_test.go
index 0e1a779fc4..1f31945da7 100644
--- a/pkg/docker/runner_test.go
+++ b/pkg/docker/runner_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package docker_test
 
 import (
diff --git a/pkg/functions/client_test.go b/pkg/functions/client_test.go
index e920f13a6e..d07d36743a 100644
--- a/pkg/functions/client_test.go
+++ b/pkg/functions/client_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/config_test.go b/pkg/functions/config_test.go
index 439db47688..de096c33e4 100644
--- a/pkg/functions/config_test.go
+++ b/pkg/functions/config_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 // Config tests do not have private access, as they are testing manifest
diff --git a/pkg/functions/function_envs_unit_test.go b/pkg/functions/function_envs_unit_test.go
index f4e392d205..ecc0644eb8 100644
--- a/pkg/functions/function_envs_unit_test.go
+++ b/pkg/functions/function_envs_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_git_unit_test.go b/pkg/functions/function_git_unit_test.go
index af624ee110..4243bf7c69 100644
--- a/pkg/functions/function_git_unit_test.go
+++ b/pkg/functions/function_git_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_labels_unit_test.go b/pkg/functions/function_labels_unit_test.go
index 94d4f9cbfc..236658c513 100644
--- a/pkg/functions/function_labels_unit_test.go
+++ b/pkg/functions/function_labels_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_migrations_unit_test.go b/pkg/functions/function_migrations_unit_test.go
index 9ebad33163..d11864c394 100644
--- a/pkg/functions/function_migrations_unit_test.go
+++ b/pkg/functions/function_migrations_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_options_unit_test.go b/pkg/functions/function_options_unit_test.go
index a0d59bd1d0..9b798b0362 100644
--- a/pkg/functions/function_options_unit_test.go
+++ b/pkg/functions/function_options_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_test.go b/pkg/functions/function_test.go
index 943a4826f5..3ab929dbbc 100644
--- a/pkg/functions/function_test.go
+++ b/pkg/functions/function_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/function_unit_test.go b/pkg/functions/function_unit_test.go
index 6d6f77e9dc..5082e33a3e 100644
--- a/pkg/functions/function_unit_test.go
+++ b/pkg/functions/function_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_volumes_unit_test.go b/pkg/functions/function_volumes_unit_test.go
index 9e49b63a48..4a7decc907 100644
--- a/pkg/functions/function_volumes_unit_test.go
+++ b/pkg/functions/function_volumes_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/instances_test.go b/pkg/functions/instances_test.go
index 947f6832c0..1c08e4b7d1 100644
--- a/pkg/functions/instances_test.go
+++ b/pkg/functions/instances_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/job_test.go b/pkg/functions/job_test.go
index e9e32265a2..191aaa8101 100644
--- a/pkg/functions/job_test.go
+++ b/pkg/functions/job_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/repositories_test.go b/pkg/functions/repositories_test.go
index 14d24d4bab..3654ae17ee 100644
--- a/pkg/functions/repositories_test.go
+++ b/pkg/functions/repositories_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/repository_test.go b/pkg/functions/repository_test.go
index c5c344c0fb..664f232c49 100644
--- a/pkg/functions/repository_test.go
+++ b/pkg/functions/repository_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/runner_test.go b/pkg/functions/runner_test.go
index fa4643fa29..ef051d7e78 100644
--- a/pkg/functions/runner_test.go
+++ b/pkg/functions/runner_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/templates_test.go b/pkg/functions/templates_test.go
index 879d62b5ec..e9198735d3 100644
--- a/pkg/functions/templates_test.go
+++ b/pkg/functions/templates_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/knative/deployer_test.go b/pkg/knative/deployer_test.go
index 90204062c7..e8832d3258 100644
--- a/pkg/knative/deployer_test.go
+++ b/pkg/knative/deployer_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package knative
 
 import (
diff --git a/pkg/pipelines/tekton/validate_test.go b/pkg/pipelines/tekton/validate_test.go
index 98a7b59be6..c7e5d2382b 100644
--- a/pkg/pipelines/tekton/validate_test.go
+++ b/pkg/pipelines/tekton/validate_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package tekton
 
 import (
diff --git a/pkg/scaffolding/detectors_test.go b/pkg/scaffolding/detectors_test.go
index e04ca30171..babbb3f886 100644
--- a/pkg/scaffolding/detectors_test.go
+++ b/pkg/scaffolding/detectors_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package scaffolding
 
 import (
diff --git a/pkg/scaffolding/scaffold_test.go b/pkg/scaffolding/scaffold_test.go
index 380c7597b3..73ce5101fb 100644
--- a/pkg/scaffolding/scaffold_test.go
+++ b/pkg/scaffolding/scaffold_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package scaffolding
 
 import (