move cmd/util/ to internal/cmd/util/, since it is also imported by packages outside of cmd/

inteon · inteon · commit f36c06f10d80 · 2023-02-28T12:38:59.000+01:00
Signed-off-by: Tim Ramlot &lt;42113979+inteon@users.noreply.github.com&gt;
diff --git a/cmd/acmesolver/app/app.go b/cmd/acmesolver/app/app.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/pkg/issuer/acme/http/solver"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
 )
diff --git a/cmd/acmesolver/main.go b/cmd/acmesolver/main.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/cert-manager/cert-manager/cmd/acmesolver/app"
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 )
 
 // acmesolver solves ACME http-01 challenges. This is intended to run as a pod
diff --git a/cmd/cainjector/app/start.go b/cmd/cainjector/app/start.go
@@ -37,7 +37,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	cmdutil "github.com/cert-manager/cert-manager/cmd/util"
+	cmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/pkg/api"
 	"github.com/cert-manager/cert-manager/pkg/controller/cainjector"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
diff --git a/cmd/cainjector/main.go b/cmd/cainjector/main.go
@@ -25,7 +25,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/cert-manager/cert-manager/cmd/cainjector/app"
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
 )
 
diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/utils/clock"
 
 	"github.com/cert-manager/cert-manager/cmd/controller/app/options"
-	cmdutil "github.com/cert-manager/cert-manager/cmd/util"
+	cmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/internal/controller/feature"
 	"github.com/cert-manager/cert-manager/pkg/acme/accounts"
 	"github.com/cert-manager/cert-manager/pkg/controller"
