vendor: migrate to distribution/reference (#6223)

See discussion at distribution/distribution#4031. Tilt wasn't directly using `distribution/distribution`, but this is the extracted reference parts and is what Moby & friends are moving to: https://github.com/moby/moby/blob/20f96354699d20eeb4674d3944486b5d73c256b2/vendor.mod#L37 It's an easy find-replace and should be the exact same code, but this will make sure we get reference fixes and don't break on a future Moby update, for example. Signed-off-by: Milas Bowman <[email protected]>
tilt-dev · Sep 15, 2023 · 79db562 · 79db562
1 parent 6057e19
commit 79db562
Show file tree

Hide file tree

Showing 63 changed files with 1,565 additions and 44 deletions.
diff --git a/go.mod b/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/compose-spec/compose-go v1.6.0
 	github.com/davecgh/go-spew v1.1.1
+	github.com/distribution/reference v0.5.0
 	github.com/docker/cli v24.0.5+incompatible
-	github.com/docker/distribution v2.8.2+incompatible
 	github.com/docker/docker v24.0.5+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.5.0
@@ -118,6 +118,7 @@ require (
 	github.com/d4l3k/messagediff v1.2.1 // indirect
 	github.com/denisbrodbeck/machineid v1.0.0 // indirect
 	github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
+	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go v1.5.1-1 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -189,6 +189,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc=
 github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI=
+github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
+github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc=
 github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=

diff --git a/internal/build/custom_builder.go b/internal/build/custom_builder.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	ktypes "k8s.io/apimachinery/pkg/types"

diff --git a/internal/build/docker_builder.go b/internal/build/docker_builder.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"

diff --git a/internal/build/image_builder.go b/internal/build/image_builder.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/tilt-dev/clusterid"

diff --git a/internal/build/image_reaper.go b/internal/build/image_reaper.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"

diff --git a/internal/build/kind.go b/internal/build/kind.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 
 	"github.com/tilt-dev/clusterid"
 	"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"

diff --git a/internal/build/test_utils.go b/internal/build/test_utils.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/stretchr/testify/assert"

diff --git a/internal/cli/demo/k3d.go b/internal/cli/demo/k3d.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types/mount"
 
 	"github.com/tilt-dev/tilt/internal/docker"

diff --git a/internal/container/container.go b/internal/container/container.go
@@ -3,7 +3,7 @@ package container
 import (
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 )
 

diff --git a/internal/container/helpers.go b/internal/container/helpers.go
@@ -1,6 +1,6 @@
 package container
 
-import "github.com/docker/distribution/reference"
+import "github.com/distribution/reference"
 
 func FamiliarString(ref reference.Reference) string {
 	s, ok := ref.(RefSelector)

diff --git a/internal/container/reference.go b/internal/container/reference.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 
 	"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"

diff --git a/internal/container/registry.go b/internal/container/registry.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 
 	"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"

diff --git a/internal/container/selector.go b/internal/container/selector.go
@@ -3,7 +3,7 @@ package container
 import (
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 
 	"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"
 )

diff --git a/internal/controllers/core/dockerimage/imagemap.go b/internal/controllers/core/dockerimage/imagemap.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 

diff --git a/internal/docker/client.go b/internal/docker/client.go
@@ -12,9 +12,9 @@ import (
 	"sync"
 
 	"github.com/blang/semver"
+	"github.com/distribution/reference"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config"
-	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 	mobycontainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"

diff --git a/internal/docker/client_integration_test.go b/internal/docker/client_integration_test.go
@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/stretchr/testify/require"
 
 	"github.com/tilt-dev/clusterid"

diff --git a/internal/docker/exploding.go b/internal/docker/exploding.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"golang.org/x/sync/errgroup"

diff --git a/internal/docker/fake_client.go b/internal/docker/fake_client.go
@@ -15,7 +15,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	apicontainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"

diff --git a/internal/docker/image.go b/internal/docker/image.go
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 )
 
 const TagLatest = "latest"

diff --git a/internal/docker/run.go b/internal/docker/run.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	mobycontainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
 )

diff --git a/internal/docker/switch.go b/internal/docker/switch.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"golang.org/x/sync/errgroup"

diff --git a/internal/dockerfile/ast.go b/internal/dockerfile/ast.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"strings"
 
+	"github.com/distribution/reference"
 	"github.com/docker/cli/opts"
-	"github.com/docker/distribution/reference"
 	"github.com/moby/buildkit/frontend/dockerfile/command"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"

diff --git a/internal/dockerfile/dockerfile.go b/internal/dockerfile/dockerfile.go
@@ -1,7 +1,7 @@
 package dockerfile
 
 import (
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
 )
 

diff --git a/internal/dockerfile/inject.go b/internal/dockerfile/inject.go
@@ -1,7 +1,7 @@
 package dockerfile
 
 import (
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 
 	"github.com/tilt-dev/tilt/internal/container"
 )

diff --git a/internal/engine/build_and_deployer_test.go b/internal/engine/build_and_deployer_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"

diff --git a/internal/engine/buildcontrol/image_build_and_deployer_test.go b/internal/engine/buildcontrol/image_build_and_deployer_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/jonboulle/clockwork"
 	"github.com/opencontainers/go-digest"

diff --git a/internal/engine/buildcontrol/target_queue.go b/internal/engine/buildcontrol/target_queue.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 
 	"github.com/tilt-dev/tilt/internal/container"

diff --git a/internal/engine/buildcontrol/target_queue_test.go b/internal/engine/buildcontrol/target_queue_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/tilt-dev/tilt/internal/testutils"

diff --git a/internal/engine/dockerprune/docker_pruner_test.go b/internal/engine/dockerprune/docker_pruner_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/go-units"

diff --git a/internal/engine/upper_test.go b/internal/engine/upper_test.go
@@ -17,7 +17,7 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/google/uuid"
 	"github.com/jonboulle/clockwork"

diff --git a/internal/k8s/exploding_client.go b/internal/k8s/exploding_client.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/internal/k8s/fake_client.go b/internal/k8s/fake_client.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"

diff --git a/internal/k8s/image.go b/internal/k8s/image.go
@@ -3,7 +3,7 @@ package k8s
 import (
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/internal/k8s/image_test.go b/internal/k8s/image_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/opencontainers/go-digest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/internal/k8s/locator.go b/internal/k8s/locator.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/internal/store/build_result.go b/internal/store/build_result.go
@@ -3,7 +3,7 @@ package store
 import (
 	"sort"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 
 	"github.com/tilt-dev/tilt/internal/container"
 	"github.com/tilt-dev/tilt/internal/store/k8sconv"

diff --git a/internal/tiltfile/build_index.go b/internal/tiltfile/build_index.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/schollz/closestmatch"
 
 	"github.com/tilt-dev/tilt/internal/container"

diff --git a/internal/tiltfile/docker.go b/internal/tiltfile/docker.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
 	"github.com/pkg/errors"
 	"go.starlark.net/starlark"

diff --git a/internal/tiltfile/docker_compose.go b/internal/tiltfile/docker_compose.go
@@ -18,7 +18,7 @@ import (
 	// see https://github.com/tilt-dev/tilt/issues/4797
 	composeyaml "gopkg.in/yaml.v2"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 	"go.starlark.net/starlark"
 

diff --git a/internal/tiltfile/k8s.go b/internal/tiltfile/k8s.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 	"go.starlark.net/starlark"
 	"go.starlark.net/syntax"

diff --git a/internal/tiltfile/k8s_custom_deploy.go b/internal/tiltfile/k8s_custom_deploy.go
@@ -3,7 +3,7 @@ package tiltfile
 import (
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/pkg/errors"
 	"go.starlark.net/starlark"
 

diff --git a/internal/tiltfile/value/image.go b/internal/tiltfile/value/image.go
@@ -3,7 +3,7 @@ package value
 import (
 	"fmt"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"go.starlark.net/starlark"
 )