particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: merge all *ToPtr methods to one generic ToPtr

Browse source 
After introducing Go 1.18 to a project, it's required by law to convert at
least one method to a generic one.

Everyone hates IntToPtr, StringToPtr, BoolToPtr and Uint64ToPtr, so let's
convert them to the ultimate generic ToPtr one.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2023-01-06 12:42:02 +01:00 • committed by Achilleas Koutsou
parent 0359647a82
commit b997142db0
46 changed files with 397 additions and 392 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/container/client.go
View file

@ -14,9 +14,10 @@ import (
_ "github.com/containers/image/v5/docker/archive"
_ "github.com/containers/image/v5/oci/archive"
_ "github.com/containers/image/v5/oci/layout"
"github.com/osbuild/osbuild-composer/internal/common"
"golang.org/x/sys/unix"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/containers/common/pkg/retry"
"github.com/containers/image/v5/copy"
"github.com/containers/image/v5/docker"
@ -233,13 +234,13 @@ func (cl *Client) GetTLSVerify() *bool {
}
// NB: we invert the state, i.e. verify == (skip == false)
return common.BoolToPtr(skip == types.OptionalBoolFalse)
return common.ToPtr(skip == types.OptionalBoolFalse)
}
// SkipTLSVerify is a convenience helper that internally calls
// SetTLSVerify with false
func (cl *Client) SkipTLSVerify() {
cl.SetTLSVerify(common.BoolToPtr(false))
cl.SetTLSVerify(common.ToPtr(false))
}
func parseImageName(name string) (types.ImageReference, error) {

3
internal/container/container_test.go
View file

@ -13,6 +13,7 @@ import (
"time"
"github.com/opencontainers/go-digest"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/container"
@ -373,7 +374,7 @@ func (reg *Registry) Resolve(target, arch string) (container.Spec, error) {
Digest: checksum,
ImageID: mf.ConfigDescriptor.Digest.String(),
LocalName: ref.String(),
TLSVerify: common.BoolToPtr(false),
TLSVerify: common.ToPtr(false),
}, nil
}

9
internal/container/resolver_test.go
View file

@ -6,9 +6,10 @@ import (
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/container"
"github.com/stretchr/testify/assert"
)
type lessCompare func(i, j int) bool
@ -43,7 +44,7 @@ func TestResolver(t *testing.T) {
resolver := container.NewResolver("amd64")
for _, r := range refs {
resolver.Add(r, "", common.BoolToPtr(false))
resolver.Add(r, "", common.ToPtr(false))
}
have, err := resolver.Finish()
@ -68,7 +69,7 @@ func TestResolver(t *testing.T) {
func TestResolverFail(t *testing.T) {
resolver := container.NewResolver("amd64")
resolver.Add("invalid-reference@${IMAGE_DIGEST}", "", common.BoolToPtr(false))
resolver.Add("invalid-reference@${IMAGE_DIGEST}", "", common.ToPtr(false))
specs, err := resolver.Finish()
assert.Error(t, err)
@ -77,7 +78,7 @@ func TestResolverFail(t *testing.T) {
registry := NewTestRegistry()
defer registry.Close()
resolver.Add(registry.GetRef("repo"), "", common.BoolToPtr(false))
resolver.Add(registry.GetRef("repo"), "", common.ToPtr(false))
specs, err = resolver.Finish()
assert.Error(t, err)
assert.Len(t, specs, 0)