diff --git a/cmd/controller/app/options/options.go b/cmd/controller/app/options/options.go
@@ -26,7 +26,7 @@ import (
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	cmdutil "github.com/cert-manager/cert-manager/cmd/util"
+	cmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/internal/controller/feature"
 	cm "github.com/cert-manager/cert-manager/pkg/apis/certmanager"
 	challengescontroller "github.com/cert-manager/cert-manager/pkg/controller/acmechallenges"
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -20,7 +20,7 @@ import (
 	"flag"
 
 	"github.com/cert-manager/cert-manager/cmd/controller/app"
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
 )
 
diff --git a/cmd/ctl/main.go b/cmd/ctl/main.go
@@ -22,7 +22,7 @@ import (
 	"os"
 
 	ctlcmd "github.com/cert-manager/cert-manager/cmd/ctl/cmd"
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 )
 
 func main() {
diff --git a/cmd/ctl/pkg/check/api/api.go b/cmd/ctl/pkg/check/api/api.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 
 	"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"
-	cmcmdutil "github.com/cert-manager/cert-manager/cmd/util"
+	cmcmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/pkg/util/cmapichecker"
 )
 
diff --git a/cmd/webhook/app/webhook.go b/cmd/webhook/app/webhook.go
@@ -26,9 +26,9 @@ import (
 	"github.com/spf13/pflag"
 	cliflag "k8s.io/component-base/cli/flag"
 
-	cmdutil "github.com/cert-manager/cert-manager/cmd/util"
 	"github.com/cert-manager/cert-manager/cmd/webhook/app/options"
 	config "github.com/cert-manager/cert-manager/internal/apis/config/webhook"
+	cmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"
 	cmwebhook "github.com/cert-manager/cert-manager/internal/webhook"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
 	"github.com/cert-manager/cert-manager/pkg/util"
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -19,8 +19,8 @@ package main
 import (
 	"flag"
 
-	"github.com/cert-manager/cert-manager/cmd/util"
 	"github.com/cert-manager/cert-manager/cmd/webhook/app"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
 )
 
diff --git a/internal/cmd/util/context.go b/internal/cmd/util/context.go
diff --git a/internal/cmd/util/defaults.go b/internal/cmd/util/defaults.go
diff --git a/internal/cmd/util/exit.go b/internal/cmd/util/exit.go
diff --git a/internal/cmd/util/signal.go b/internal/cmd/util/signal.go
diff --git a/internal/cmd/util/signal_posix.go b/internal/cmd/util/signal_posix.go
diff --git a/internal/cmd/util/signal_windows.go b/internal/cmd/util/signal_windows.go
diff --git a/pkg/acme/webhook/cmd/cmd.go b/pkg/acme/webhook/cmd/cmd.go
@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/component-base/logs"
 
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 	"github.com/cert-manager/cert-manager/pkg/acme/webhook"
 	"github.com/cert-manager/cert-manager/pkg/acme/webhook/cmd/server"
 	logf "github.com/cert-manager/cert-manager/pkg/logs"
diff --git a/test/e2e/bin/cloudflare-clean/main.go b/test/e2e/bin/cloudflare-clean/main.go
@@ -24,7 +24,7 @@ import (
 
 	cf "github.com/cloudflare/cloudflare-go"
 
-	"github.com/cert-manager/cert-manager/cmd/util"
+	"github.com/cert-manager/cert-manager/internal/cmd/util"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`"github.com/spf13/cobra"`
`24`	`24`
`25`		`- "github.com/cert-manager/cert-manager/cmd/util"`
	`25`	`+ "github.com/cert-manager/cert-manager/internal/cmd/util"`
`26`	`26`	`"github.com/cert-manager/cert-manager/pkg/issuer/acme/http/solver"`
`27`	`27`	`logf "github.com/cert-manager/cert-manager/pkg/logs"`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"os"`
`22`	`22`
`23`	`23`	`"github.com/cert-manager/cert-manager/cmd/acmesolver/app"`
`24`		`- "github.com/cert-manager/cert-manager/cmd/util"`
	`24`	`+ "github.com/cert-manager/cert-manager/internal/cmd/util"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// acmesolver solves ACME http-01 challenges. This is intended to run as a pod`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`ctrl "sigs.k8s.io/controller-runtime"`
`26`	`26`
`27`	`27`	`"github.com/cert-manager/cert-manager/cmd/cainjector/app"`
`28`		`- "github.com/cert-manager/cert-manager/cmd/util"`
	`28`	`+ "github.com/cert-manager/cert-manager/internal/cmd/util"`
`29`	`29`	`logf "github.com/cert-manager/cert-manager/pkg/logs"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"flag"`
`21`	`21`
`22`	`22`	`"github.com/cert-manager/cert-manager/cmd/controller/app"`
`23`		`- "github.com/cert-manager/cert-manager/cmd/util"`
	`23`	`+ "github.com/cert-manager/cert-manager/internal/cmd/util"`
`24`	`24`	`logf "github.com/cert-manager/cert-manager/pkg/logs"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`"k8s.io/kubectl/pkg/util/templates"`
`33`	`33`
`34`	`34`	`"github.com/cert-manager/cert-manager/cmd/ctl/pkg/factory"`
`35`		`- cmcmdutil "github.com/cert-manager/cert-manager/cmd/util"`
	`35`	`+ cmcmdutil "github.com/cert-manager/cert-manager/internal/cmd/util"`
`36`	`36`	`"github.com/cert-manager/cert-manager/pkg/util/cmapichecker"`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ package main`
`19`	`19`	`import (`
`20`	`20`	`"flag"`
`21`	`21`
`22`		`- "github.com/cert-manager/cert-manager/cmd/util"`
`23`	`22`	`"github.com/cert-manager/cert-manager/cmd/webhook/app"`
	`23`	`+ "github.com/cert-manager/cert-manager/internal/cmd/util"`
`24`	`24`	`logf "github.com/cert-manager/cert-manager/pkg/logs"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`cf "github.com/cloudflare/cloudflare-go"`
`26`	`26`
`27`		`- "github.com/cert-manager/cert-manager/cmd/util"`
	`27`	`+ "github.com/cert-manager/cert-manager/internal/cmd/util"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`var (`