mirrors/diun
1
0
Fork 0
mirror of https://github.com/crazy-max/diun.git synced 2025-12-21 13:23:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix lint issues

Browse Source
This commit is contained in:
CrazyMax
2024-12-14 21:27:42 +01:00
parent b118dc8108
commit 8fb9b975b8
18 changed files with 101 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cli.go
View File

@@ -24,7 +24,7 @@ type CliGlobals struct {
// BeforeApply is a hook that run cli cmd are executed.
func (s *CliGlobals) BeforeApply() (err error) {
s.conn, err = grpc.Dial(s.GRPCAuthority, grpc.WithTransportCredentials(insecure.NewCredentials()))
s.conn, err = grpc.NewClient(s.GRPCAuthority, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
return err
}

8
cmd/image.go
View File

@@ -9,9 +9,9 @@ import (
"time"
"unicode"
"github.com/AlecAivazis/survey/v2"
survey "github.com/AlecAivazis/survey/v2"
"github.com/crazy-max/diun/v4/pb"
"github.com/docker/go-units"
units "github.com/docker/go-units"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/tidwall/pretty"
"google.golang.org/protobuf/encoding/protojson"
@@ -138,8 +138,8 @@ func (s *ImageRemoveCmd) Run(_ *Context) error {
// ImagePruneCmd holds image prune command
type ImagePruneCmd struct {
CliGlobals
//All bool `kong:"name='all',default='false',help='Remove all manifests from the database.'"`
//Filter string `kong:"name='filter',help='Provide filter values (e.g., until=24h).'"`
// All bool `kong:"name='all',default='false',help='Remove all manifests from the database.'"`
// Filter string `kong:"name='filter',help='Provide filter values (e.g., until=24h).'"`
Force bool `kong:"name='force',default='false',help='Do not prompt for confirmation.'"`
}

2
cmd/main.go
View File

@@ -39,7 +39,7 @@ func main() {
Author: "CrazyMax",
Version: version,
}
meta.UserAgent = fmt.Sprintf("%s/%s go/%s %s", meta.ID, meta.Version, runtime.Version()[2:], strings.Title(runtime.GOOS))
meta.UserAgent = fmt.Sprintf("%s/%s go/%s %s", meta.ID, meta.Version, runtime.Version()[2:], strings.Title(runtime.GOOS)) //nolint:staticcheck // ignoring "SA1019: strings.Title is deprecated", as for our use we don't need full unicode support
if meta.Hostname, err = os.Hostname(); err != nil {
log.Fatal().Err(err).Msg("Cannot resolve hostname")
}

8
internal/config/config_test.go
View File

@@ -189,7 +189,7 @@ for <code>{{ .Entry.Manifest.Platform }}</code> platform.
},
},
RegOpts: model.RegOpts{
{
model.RegOpt{
Name: "myregistry",
Selector: model.RegOptSelectorName,
Username: "fii",
@@ -197,7 +197,7 @@ for <code>{{ .Entry.Manifest.Platform }}</code> platform.
InsecureTLS: utl.NewFalse(),
Timeout: utl.NewDuration(5 * time.Second),
},
{
model.RegOpt{
Name: "docker.io",
Selector: model.RegOptSelectorImage,
Username: "foo",
@@ -205,7 +205,7 @@ for <code>{{ .Entry.Manifest.Platform }}</code> platform.
InsecureTLS: utl.NewFalse(),
Timeout: utl.NewDuration(0),
},
{
model.RegOpt{
Name: "docker.io/crazymax",
Selector: model.RegOptSelectorImage,
UsernameFile: "./fixtures/run_secrets_username",
@@ -301,7 +301,7 @@ func TestLoadEnv(t *testing.T) {
Watch: (&model.Watch{}).GetDefaults(),
Defaults: (&model.Defaults{}).GetDefaults(),
RegOpts: model.RegOpts{
{
model.RegOpt{
Name: "docker.io",
Selector: model.RegOptSelectorImage,
UsernameFile: "./fixtures/run_secrets_username",

2
internal/notif/client.go
View File

@@ -99,7 +99,7 @@ func (c *Client) Send(entry model.NotifEntry) {
for _, n := range c.notifiers {
log.Debug().Str("image", entry.Image.String()).Msgf("Sending %s notification...", n.Name())
if err := n.Send(entry); err != nil {
log.Error().Err(err).Str("image", entry.Image.String()).Msgf("%s notification failed", strings.Title(n.Name()))
log.Error().Err(err).Str("image", entry.Image.String()).Msgf("%s notification failed", strings.Title(n.Name())) //nolint:staticcheck // ignoring "SA1019: strings.Title is deprecated", as for our use we don't need full unicode support
}
}
}

12
internal/notif/discord/client.go
View File

@@ -2,6 +2,7 @@ package discord
import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
@@ -41,10 +42,6 @@ func (c *Client) Name() string {
func (c *Client) Send(entry model.NotifEntry) error {
var content bytes.Buffer
hc := http.Client{
Timeout: *c.cfg.Timeout,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -125,7 +122,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
return err
}
req, err := http.NewRequest("POST", u.String(), dataBuf)
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), *c.cfg.Timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", u.String(), dataBuf)
if err != nil {
return err
}
@@ -137,6 +138,7 @@ func (c *Client) Send(entry model.NotifEntry) error {
if err != nil {
return err
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusNoContent {
return errors.Errorf("unexpected HTTP status %d: %s", resp.StatusCode, resp.Body)

12
internal/notif/gotify/client.go
View File

@@ -2,6 +2,7 @@ package gotify
import (
"bytes"
"context"
"encoding/json"
"net/http"
"net/url"
@@ -44,10 +45,6 @@ func (c *Client) Send(entry model.NotifEntry) error {
return errors.Wrap(err, "cannot retrieve token secret for Gotify notifier")
}
hc := http.Client{
Timeout: *c.cfg.Timeout,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -92,7 +89,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
q.Set("token", token)
u.RawQuery = q.Encode()
req, err := http.NewRequest("POST", u.String(), bytes.NewBuffer(jsonBody))
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), *c.cfg.Timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", u.String(), bytes.NewBuffer(jsonBody))
if err != nil {
return err
}
@@ -105,6 +106,7 @@ func (c *Client) Send(entry model.NotifEntry) error {
if err != nil {
return err
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
var errBody struct {

12
internal/notif/ntfy/client.go
View File

@@ -2,6 +2,7 @@ package ntfy
import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
@@ -38,10 +39,6 @@ func (c *Client) Name() string {
// Send creates and sends a ntfy notification with an entry
func (c *Client) Send(entry model.NotifEntry) error {
hc := http.Client{
Timeout: *c.cfg.Timeout,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -84,7 +81,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
q := u.Query()
u.RawQuery = q.Encode()
req, err := http.NewRequest("POST", u.String(), dataBuf)
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), *c.cfg.Timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", u.String(), dataBuf)
if err != nil {
return err
}
@@ -99,6 +100,7 @@ func (c *Client) Send(entry model.NotifEntry) error {
if err != nil {
return err
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
var errBody struct {

12
internal/notif/rocketchat/client.go
View File

@@ -2,6 +2,7 @@ package rocketchat
import (
"bytes"
"context"
"encoding/json"
"net/http"
"net/url"
@@ -46,10 +47,6 @@ func (c *Client) Send(entry model.NotifEntry) error {
return errors.Wrap(err, "cannot retrieve token secret for RocketChat notifier")
}
hc := http.Client{
Timeout: *c.cfg.Timeout,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -125,7 +122,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
}
u.Path = path.Join(u.Path, "api/v1/chat.postMessage")
req, err := http.NewRequest("POST", u.String(), dataBuf)
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), *c.cfg.Timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", u.String(), dataBuf)
if err != nil {
return err
}
@@ -139,6 +140,7 @@ func (c *Client) Send(entry model.NotifEntry) error {
if err != nil {
return err
}
defer resp.Body.Close()
var respBody struct {
Success bool `json:"success"`

2
internal/notif/script/client.go
View File

@@ -66,6 +66,6 @@ func (c *Client) Send(entry model.NotifEntry) error {
return errors.Wrap(err, strings.TrimSpace(stderr.String()))
}
log.Debug().Msgf(strings.TrimSpace(stdout.String()))
log.Debug().Msg(strings.TrimSpace(stdout.String()))
return nil
}

20
internal/notif/signalrest/client.go
View File

@@ -2,6 +2,7 @@ package signalrest
import (
"bytes"
"context"
"encoding/json"
"net/http"
@@ -34,10 +35,6 @@ func (c *Client) Name() string {
// Send creates and sends a signalrest notification with an entry
func (c *Client) Send(entry model.NotifEntry) error {
hc := http.Client{
Timeout: *c.cfg.Timeout,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -65,7 +62,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
return err
}
req, err := http.NewRequest("POST", c.cfg.Endpoint, bytes.NewBuffer(body))
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), *c.cfg.Timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", c.cfg.Endpoint, bytes.NewBuffer(body))
if err != nil {
return err
}
@@ -79,6 +80,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
req.Header.Set("Content-Type", "application/json")
req.Header.Set("User-Agent", c.meta.UserAgent)
_, err = hc.Do(req)
return err
resp, err := hc.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
return nil
}

20
internal/notif/teams/client.go
View File

@@ -2,6 +2,7 @@ package teams
import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
@@ -49,10 +50,6 @@ type Fact struct {
// Send creates and sends a webhook notification with an entry
func (c *Client) Send(entry model.NotifEntry) error {
hc := http.Client{
Timeout: time.Duration(10) * time.Second,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -106,7 +103,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
return err
}
req, err := http.NewRequest("POST", c.cfg.WebhookURL, bytes.NewBuffer(jsonBody))
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(10)*time.Second)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", c.cfg.WebhookURL, bytes.NewBuffer(jsonBody))
if err != nil {
return err
}
@@ -114,6 +115,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
req.Header.Add("Content-Type", "application/json")
req.Header.Set("User-Agent", c.meta.UserAgent)
_, err = hc.Do(req)
return err
resp, err := hc.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
return nil
}

20
internal/notif/webhook/client.go
View File

@@ -2,6 +2,7 @@ package webhook
import (
"bytes"
"context"
"net/http"
"github.com/crazy-max/diun/v4/internal/model"
@@ -33,10 +34,6 @@ func (c *Client) Name() string {
// Send creates and sends a webhook notification with an entry
func (c *Client) Send(entry model.NotifEntry) error {
hc := http.Client{
Timeout: *c.cfg.Timeout,
}
message, err := msg.New(msg.Options{
Meta: c.meta,
Entry: entry,
@@ -50,7 +47,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
return err
}
req, err := http.NewRequest(c.cfg.Method, c.cfg.Endpoint, bytes.NewBuffer(body))
hc := http.Client{}
ctx, cancel := context.WithTimeout(context.Background(), *c.cfg.Timeout)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "POST", c.cfg.Endpoint, bytes.NewBuffer(body))
if err != nil {
return err
}
@@ -63,6 +64,11 @@ func (c *Client) Send(entry model.NotifEntry) error {
req.Header.Set("User-Agent", c.meta.UserAgent)
_, err = hc.Do(req)
return err
resp, err := hc.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
return nil
}

8
internal/provider/common_test.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/crazy-max/diun/v4/pkg/registry"
"github.com/crazy-max/diun/v4/pkg/utl"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestValidateImage(t *testing.T) {
@@ -693,10 +693,10 @@ func TestValidateImage(t *testing.T) {
tt.defaults,
)
if tt.expectedErr == nil {
assert.NoError(t, err)
assert.Equal(t, tt.expectedImage, img)
require.NoError(t, err)
require.Equal(t, tt.expectedImage, img)
} else {
assert.ErrorContains(t, err, tt.expectedErr.Error())
require.ErrorContains(t, err, tt.expectedErr.Error())
}
})
}

7
pkg/registry/image.go
View File

@@ -85,13 +85,6 @@ func (i Image) Reference() string {
return i.Tag
}
// WithDigest sets the digest for an image.
func (i Image) WithDigest(digest digest.Digest) (err error) {
i.Digest = digest
i.named, err = reference.WithDigest(i.named, digest)
return err
}
func (i Image) hubLink() (string, error) {
if i.opts.HubTpl != "" {
var out bytes.Buffer

25
pkg/registry/manifest_test.go
View File

@@ -4,6 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestCompareDigest(t *testing.T) {
@@ -26,7 +27,7 @@ func TestCompareDigest(t *testing.T) {
// download manifest
_, _, err = rc.Manifest(img, Manifest{})
assert.NoError(t, err)
require.NoError(t, err)
// check manifest
manifest, _, err := rc.Manifest(img, Manifest{
@@ -36,7 +37,7 @@ func TestCompareDigest(t *testing.T) {
Digest: "sha256:db618981ef3d07699ff6cd8b9d2a81f51a021747bc08c85c1b0e8d11130c2be5",
Platform: "linux/amd64",
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "docker.io/crazymax/diun", manifest.Name)
assert.Equal(t, "2.5.0", manifest.Tag)
assert.Equal(t, "application/vnd.docker.distribution.manifest.list.v2+json", manifest.MIMEType)
@@ -64,7 +65,7 @@ func TestManifest(t *testing.T) {
// download manifest
_, _, err = rc.Manifest(img, Manifest{})
assert.NoError(t, err)
require.NoError(t, err)
// check manifest
manifest, updated, err := rc.Manifest(img, Manifest{
@@ -101,7 +102,7 @@ func TestManifest(t *testing.T) {
}`),
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, false, updated)
assert.Equal(t, "docker.io/portainer/portainer-ce", manifest.Name)
assert.Equal(t, "linux-amd64-2.5.1", manifest.Tag)
@@ -130,7 +131,7 @@ func TestManifestMultiUpdatedPlatform(t *testing.T) {
// download manifest
_, _, err = rc.Manifest(img, Manifest{})
assert.NoError(t, err)
require.NoError(t, err)
// check manifest
manifest, updated, err := rc.Manifest(img, Manifest{
@@ -186,7 +187,7 @@ func TestManifestMultiUpdatedPlatform(t *testing.T) {
}`),
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, true, updated)
assert.Equal(t, "docker.io/library/mongo", manifest.Name)
assert.Equal(t, "3.6.21", manifest.Tag)
@@ -215,7 +216,7 @@ func TestManifestMultiNotUpdatedPlatform(t *testing.T) {
// download manifest
_, _, err = rc.Manifest(img, Manifest{})
assert.NoError(t, err)
require.NoError(t, err)
// check manifest
manifest, updated, err := rc.Manifest(img, Manifest{
@@ -271,7 +272,7 @@ func TestManifestMultiNotUpdatedPlatform(t *testing.T) {
}`),
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, false, updated)
assert.Equal(t, "docker.io/library/mongo", manifest.Name)
assert.Equal(t, "3.6.21", manifest.Tag)
@@ -299,7 +300,7 @@ func TestManifestVariant(t *testing.T) {
}
manifest, _, err := rc.Manifest(img, Manifest{})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "docker.io/crazymax/diun", manifest.Name)
assert.Equal(t, "2.5.0", manifest.Tag)
assert.Equal(t, "application/vnd.docker.distribution.manifest.list.v2+json", manifest.MIMEType)
@@ -327,11 +328,11 @@ func TestManifestTaggedDigest(t *testing.T) {
// download manifest
_, _, err = rc.Manifest(img, Manifest{})
assert.NoError(t, err)
require.NoError(t, err)
// check manifest
manifest, updated, err := rc.Manifest(img, manifestCrazymaxDiun4250)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, false, updated)
assert.Equal(t, "docker.io/crazymax/diun", manifest.Name)
assert.Equal(t, "4.25.0", manifest.Tag)
@@ -359,7 +360,7 @@ func TestManifestTaggedDigestUnknownTag(t *testing.T) {
}
_, _, err = rc.Manifest(img, Manifest{})
assert.Error(t, err)
require.Error(t, err)
}
var manifestCrazymaxDiun4250 = Manifest{

4
pkg/registry/ref.go
View File

@@ -28,9 +28,7 @@ func namedReference(name string) (reference.Named, error) {
ref, err := reference.ParseNormalizedNamed(name)
if err != nil {
return nil, errors.Wrapf(err, "parsing normalized named %q", name)
}
if _, ok := ref.(reference.Named); !ok {
} else if ref == nil {
return nil, errors.Errorf("%q is not a named reference", name)
}

8
pkg/registry/tags_test.go
View File

@@ -23,8 +23,8 @@ func TestTags(t *testing.T) {
t.Error(err)
}
assert.True(t, tags.Total > 0)
assert.True(t, len(tags.List) > 0)
assert.Greater(t, tags.Total, 0)
assert.Greater(t, len(tags.List), 0)
}
func TestTagsWithDigest(t *testing.T) {
@@ -46,8 +46,8 @@ func TestTagsWithDigest(t *testing.T) {
t.Error(err)
}
assert.True(t, tags.Total > 0)
assert.True(t, len(tags.List) > 0)
assert.Greater(t, tags.Total, 0)
assert.Greater(t, len(tags.List), 0)
}
func TestTagsSort(t *testing.T) {