diff options
| author | MichaelKo <viacheslav.sychov@gmail.com> | 2023-08-10 14:20:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 08:20:23 -0400 |
| commit | c6cce47e2ae47e5bd67f98d993be4f476f7cadfa (patch) | |
| tree | 98dbe487f62d0061a78baac5b77b49a0373e3ca9 /pkg | |
| parent | d5a8f9436e301750c02943ac04090f410966df44 (diff) | |
chore(deps): upgrade dependencies for fix vulnerabilities (#599)
Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/argocd/update_test.go | 18 | ||||
| -rw-r--r-- | pkg/registry/client.go | 8 | ||||
| -rw-r--r-- | pkg/registry/client_test.go | 26 | ||||
| -rw-r--r-- | pkg/registry/registry_test.go | 8 |
4 files changed, 30 insertions, 30 deletions
diff --git a/pkg/argocd/update_test.go b/pkg/argocd/update_test.go index c748206..830b495 100644 --- a/pkg/argocd/update_test.go +++ b/pkg/argocd/update_test.go @@ -23,7 +23,7 @@ import ( "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" argogit "github.com/argoproj/argo-cd/v2/util/git" - "github.com/distribution/distribution/v3/manifest/schema1" + "github.com/distribution/distribution/v3/manifest/schema1" //nolint:staticcheck "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -687,12 +687,12 @@ func Test_UpdateApplication(t *testing.T) { }) t.Run("Test skip because of match-tag pattern doesn't match", func(t *testing.T) { - meta := make([]*schema1.SignedManifest, 4) + meta := make([]*schema1.SignedManifest, 4) //nolint:staticcheck for i := 0; i < 4; i++ { ts := fmt.Sprintf("2006-01-02T15:%.02d:05.999999999Z", i) - meta[i] = &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{ + meta[i] = &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{ //nolint:staticcheck { V1Compatibility: `{"created":"` + ts + `"}`, }, @@ -763,12 +763,12 @@ func Test_UpdateApplication(t *testing.T) { }) t.Run("Test skip because of ignored", func(t *testing.T) { - meta := make([]*schema1.SignedManifest, 4) + meta := make([]*schema1.SignedManifest, 4) //nolint:staticcheck for i := 0; i < 4; i++ { ts := fmt.Sprintf("2006-01-02T15:%.02d:05.999999999Z", i) - meta[i] = &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{ + meta[i] = &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{ //nolint:staticcheck { V1Compatibility: `{"created":"` + ts + `"}`, }, diff --git a/pkg/registry/client.go b/pkg/registry/client.go index eb0ad31..8673752 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -15,7 +15,7 @@ import ( "github.com/distribution/distribution/v3" "github.com/distribution/distribution/v3/manifest/manifestlist" "github.com/distribution/distribution/v3/manifest/ocischema" - "github.com/distribution/distribution/v3/manifest/schema1" + "github.com/distribution/distribution/v3/manifest/schema1" //nolint:staticcheck "github.com/distribution/distribution/v3/manifest/schema2" "github.com/distribution/distribution/v3/reference" "github.com/distribution/distribution/v3/registry/client" @@ -39,7 +39,7 @@ import ( // knownMediaTypes is the list of media types we can process var knownMediaTypes = []string{ ocischema.SchemaVersion.MediaType, - schema1.MediaTypeSignedManifest, + schema1.MediaTypeSignedManifest, //nolint:staticcheck schema2.SchemaVersion.MediaType, manifestlist.SchemaVersion.MediaType, ociv1.MediaTypeImageIndex, @@ -214,8 +214,8 @@ func (client *registryClient) TagMetadata(manifest distribution.Manifest, opts * // switch deserialized := manifest.(type) { - case *schema1.SignedManifest: - var man schema1.Manifest = deserialized.Manifest + case *schema1.SignedManifest: //nolint:staticcheck + var man schema1.Manifest = deserialized.Manifest //nolint:staticcheck if len(man.History) == 0 { return nil, fmt.Errorf("no history information found in schema V1") } diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go index 8bf2a8e..e28a653 100644 --- a/pkg/registry/client_test.go +++ b/pkg/registry/client_test.go @@ -5,15 +5,15 @@ import ( "github.com/argoproj-labs/argocd-image-updater/pkg/options" - "github.com/distribution/distribution/v3/manifest/schema1" + "github.com/distribution/distribution/v3/manifest/schema1" //nolint:staticcheck "github.com/stretchr/testify/require" ) func Test_TagMetadata(t *testing.T) { t.Run("Check for correct error handling when manifest contains no history", func(t *testing.T) { - meta1 := &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{}, + meta1 := &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{}, //nolint:staticcheck }, } ep, err := GetRegistryEndpoint("") @@ -25,9 +25,9 @@ func Test_TagMetadata(t *testing.T) { }) t.Run("Check for correct error handling when manifest contains invalid history", func(t *testing.T) { - meta1 := &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{ + meta1 := &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{ //nolint:staticcheck { V1Compatibility: `{"created": {"something": "notastring"}}`, }, @@ -44,9 +44,9 @@ func Test_TagMetadata(t *testing.T) { }) t.Run("Check for correct error handling when manifest contains invalid history", func(t *testing.T) { - meta1 := &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{ + meta1 := &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{ //nolint:staticcheck { V1Compatibility: `{"something": "something"}`, }, @@ -65,9 +65,9 @@ func Test_TagMetadata(t *testing.T) { t.Run("Check for correct error handling when time stamp cannot be parsed", func(t *testing.T) { ts := "invalid" - meta1 := &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{ + meta1 := &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{ //nolint:staticcheck { V1Compatibility: `{"created":"` + ts + `"}`, }, diff --git a/pkg/registry/registry_test.go b/pkg/registry/registry_test.go index d558944..00f7138 100644 --- a/pkg/registry/registry_test.go +++ b/pkg/registry/registry_test.go @@ -10,7 +10,7 @@ import ( "github.com/argoproj-labs/argocd-image-updater/pkg/registry/mocks" "github.com/argoproj-labs/argocd-image-updater/pkg/tag" - "github.com/distribution/distribution/v3/manifest/schema1" + "github.com/distribution/distribution/v3/manifest/schema1" //nolint:staticcheck "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -81,9 +81,9 @@ func Test_GetTags(t *testing.T) { t.Run("Check for correctly returned tags with latest sort", func(t *testing.T) { ts := "2006-01-02T15:04:05.999999999Z" - meta1 := &schema1.SignedManifest{ - Manifest: schema1.Manifest{ - History: []schema1.History{ + meta1 := &schema1.SignedManifest{ //nolint:staticcheck + Manifest: schema1.Manifest{ //nolint:staticcheck + History: []schema1.History{ //nolint:staticcheck { V1Compatibility: `{"created":"` + ts + `"}`, }, |
