Rename "types" packages to avoid "meaningless name" warnings

nalind · nalind · commit 2f36165aa964 · 2025-11-13T16:03:47.000-05:00
These are internal and test packages, so this shouldn't break any of our
API consumers.

Signed-off-by: Nalin Dahyabhai &lt;nalin@redhat.com&gt;
diff --git a/chroot/run_test.go b/chroot/run_test.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/containers/buildah/tests/testreport/types"
+	types "github.com/containers/buildah/tests/testreport/types"
 	"github.com/containers/buildah/util"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
diff --git a/internal/mkcw/attest.go b/internal/mkcw/attest.go
@@ -14,7 +14,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/buildah/internal/mkcw/types"
+	types "github.com/containers/buildah/internal/mkcw/types"
 	"github.com/sirupsen/logrus"
 	"go.podman.io/storage/pkg/fileutils"
 )
diff --git a/internal/mkcw/types/attest.go b/internal/mkcw/types/attest.go
@@ -1,4 +1,4 @@
-package types
+package mkcwtypes
 
 // RegistrationRequest is the body of the request which we use for registering
 // this confidential workload with the attestation server.
diff --git a/internal/mkcw/types/workload.go b/internal/mkcw/types/workload.go
@@ -1,4 +1,4 @@
-package types
+package mkcwtypes
 
 import "github.com/containers/buildah/define"
 
diff --git a/internal/mkcw/workload.go b/internal/mkcw/workload.go
@@ -10,7 +10,7 @@ import (
 	"os"
 
 	"github.com/containers/buildah/define"
-	"github.com/containers/buildah/internal/mkcw/types"
+	types "github.com/containers/buildah/internal/mkcw/types"
 )
 
 type (
diff --git a/internal/util/util.go b/internal/util/util.go
@@ -1,4 +1,4 @@
-package util
+package internalutil
 
 import (
 	"fmt"
diff --git a/internal/util/util_test.go b/internal/util/util_test.go
@@ -1,4 +1,4 @@
-package util
+package internalutil
 
 import (
 	"testing"
diff --git a/tests/testreport/testreport.go b/tests/testreport/testreport.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containers/buildah/tests/testreport/types"
+	types "github.com/containers/buildah/tests/testreport/types"
 	"github.com/moby/sys/capability"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
diff --git a/tests/testreport/types/types.go b/tests/testreport/types/types.go
@@ -1,4 +1,4 @@
-package types
+package testreporttypes
 
 import (
 	"github.com/opencontainers/runtime-spec/specs-go"

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"path/filepath"`
`15`	`15`	`"strings"`
`16`	`16`
`17`		`- "github.com/containers/buildah/internal/mkcw/types"`
	`17`	`+ types "github.com/containers/buildah/internal/mkcw/types"`
`18`	`18`	`"github.com/sirupsen/logrus"`
`19`	`19`	`"go.podman.io/storage/pkg/fileutils"`
`20`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package types`
	`1`	`+package mkcwtypes`
`2`	`2`
`3`	`3`	`// RegistrationRequest is the body of the request which we use for registering`
`4`	`4`	`// this confidential workload with the attestation server.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"os"`
`11`	`11`
`12`	`12`	`"github.com/containers/buildah/define"`
`13`		`- "github.com/containers/buildah/internal/mkcw/types"`
	`13`	`+ types "github.com/containers/buildah/internal/mkcw/types"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type (`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package util`
	`1`	`+package internalutil`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package types`
	`1`	`+package testreporttypes`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/opencontainers/runtime-spec/specs-go"`