From 79bb37a0c4ee0d61f829c97ea2d261672ec244c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= <ksuszyns@redhat.com>
Date: Thu, 11 Apr 2024 20:24:18 +0200
Subject: [PATCH] Fix aw0k3n linter

---
 magetasks/tests/example/.env                   |  2 --
 magetasks/tests/example/.ko.yaml               |  1 -
 magetasks/tests/project_build_test.go          |  4 ++--
 magetasks/tests/testdata/.env                  |  2 ++
 .../tests/{example => testdata}/.gitignore     |  0
 .../tests/{example => testdata}/.golangci.yml  |  0
 magetasks/tests/testdata/.ko.yaml              |  1 +
 .../tests/{example => testdata}/.revive.toml   |  0
 .../{example => testdata}/build/Magefile.go    | 18 +++++++++---------
 .../tests/{example => testdata}/build/mage.go  |  0
 .../build/overrides/empty.go                   |  0
 .../{example => testdata}/cmd/other/main.go    |  4 ++--
 .../dummy => testdata/cmd/placeholder}/main.go |  4 ++--
 .../cmd/sampleimage/main.go                    |  2 +-
 magetasks/tests/{example => testdata}/mage     |  0
 .../pkg/metadata/image.go                      | 18 +++++++++---------
 .../pkg/metadata/image_test.go                 |  2 +-
 .../pkg/metadata/reflect.go                    |  0
 .../pkg/metadata/version.go                    |  0
 19 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 magetasks/tests/example/.env
 delete mode 100644 magetasks/tests/example/.ko.yaml
 create mode 100644 magetasks/tests/testdata/.env
 rename magetasks/tests/{example => testdata}/.gitignore (100%)
 rename magetasks/tests/{example => testdata}/.golangci.yml (100%)
 create mode 100644 magetasks/tests/testdata/.ko.yaml
 rename magetasks/tests/{example => testdata}/.revive.toml (100%)
 rename magetasks/tests/{example => testdata}/build/Magefile.go (85%)
 rename magetasks/tests/{example => testdata}/build/mage.go (100%)
 rename magetasks/tests/{example => testdata}/build/overrides/empty.go (100%)
 rename magetasks/tests/{example => testdata}/cmd/other/main.go (90%)
 rename magetasks/tests/{example/cmd/dummy => testdata/cmd/placeholder}/main.go (83%)
 rename magetasks/tests/{example => testdata}/cmd/sampleimage/main.go (92%)
 rename magetasks/tests/{example => testdata}/mage (100%)
 rename magetasks/tests/{example => testdata}/pkg/metadata/image.go (84%)
 rename magetasks/tests/{example => testdata}/pkg/metadata/image_test.go (92%)
 rename magetasks/tests/{example => testdata}/pkg/metadata/reflect.go (100%)
 rename magetasks/tests/{example => testdata}/pkg/metadata/version.go (100%)

