Skip to content

Commit 4e43e5e

Browse files
hiddecohiddeco
committed
misc: order imports and align digest aliases
Signed-off-by: Hidde Beydals <hello@hidde.co>
1 parent b733fe0 commit 4e43e5e

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

‎controllers/helmrepository_controller.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ import (
2121
"crypto/tls"
2222
"errors"
2323
"fmt"
24-
"github.com/fluxcd/source-controller/internal/digest"
2524
"net/url"
2625
"time"
2726

2827
"github.com/docker/go-units"
29-
digestlib "github.com/opencontainers/go-digest"
28+
"github.com/opencontainers/go-digest"
3029
helmgetter "helm.sh/helm/v3/pkg/getter"
3130
corev1 "k8s.io/api/core/v1"
3231
"k8s.io/apimachinery/pkg/runtime"
@@ -49,6 +48,7 @@ import (
4948

5049
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
5150
"github.com/fluxcd/source-controller/internal/cache"
51+
intdigest "github.com/fluxcd/source-controller/internal/digest"
5252
serror "github.com/fluxcd/source-controller/internal/error"
5353
"github.com/fluxcd/source-controller/internal/helm/getter"
5454
"github.com/fluxcd/source-controller/internal/helm/repository"
@@ -469,9 +469,9 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, sp *patc
469469

470470
// Early comparison to current Artifact.
471471
if curArtifact := obj.GetArtifact(); curArtifact != nil {
472-
curDig := digestlib.Digest(curArtifact.Digest)
472+
curDig := digest.Digest(curArtifact.Digest)
473473
if curDig == "" {
474-
curDig = digestlib.Digest(sourcev1.TransformLegacyRevision(curArtifact.Checksum))
474+
curDig = digest.Digest(sourcev1.TransformLegacyRevision(curArtifact.Checksum))
475475
}
476476
if curDig.Validate() == nil {
477477
// Short-circuit based on the fetched index being an exact match to the
@@ -500,12 +500,12 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, sp *patc
500500
// Check if index has changed compared to current Artifact revision.
501501
var changed bool
502502
if artifact := obj.Status.Artifact; artifact != nil {
503-
curRev := digestlib.Digest(sourcev1.TransformLegacyRevision(artifact.Revision))
503+
curRev := digest.Digest(sourcev1.TransformLegacyRevision(artifact.Revision))
504504
changed = curRev.Validate() != nil || curRev != chartRepo.Revision(curRev.Algorithm())
505505
}
506506

507507
// Calculate revision.
508-
revision := chartRepo.Revision(digest.Canonical)
508+
revision := chartRepo.Revision(intdigest.Canonical)
509509
if revision.Validate() != nil {
510510
e := &serror.Event{
511511
Err: fmt.Errorf("failed to calculate revision: %w", err),

‎controllers/helmrepository_controller_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ import (
2121
"crypto/tls"
2222
"errors"
2323
"fmt"
24-
"github.com/fluxcd/source-controller/internal/cache"
25-
"github.com/fluxcd/source-controller/internal/digest"
26-
digestlib "github.com/opencontainers/go-digest"
27-
"helm.sh/helm/v3/pkg/repo"
2824
"net/http"
2925
"os"
3026
"path/filepath"
@@ -33,7 +29,9 @@ import (
3329
"time"
3430

3531
. "github.com/onsi/gomega"
32+
"github.com/opencontainers/go-digest"
3633
helmgetter "helm.sh/helm/v3/pkg/getter"
34+
"helm.sh/helm/v3/pkg/repo"
3735
corev1 "k8s.io/api/core/v1"
3836
apierrors "k8s.io/apimachinery/pkg/api/errors"
3937
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,6 +48,8 @@ import (
5048
"github.com/fluxcd/pkg/runtime/patch"
5149

5250
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
51+
"github.com/fluxcd/source-controller/internal/cache"
52+
intdigest "github.com/fluxcd/source-controller/internal/digest"
5353
"github.com/fluxcd/source-controller/internal/helm/getter"
5454
"github.com/fluxcd/source-controller/internal/helm/repository"
5555
sreconcile "github.com/fluxcd/source-controller/internal/reconcile"
@@ -316,7 +316,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
316316
server options
317317
url string
318318
secret *corev1.Secret
319-
beforeFunc func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digestlib.Digest)
319+
beforeFunc func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digest.Digest)
320320
afterFunc func(t *WithT, obj *sourcev1.HelmRepository, artifact sourcev1.Artifact, chartRepo *repository.ChartRepository)
321321
want sreconcile.Result
322322
wantErr bool
@@ -371,7 +371,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
371371
"password": []byte("1234"),
372372
},
373373
},
374-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
374+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
375375
obj.Spec.SecretRef = &meta.LocalObjectReference{Name: "basic-auth"}
376376
},
377377
want: sreconcile.ResultSuccess,
@@ -402,7 +402,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
402402
"caFile": tlsCA,
403403
},
404404
},
405-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
405+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
406406
obj.Spec.SecretRef = &meta.LocalObjectReference{Name: "ca-file"}
407407
},
408408
want: sreconcile.ResultSuccess,
@@ -433,7 +433,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
433433
"caFile": []byte("invalid"),
434434
},
435435
},
436-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
436+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
437437
obj.Spec.SecretRef = &meta.LocalObjectReference{Name: "invalid-ca"}
438438
conditions.MarkReconciling(obj, meta.ProgressingReason, "foo")
439439
conditions.MarkUnknown(obj, meta.ReadyCondition, "foo", "bar")
@@ -455,7 +455,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
455455
{
456456
name: "Invalid URL makes FetchFailed=True and returns stalling error",
457457
protocol: "http",
458-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
458+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
459459
obj.Spec.URL = strings.ReplaceAll(obj.Spec.URL, "http://", "")
460460
conditions.MarkReconciling(obj, meta.ProgressingReason, "foo")
461461
conditions.MarkUnknown(obj, meta.ReadyCondition, "foo", "bar")
@@ -478,7 +478,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
478478
{
479479
name: "Unsupported scheme makes FetchFailed=True and returns stalling error",
480480
protocol: "http",
481-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
481+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
482482
obj.Spec.URL = strings.ReplaceAll(obj.Spec.URL, "http://", "ftp://")
483483
conditions.MarkReconciling(obj, meta.ProgressingReason, "foo")
484484
conditions.MarkUnknown(obj, meta.ReadyCondition, "foo", "bar")
@@ -501,7 +501,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
501501
{
502502
name: "Missing secret returns FetchFailed=True and returns error",
503503
protocol: "http",
504-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
504+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
505505
obj.Spec.SecretRef = &meta.LocalObjectReference{Name: "non-existing"}
506506
conditions.MarkReconciling(obj, meta.ProgressingReason, "foo")
507507
conditions.MarkUnknown(obj, meta.ReadyCondition, "foo", "bar")
@@ -531,7 +531,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
531531
"username": []byte("git"),
532532
},
533533
},
534-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
534+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
535535
obj.Spec.SecretRef = &meta.LocalObjectReference{Name: "malformed-basic-auth"}
536536
conditions.MarkReconciling(obj, meta.ProgressingReason, "foo")
537537
conditions.MarkUnknown(obj, meta.ReadyCondition, "foo", "bar")
@@ -553,7 +553,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
553553
{
554554
name: "Stored index with same digest and revision",
555555
protocol: "http",
556-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digestlib.Digest) {
556+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digest.Digest) {
557557
obj.Status.Artifact = &sourcev1.Artifact{
558558
Revision: revision.String(),
559559
Digest: digest.String(),
@@ -579,7 +579,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
579579
{
580580
name: "Stored index with same checksum and (legacy) revision",
581581
protocol: "http",
582-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digestlib.Digest) {
582+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digest.Digest) {
583583
obj.Status.Artifact = &sourcev1.Artifact{
584584
Revision: revision.Hex(),
585585
Checksum: digest.Hex(),
@@ -604,7 +604,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
604604
{
605605
name: "Stored index with different digest and same revision",
606606
protocol: "http",
607-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digestlib.Digest) {
607+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, digest digest.Digest) {
608608
obj.Status.Artifact = &sourcev1.Artifact{
609609
Revision: revision.String(),
610610
Digest: "sha256:80bb3dd67c63095d985850459834ea727603727a370079de90d221191d375a86",
@@ -632,7 +632,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
632632
{
633633
name: "Stored index with different revision and digest",
634634
protocol: "http",
635-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
635+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
636636
obj.Status.Artifact = &sourcev1.Artifact{
637637
Revision: "80bb3dd67c63095d985850459834ea727603727a370079de90d221191d375a86",
638638
Checksum: "80bb3dd67c63095d985850459834ea727603727a370079de90d221191d375a86",
@@ -660,7 +660,7 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
660660
{
661661
name: "Existing artifact makes ArtifactOutdated=True",
662662
protocol: "http",
663-
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digestlib.Digest) {
663+
beforeFunc: func(t *WithT, obj *sourcev1.HelmRepository, revision, checksum digest.Digest) {
664664
obj.Status.Artifact = &sourcev1.Artifact{
665665
Path: "some-path",
666666
Revision: "some-rev",
@@ -769,13 +769,13 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
769769

770770
// NOTE: checksum will be empty in beforeFunc for invalid repo
771771
// configurations as the client can't get the repo.
772-
var revision, checksum digestlib.Digest
772+
var revision, checksum digest.Digest
773773
if validSecret {
774774
g.Expect(newChartRepo.CacheIndex()).To(Succeed())
775-
checksum = newChartRepo.Digest(digest.Canonical)
775+
checksum = newChartRepo.Digest(intdigest.Canonical)
776776

777777
g.Expect(newChartRepo.LoadFromPath()).To(Succeed())
778-
revision = newChartRepo.Revision(digest.Canonical)
778+
revision = newChartRepo.Revision(intdigest.Canonical)
779779
}
780780
if tt.beforeFunc != nil {
781781
tt.beforeFunc(g, obj, revision, checksum)

‎controllers/storage.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434

3535
securejoin "github.com/cyphar/filepath-securejoin"
3636
"github.com/fluxcd/go-git/v5/plumbing/format/gitignore"
37-
digestlib "github.com/opencontainers/go-digest"
37+
"github.com/opencontainers/go-digest"
3838
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3939
kerrors "k8s.io/apimachinery/pkg/util/errors"
4040

@@ -43,7 +43,7 @@ import (
4343
"github.com/fluxcd/pkg/untar"
4444

4545
sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
46-
"github.com/fluxcd/source-controller/internal/digest"
46+
intdigest "github.com/fluxcd/source-controller/internal/digest"
4747
sourcefs "github.com/fluxcd/source-controller/internal/fs"
4848
)
4949

@@ -360,7 +360,7 @@ func (s *Storage) Archive(artifact *sourcev1.Artifact, dir string, filter Archiv
360360
}
361361
}()
362362

363-
md, err := digest.NewMultiDigester(digest.Canonical, digestlib.SHA256)
363+
md, err := intdigest.NewMultiDigester(intdigest.Canonical, digest.SHA256)
364364
if err != nil {
365365
return fmt.Errorf("failed to create digester: %w", err)
366366
}
@@ -455,8 +455,8 @@ func (s *Storage) Archive(artifact *sourcev1.Artifact, dir string, filter Archiv
455455
return err
456456
}
457457

458-
artifact.Digest = md.Digest(digest.Canonical).String()
459-
artifact.Checksum = md.Digest(digestlib.SHA256).Encoded()
458+
artifact.Digest = md.Digest(intdigest.Canonical).String()
459+
artifact.Checksum = md.Digest(digest.SHA256).Encoded()
460460
artifact.LastUpdateTime = metav1.Now()
461461
artifact.Size = &sz.written
462462

@@ -478,7 +478,7 @@ func (s *Storage) AtomicWriteFile(artifact *sourcev1.Artifact, reader io.Reader,
478478
}
479479
}()
480480

481-
md, err := digest.NewMultiDigester(digest.Canonical, digestlib.SHA256)
481+
md, err := intdigest.NewMultiDigester(intdigest.Canonical, digest.SHA256)
482482
if err != nil {
483483
return fmt.Errorf("failed to create digester: %w", err)
484484
}
@@ -501,8 +501,8 @@ func (s *Storage) AtomicWriteFile(artifact *sourcev1.Artifact, reader io.Reader,
501501
return err
502502
}
503503

504-
artifact.Digest = md.Digest(digest.Canonical).String()
505-
artifact.Checksum = md.Digest(digestlib.SHA256).Encoded()
504+
artifact.Digest = md.Digest(intdigest.Canonical).String()
505+
artifact.Checksum = md.Digest(digest.SHA256).Encoded()
506506
artifact.LastUpdateTime = metav1.Now()
507507
artifact.Size = &sz.written
508508

@@ -524,7 +524,7 @@ func (s *Storage) Copy(artifact *sourcev1.Artifact, reader io.Reader) (err error
524524
}
525525
}()
526526

527-
md, err := digest.NewMultiDigester(digest.Canonical, digestlib.SHA256)
527+
md, err := intdigest.NewMultiDigester(intdigest.Canonical, digest.SHA256)
528528
if err != nil {
529529
return fmt.Errorf("failed to create digester: %w", err)
530530
}
@@ -543,8 +543,8 @@ func (s *Storage) Copy(artifact *sourcev1.Artifact, reader io.Reader) (err error
543543
return err
544544
}
545545

546-
artifact.Digest = md.Digest(digest.Canonical).String()
547-
artifact.Checksum = md.Digest(digestlib.SHA256).Encoded()
546+
artifact.Digest = md.Digest(intdigest.Canonical).String()
547+
artifact.Checksum = md.Digest(digest.SHA256).Encoded()
548548
artifact.LastUpdateTime = metav1.Now()
549549
artifact.Size = &sz.written
550550

‎internal/helm/repository/chart_repository_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"time"
2929

3030
. "github.com/onsi/gomega"
31-
digestlib "github.com/opencontainers/go-digest"
31+
"github.com/opencontainers/go-digest"
3232
"helm.sh/helm/v3/pkg/chart"
3333
helmgetter "helm.sh/helm/v3/pkg/getter"
3434
"helm.sh/helm/v3/pkg/repo"
@@ -512,7 +512,7 @@ func TestChartRepository_Revision(t *testing.T) {
512512
r := newChartRepository()
513513
r.Index = repo.NewIndexFile()
514514

515-
for _, algo := range []digestlib.Algorithm{digestlib.SHA256, digestlib.SHA512} {
515+
for _, algo := range []digest.Algorithm{digest.SHA256, digest.SHA512} {
516516
t.Run(algo.String(), func(t *testing.T) {
517517
g := NewWithT(t)
518518

@@ -528,14 +528,14 @@ func TestChartRepository_Revision(t *testing.T) {
528528
g := NewWithT(t)
529529

530530
r := newChartRepository()
531-
g.Expect(r.Revision(digestlib.SHA256)).To(BeEmpty())
531+
g.Expect(r.Revision(digest.SHA256)).To(BeEmpty())
532532
})
533533

534534
t.Run("from cache", func(t *testing.T) {
535535
g := NewWithT(t)
536536

537-
algo := digestlib.SHA256
538-
expect := digestlib.Digest("sha256:fake")
537+
algo := digest.SHA256
538+
expect := digest.Digest("sha256:fake")
539539

540540
r := newChartRepository()
541541
r.Index = repo.NewIndexFile()
@@ -555,7 +555,7 @@ func TestChartRepository_Digest(t *testing.T) {
555555
r := newChartRepository()
556556
r.Path = p
557557

558-
for _, algo := range []digestlib.Algorithm{digestlib.SHA256, digestlib.SHA512} {
558+
for _, algo := range []digest.Algorithm{digest.SHA256, digest.SHA512} {
559559
t.Run(algo.String(), func(t *testing.T) {
560560
g := NewWithT(t)
561561

@@ -571,14 +571,14 @@ func TestChartRepository_Digest(t *testing.T) {
571571
g := NewWithT(t)
572572

573573
r := newChartRepository()
574-
g.Expect(r.Digest(digestlib.SHA256)).To(BeEmpty())
574+
g.Expect(r.Digest(digest.SHA256)).To(BeEmpty())
575575
})
576576

577577
t.Run("from cache", func(t *testing.T) {
578578
g := NewWithT(t)
579579

580-
algo := digestlib.SHA256
581-
expect := digestlib.Digest("sha256:fake")
580+
algo := digest.SHA256
581+
expect := digest.Digest("sha256:fake")
582582

583583
i := filepath.Join(t.TempDir(), "index.yaml")
584584
g.Expect(os.WriteFile(i, []byte(`apiVersion: v1`), 0o644)).To(Succeed())

0 commit comments

Comments
 (0)