💝 Generate images (#1)

* Switch to wavesoftware/commandline

* Generate images skel

* Use dockerfilegen from o-k/hack

* Fix lint

* Use config values to gen images

Author: cardil

.golangci.yaml

@@ -3,6 +3,7 @@ run:
   build-tags:
     - e2e
     - mage
+    - ignored
 
 linters:
   disable-all: false
@@ -18,31 +19,24 @@ linters:
   disable:
     - paralleltest
     - nlreturn
-    - exhaustivestruct
     - wsl
     - godox
-    - scopelint
-    - maligned
-    - interfacer
-    - golint
+    - ireturn
+    - varnamelen
     - exhaustruct
-    - containedctx
     - depguard
+    - containedctx # TODO: consider removing this
 
 issues:
   exclude-rules:
     - path: _test\.go
       linters:
         - wrapcheck
-        - varnamelen
 
 linters-settings:
-  varnamelen:
-    max-distance: 16
-    min-name-length: 2
-
+  wrapcheck:
+    ignorePackageGlobs:
+      - github.com/openshift-knative/hack/*
   gomoddirectives:
     # List of allowed `replace` directives. Default is empty.
-    replace-allow-list:
-      # FIXME: until github.com/cli/cli requires forked github.com/cli/shurcooL-graphql
-      - github.com/shurcooL/graphql
+    replace-allow-list: []

build/Magefile.go

@@ -18,7 +18,7 @@ import (
 // Default target is set to binary.
 //
 //goland:noinspection GoUnusedGlobalVariable
-var Default = magetasks.Build // nolint:deadcode,gochecknoglobals
+var Default = magetasks.Build //nolint:deadcode,gochecknoglobals
 
 func init() { //nolint:gochecknoinits
 	bin := artifact.Binary{

build/go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift-knative/deviate/build
 
-go 1.22.7
+go 1.22.9
 
 require (
 	github.com/openshift-knative/deviate v0.0.0

cmd/deviate/main.go

@@ -1,16 +1,10 @@
 package main
 
 import (
-	"os"
-
 	"github.com/openshift-knative/deviate/internal/cmd"
-)
-
-var (
-	exitFunc = os.Exit    //nolint:gochecknoglobals
-	opts     []cmd.Option //nolint:gochecknoglobals
+	"github.com/wavesoftware/go-commandline"
 )
 
 func main() {
-	exitFunc(cmd.Main(opts...))
+	commandline.New(new(cmd.App)).ExecuteOrDie(cmd.Options...)
 }

cmd/deviate/main_test.go

@@ -8,67 +8,35 @@ import (
 	"github.com/openshift-knative/deviate/internal/cmd"
 	"github.com/openshift-knative/deviate/pkg/metadata"
 	"github.com/spf13/cobra"
+	"github.com/wavesoftware/go-commandline"
 	"gotest.tools/v3/assert"
 )
 
-const notSetRetCode = -1 * (2 ^ 63)
-
 func TestMainFunc(t *testing.T) {
-	o := output{}
-	a := args{[]string{"--version"}}
-	code := withCapturedRetCode(func() {
-		withOptions(func() {
-			main()
-		}, o.configure, a.configure)
-	})
-
-	assert.Equal(t, code, 0)
+	var o bytes.Buffer
+	var retcode *int
+	withOptions(func() {
+		main()
+	},
+		commandline.WithCommand(func(cmd *cobra.Command) {
+			cmd.SetArgs([]string{"--version"})
+			cmd.SetOut(&o)
+		}),
+		commandline.WithExit(func(code int) {
+			retcode = &code
+		}),
+	)
+
+	assert.Equal(t, retcode, (*int)(nil))
 	assert.Equal(t, o.String(), fmt.Sprintf("%s version %s\n",
 		metadata.Name, metadata.Version))
 }
 
-type args struct {
-	of []string
-}
-
-func (a args) configure(root *cobra.Command) {
-	root.SetArgs(a.of)
-}
-
-type output struct {
-	*bytes.Buffer
-}
-
-func (o *output) configure(root *cobra.Command) {
-	root.SetOut(o.buff())
-	root.SetErr(o.buff())
-}
-
-func (o *output) buff() *bytes.Buffer {
-	if o.Buffer == nil {
-		o.Buffer = new(bytes.Buffer)
-	}
-	return o.Buffer
-}
-
-func withCapturedRetCode(fn func()) int {
-	retcode := notSetRetCode
-	old := exitFunc
-	exitFunc = func(code int) {
-		retcode = code
-	}
-	defer func() {
-		exitFunc = old
-	}()
-	fn()
-	return retcode
-}
-
-func withOptions(fn func(), newOpts ...cmd.Option) {
-	old := opts
-	opts = newOpts
+func withOptions(fn func(), newOpts ...commandline.Option) {
+	old := cmd.Options
+	cmd.Options = newOpts
 	defer func() {
-		opts = old
+		cmd.Options = old
 	}()
 	fn()
 }