Fix aw0k3n linter

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)

magetasks/tests/testdata/.env

@@ -0,0 +1,2 @@
+IMAGE_BASENAME=ghcr.io/knative/toolbox/magetasks/testdata
+IMAGE_BASENAME_SEPARATOR=/

magetasks/tests/testdata/.ko.yaml

@@ -0,0 +1 @@
+defaultBaseImage: registry.access.redhat.com/ubi9/ubi-minimal

magetasks/tests/example/build/Magefile.go → 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) {

magetasks/tests/example/cmd/other/main.go → 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 {

magetasks/tests/example/cmd/dummy/main.go → 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)
 }

magetasks/tests/example/cmd/sampleimage/main.go → 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() {

magetasks/tests/example/pkg/metadata/image.go → 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"
  }

magetasks/tests/example/pkg/metadata/image_test.go → 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) {