diff --git a/magetasks/tests/example/.env b/magetasks/tests/example/.env
deleted file mode 100644
index c992a69a..00000000
--- a/magetasks/tests/example/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-IMAGE_BASENAME=ghcr.io/wavesoftware/go-magetasks/example
-IMAGE_BASENAME_SEPARATOR=/
diff --git a/magetasks/tests/example/.ko.yaml b/magetasks/tests/example/.ko.yaml
deleted file mode 100644
index eaa5b976..00000000
--- a/magetasks/tests/example/.ko.yaml
+++ /dev/null
@@ -1 +0,0 @@
-defaultBaseImage: registry.access.redhat.com/ubi8/ubi-minimal
diff --git a/magetasks/tests/project_build_test.go b/magetasks/tests/project_build_test.go
index e6d841ae..ce3ced0f 100644
--- a/magetasks/tests/project_build_test.go
+++ b/magetasks/tests/project_build_test.go
@@ -33,10 +33,10 @@ func TestProjectBuild(t *testing.T) {
 	if testing.Short() {
 		t.Skip("short tests only")
 	}
-	c := mkCmd("./example", "./mage", "clean", "build")
+	c := mkCmd("./testdata", "./mage", "clean", "build")
 	assertCommandStarted(t, c)
 	assertCommandSucceded(t, c)
-	c = mkCmd("./example/build/_output/bin",
+	c = mkCmd("./testdata/build/_output/bin",
 		fmt.Sprintf("./other-%s-%s", runtime.GOOS, runtime.GOARCH))
 	assertCommandStarted(t, c)
 	assertCommandSucceded(t, c)
diff --git a/magetasks/tests/testdata/.env b/magetasks/tests/testdata/.env
new file mode 100644
index 00000000..9f2af774
--- /dev/null
+++ b/magetasks/tests/testdata/.env
@@ -0,0 +1,2 @@
+IMAGE_BASENAME=ghcr.io/knative/toolbox/magetasks/testdata
+IMAGE_BASENAME_SEPARATOR=/
diff --git a/magetasks/tests/example/.gitignore b/magetasks/tests/testdata/.gitignore
similarity index 100%
rename from magetasks/tests/example/.gitignore
rename to magetasks/tests/testdata/.gitignore
diff --git a/magetasks/tests/example/.golangci.yml b/magetasks/tests/testdata/.golangci.yml
similarity index 100%
rename from magetasks/tests/example/.golangci.yml
rename to magetasks/tests/testdata/.golangci.yml
diff --git a/magetasks/tests/testdata/.ko.yaml b/magetasks/tests/testdata/.ko.yaml
new file mode 100644
index 00000000..141f45f0
--- /dev/null
+++ b/magetasks/tests/testdata/.ko.yaml
@@ -0,0 +1 @@
+defaultBaseImage: registry.access.redhat.com/ubi9/ubi-minimal
diff --git a/magetasks/tests/example/.revive.toml b/magetasks/tests/testdata/.revive.toml
similarity index 100%
rename from magetasks/tests/example/.revive.toml
rename to magetasks/tests/testdata/.revive.toml
diff --git a/magetasks/tests/example/build/Magefile.go b/magetasks/tests/testdata/build/Magefile.go
similarity index 85%
rename from magetasks/tests/example/build/Magefile.go
rename to magetasks/tests/testdata/build/Magefile.go
index f163616a..10e767eb 100644
--- a/magetasks/tests/example/build/Magefile.go
+++ b/magetasks/tests/testdata/build/Magefile.go
@@ -29,8 +29,8 @@ import (
 	"knative.dev/toolbox/magetasks/pkg/checks"
 	"knative.dev/toolbox/magetasks/pkg/image"
 	"knative.dev/toolbox/magetasks/pkg/knative"
-	"knative.dev/toolbox/magetasks/tests/example/build/overrides"
-	"knative.dev/toolbox/magetasks/tests/example/pkg/metadata"
+	"knative.dev/toolbox/magetasks/tests/testdata/build/overrides"
+	"knative.dev/toolbox/magetasks/tests/testdata/pkg/metadata"
 )
 
 // Default target is set to Build
@@ -42,10 +42,10 @@ func init() { //nolint:gochecknoinits
 	archs := []platform.Architecture{
 		platform.AMD64, platform.ARM64, platform.S390X, platform.PPC64LE,
 	}
-	dummy := artifact.Image{
-		Metadata: config.Metadata{Name: "dummy"},
+	placeholder := artifact.Image{
+		Metadata: config.Metadata{Name: "placeholder"},
 		Labels: map[string]config.Resolver{
-			"description": config.StaticResolver("A dummy image description"),
+			"description": config.StaticResolver("A placeholder image description"),
 		},
 		Architectures: archs,
 	}
@@ -58,9 +58,9 @@ func init() { //nolint:gochecknoinits
 			Name: "other",
 			BuildVariables: buildvars.Assemble([]buildvars.Operator{
 				image.InfluenceableReference{
-					Path:        metadata.ImagePath(metadata.DummyImage),
-					EnvVariable: "MAGETASKS_EXAMPLE_DUMMY_IMAGE",
-					Image:       dummy,
+					Path:        metadata.ImagePath(metadata.PlaceholderImage),
+					EnvVariable: "MAGETASKS_EXAMPLE_PLACEHOLDER_IMAGE",
+					Image:       placeholder,
 				},
 				image.InfluenceableReference{
 					Path:        metadata.ImagePath(metadata.SampleImage),
@@ -82,7 +82,7 @@ func init() { //nolint:gochecknoinits
 			Path: metadata.VersionPath(), Resolver: knative.NewVersionResolver(),
 		},
 		Artifacts: []config.Artifact{
-			dummy, sampleimage, other,
+			placeholder, sampleimage, other,
 		},
 		Checks: []config.Task{
 			checks.GolangCiLint(func(opts *checks.GolangCiLintOptions) {
diff --git a/magetasks/tests/example/build/mage.go b/magetasks/tests/testdata/build/mage.go
similarity index 100%
rename from magetasks/tests/example/build/mage.go
rename to magetasks/tests/testdata/build/mage.go
diff --git a/magetasks/tests/example/build/overrides/empty.go b/magetasks/tests/testdata/build/overrides/empty.go
similarity index 100%
rename from magetasks/tests/example/build/overrides/empty.go
rename to magetasks/tests/testdata/build/overrides/empty.go
diff --git a/magetasks/tests/example/cmd/other/main.go b/magetasks/tests/testdata/cmd/other/main.go
similarity index 90%
rename from magetasks/tests/example/cmd/other/main.go
rename to magetasks/tests/testdata/cmd/other/main.go
index d8e6b916..a7ff16cf 100644
--- a/magetasks/tests/example/cmd/other/main.go
+++ b/magetasks/tests/testdata/cmd/other/main.go
@@ -20,14 +20,14 @@ package main
 import (
 	"log"
 
-	"knative.dev/toolbox/magetasks/tests/example/pkg/metadata"
+	"knative.dev/toolbox/magetasks/tests/testdata/pkg/metadata"
 )
 
 func main() {
 	log.Printf("Version: %s\n", metadata.Version)
 	log.Println("Images:")
 	images := []metadata.Image{
-		metadata.DummyImage,
+		metadata.PlaceholderImage,
 		metadata.SampleImage,
 	}
 	for _, image := range images {
diff --git a/magetasks/tests/example/cmd/dummy/main.go b/magetasks/tests/testdata/cmd/placeholder/main.go
similarity index 83%
rename from magetasks/tests/example/cmd/dummy/main.go
rename to magetasks/tests/testdata/cmd/placeholder/main.go
index 371604af..e1bcd064 100644
--- a/magetasks/tests/example/cmd/dummy/main.go
+++ b/magetasks/tests/testdata/cmd/placeholder/main.go
@@ -20,9 +20,9 @@ package main
 import (
 	"log"
 
-	"knative.dev/toolbox/magetasks/tests/example/pkg/metadata"
+	"knative.dev/toolbox/magetasks/tests/testdata/pkg/metadata"
 )
 
 func main() {
-	log.Printf("Dummy code! Version: %s\n", metadata.Version)
+	log.Printf("Placeholder code! Version: %s\n", metadata.Version)
 }
diff --git a/magetasks/tests/example/cmd/sampleimage/main.go b/magetasks/tests/testdata/cmd/sampleimage/main.go
similarity index 92%
rename from magetasks/tests/example/cmd/sampleimage/main.go
rename to magetasks/tests/testdata/cmd/sampleimage/main.go
index c648adef..b057c5cc 100644
--- a/magetasks/tests/example/cmd/sampleimage/main.go
+++ b/magetasks/tests/testdata/cmd/sampleimage/main.go
@@ -20,7 +20,7 @@ package main
 import (
 	"log"
 
-	"knative.dev/toolbox/magetasks/tests/example/pkg/metadata"
+	"knative.dev/toolbox/magetasks/tests/testdata/pkg/metadata"
 )
 
 func main() {
diff --git a/magetasks/tests/example/mage b/magetasks/tests/testdata/mage
similarity index 100%
rename from magetasks/tests/example/mage
rename to magetasks/tests/testdata/mage
diff --git a/magetasks/tests/example/pkg/metadata/image.go b/magetasks/tests/testdata/pkg/metadata/image.go
similarity index 84%
rename from magetasks/tests/example/pkg/metadata/image.go
rename to magetasks/tests/testdata/pkg/metadata/image.go
index 0bcd6708..f6c4adc0 100644
--- a/magetasks/tests/example/pkg/metadata/image.go
+++ b/magetasks/tests/testdata/pkg/metadata/image.go
@@ -22,8 +22,8 @@ import (
 )
 
 var (
-	// DummyImageRef holds information about companion dummy image.
-	DummyImageRef = "" //nolint:gochecknoglobals
+	// PlaceholderImageRef holds information about companion placeholder image.
+	PlaceholderImageRef = "" //nolint:gochecknoglobals
 	// SampleImageRef holds information about companion sample image.
 	SampleImageRef = "" //nolint:gochecknoglobals
 	// ImageBasename holds a basename of a image, so the development reference
@@ -37,20 +37,20 @@ var (
 type Image string
 
 const (
-	// DummyImage represents a dummy image.
-	DummyImage Image = "dummy"
+	// PlaceholderImage represents a placeholder image.
+	PlaceholderImage Image = "placeholder"
 	// SampleImage represents a sample image.
 	SampleImage Image = "sampleimage"
 )
 
 // ResolveImage will try to resolve the image reference from set values. If
-// DummyImageRef is given it will be used, otherwise the ImageBasename and Version will
+// PlaceholderImageRef is given it will be used, otherwise the ImageBasename and Version will
 // be used.
 func ResolveImage(image Image) string {
 	ref := func() string {
 		switch image {
-		case DummyImage:
-			return DummyImageRef
+		case PlaceholderImage:
+			return PlaceholderImageRef
 		case SampleImage:
 			return SampleImageRef
 		}
@@ -68,8 +68,8 @@ func ResolveImage(image Image) string {
 func ImagePath(image Image) string {
 	variable := func() string {
 		switch image {
-		case DummyImage:
-			return "DummyImageRef"
+		case PlaceholderImage:
+			return "PlaceholderImageRef"
 		case SampleImage:
 			return "SampleImageRef"
 		}
diff --git a/magetasks/tests/example/pkg/metadata/image_test.go b/magetasks/tests/testdata/pkg/metadata/image_test.go
similarity index 92%
rename from magetasks/tests/example/pkg/metadata/image_test.go
rename to magetasks/tests/testdata/pkg/metadata/image_test.go
index 302cb9b7..3db052cd 100644
--- a/magetasks/tests/example/pkg/metadata/image_test.go
+++ b/magetasks/tests/testdata/pkg/metadata/image_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"gotest.tools/v3/assert"
-	"knative.dev/toolbox/magetasks/tests/example/pkg/metadata"
+	"knative.dev/toolbox/magetasks/tests/testdata/pkg/metadata"
 )
 
 func TestImagePath(t *testing.T) {
diff --git a/magetasks/tests/example/pkg/metadata/reflect.go b/magetasks/tests/testdata/pkg/metadata/reflect.go
similarity index 100%
rename from magetasks/tests/example/pkg/metadata/reflect.go
rename to magetasks/tests/testdata/pkg/metadata/reflect.go
diff --git a/magetasks/tests/example/pkg/metadata/version.go b/magetasks/tests/testdata/pkg/metadata/version.go
similarity index 100%
rename from magetasks/tests/example/pkg/metadata/version.go
rename to magetasks/tests/testdata/pkg/metadata/version.go