feat: pass context when fetching digests

This commit is contained in:
nils måsén 2022-12-06 20:47:08 +01:00
parent b71eb2dec7
commit 9220b51665
5 changed files with 40 additions and 33 deletions

View file

@ -2,20 +2,21 @@ package digest_test
import (
"fmt"
"net/http"
"os"
"testing"
"time"
"github.com/containrrr/watchtower/internal/actions/mocks"
"github.com/containrrr/watchtower/pkg/registry/digest"
wtTypes "github.com/containrrr/watchtower/pkg/types"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/ghttp"
"net/http"
"os"
"testing"
"time"
"golang.org/x/net/context"
)
func TestDigest(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(GinkgoT(), "Digest Suite")
}
@ -29,6 +30,7 @@ var (
Username: os.Getenv("CI_INTEGRATION_TEST_REGISTRY_GH_USERNAME"),
Password: os.Getenv("CI_INTEGRATION_TEST_REGISTRY_GH_PASSWORD"),
}
ctx = context.Background()
)
func SkipIfCredentialsEmpty(credentials *wtTypes.RegistryCredentials, fn func()) func() {
@ -65,7 +67,7 @@ var _ = Describe("Digests", func() {
It("should return true if digests match",
SkipIfCredentialsEmpty(GHCRCredentials, func() {
creds := fmt.Sprintf("%s:%s", GHCRCredentials.Username, GHCRCredentials.Password)
matches, err := digest.CompareDigest(mockContainer, creds)
matches, err := digest.CompareDigest(ctx, mockContainer, creds)
Expect(err).NotTo(HaveOccurred())
Expect(matches).To(Equal(true))
}),
@ -78,7 +80,7 @@ var _ = Describe("Digests", func() {
})
It("should return an error when container contains no image info", func() {
matches, err := digest.CompareDigest(mockContainerNoImage, `user:pass`)
matches, err := digest.CompareDigest(ctx, mockContainerNoImage, `user:pass`)
Expect(err).To(HaveOccurred())
Expect(matches).To(Equal(false))
})
@ -116,7 +118,7 @@ var _ = Describe("Digests", func() {
}),
),
)
dig, err := digest.GetDigest(server.URL(), "token")
dig, err := digest.GetDigest(ctx, server.URL(), "token")
Expect(server.ReceivedRequests()).Should(HaveLen(1))
Expect(err).NotTo(HaveOccurred())
Expect(dig).To(Equal(mockDigest))