Skip to content

Commit 371b3ae

Browse files
committed
tests: don't use purl code to test itself
Signed-off-by: Justin Chadwell <[email protected]>
1 parent 36917a9 commit 371b3ae

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

client/client_test.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"io"
1616
"net"
1717
"net/http"
18+
"net/url"
1819
"os"
1920
"path"
2021
"path/filepath"
@@ -35,6 +36,7 @@ import (
3536
"github.com/containerd/containerd/remotes/docker"
3637
"github.com/containerd/containerd/snapshots"
3738
"github.com/containerd/continuity/fs/fstest"
39+
"github.com/docker/distribution/reference"
3840
intoto "github.com/in-toto/in-toto-golang/in_toto"
3941
controlapi "github.com/moby/buildkit/api/services/control"
4042
"github.com/moby/buildkit/client/llb"
@@ -53,7 +55,6 @@ import (
5355
"github.com/moby/buildkit/util/attestation"
5456
"github.com/moby/buildkit/util/contentutil"
5557
"github.com/moby/buildkit/util/entitlements"
56-
"github.com/moby/buildkit/util/purl"
5758
"github.com/moby/buildkit/util/testutil"
5859
"github.com/moby/buildkit/util/testutil/echoserver"
5960
"github.com/moby/buildkit/util/testutil/httpserver"
@@ -7564,7 +7565,14 @@ func testExportAttestations(t *testing.T, sb integration.Sandbox) {
75647565

75657566
purls := map[string]string{}
75667567
for _, k := range targets {
7567-
p, _ := purl.RefToPURL(k, &ps[i])
7568+
named, err := reference.ParseNormalizedNamed(k)
7569+
require.NoError(t, err)
7570+
name := reference.FamiliarName(named)
7571+
version := ""
7572+
if tagged, ok := named.(reference.Tagged); ok {
7573+
version = tagged.Tag()
7574+
}
7575+
p := fmt.Sprintf("pkg:docker/%s%s@%s?platform=%s", url.QueryEscape(registry), strings.TrimPrefix(name, registry), version, url.PathEscape(platforms.Format(ps[i])))
75687576
purls[k] = p
75697577
}
75707578

@@ -7852,8 +7860,7 @@ func testAttestationDefaultSubject(t *testing.T, sb integration.Sandbox) {
78527860
require.Equal(t, "https://example.com/attestations/v1.0", attest.PredicateType)
78537861
require.Equal(t, map[string]interface{}{"success": true}, attest.Predicate)
78547862

7855-
name, _ := purl.RefToPURL(target, &ps[0])
7856-
7863+
name := fmt.Sprintf("pkg:docker/%s/buildkit/testattestationsemptysubject@latest?platform=%s", url.QueryEscape(registry), url.QueryEscape(platforms.Format(ps[i])))
78577864
subjects := []intoto.Subject{{
78587865
Name: name,
78597866
Digest: map[string]string{
@@ -8004,7 +8011,7 @@ func testAttestationBundle(t *testing.T, sb integration.Sandbox) {
80048011

80058012
require.Equal(t, "https://example.com/attestations/v1.0", attest.PredicateType)
80068013
require.Equal(t, map[string]interface{}{"foo": "1"}, attest.Predicate)
8007-
name, _ := purl.RefToPURL(target, &ps[i])
8014+
name := fmt.Sprintf("pkg:docker/%s/buildkit/testattestationsbundle@latest?platform=%s", url.QueryEscape(registry), url.QueryEscape(platforms.Format(ps[i])))
80088015
subjects := []intoto.Subject{{
80098016
Name: name,
80108017
Digest: map[string]string{

0 commit comments

Comments
 (0)