chore: Bump dependencies for skaffold 2.15 release

fs/assets/credits_generated/github.com/hashicorp/hcl/hcl/printer/nodes.go

@@ -721,10 +721,9 @@ func (p *printer) heredocIndent(buf []byte) []byte {
 //
 // A single line object:
 //
-//   * has no lead comments (hence multi-line)
-//   * has no assignment
-//   * has no values in the stanza (within {})
-//
+//   - has no lead comments (hence multi-line)
+//   - has no assignment
+//   - has no values in the stanza (within {})
 func (p *printer) isSingleLineObject(val *ast.ObjectItem) bool {
 	// If there is a lead comment, can't be one line
 	if val.LeadComment != nil {

pkg/skaffold/debug/cnb.go

@@ -24,9 +24,9 @@ import (
 
 	"github.com/buildpacks/lifecycle/api"
 	cnbl "github.com/buildpacks/lifecycle/launch"
-	cnb "github.com/buildpacks/lifecycle/platform/files"
 	shell "github.com/kballard/go-shellquote"
 
+	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/debug/metadata"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/debug/types"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/output/log"
 )
@@ -115,7 +115,7 @@ func updateForCNBImage(adapter types.ContainerAdapter, ic ImageConfiguration, tr
 	if !found {
 		return types.ContainerDebugConfiguration{}, "", fmt.Errorf("image is missing buildpacks metadata; perhaps built with older lifecycle?")
 	}
-	m := cnb.BuildMetadata{}
+	m := metadata.BuildMetadata{}
 	if err := json.Unmarshal([]byte(metadataJSON), &m); err != nil {
 		return types.ContainerDebugConfiguration{}, "", fmt.Errorf("unable to parse image buildpacks metadata")
 	}
@@ -159,7 +159,7 @@ func updateForCNBImage(adapter types.ContainerAdapter, ic ImageConfiguration, tr
 // in a form suitable for the normal `skaffold debug` transformations.  It returns an
 // amended configuration with a function to re-transform the command-line to the form
 // expected by cnbLauncher.
-func adjustCommandLine(m cnb.BuildMetadata, ic ImageConfiguration) (ImageConfiguration, func([]string) []string) {
+func adjustCommandLine(m metadata.BuildMetadata, ic ImageConfiguration) (ImageConfiguration, func([]string) []string) {
 	// check for direct exec
 	if hasCNBLauncherEntrypoint(ic) && len(ic.Arguments) > 0 && ic.Arguments[0] == "--" {
 		// strip and then restore the "--"
@@ -225,7 +225,7 @@ func adjustCommandLine(m cnb.BuildMetadata, ic ImageConfiguration) (ImageConfigu
 
 // findCNBProcess tries to resolve a CNB process definition given the image configuration.
 // It is assumed that the image is a CNB image.
-func findCNBProcess(ic ImageConfiguration, m cnb.BuildMetadata) (cnbl.Process, []string, bool) {
+func findCNBProcess(ic ImageConfiguration, m metadata.BuildMetadata) (cnbl.Process, []string, bool) {
 	if hasCNBLauncherEntrypoint(ic) && len(ic.Arguments) > 0 {
 		// the launcher accepts the first argument as a process type
 		if len(ic.Arguments) == 1 {

pkg/skaffold/debug/metadata/metadata.go

@@ -0,0 +1,78 @@
+// Package metaddata is a copy of 	"github.com/buildpacks/lifecycle/platform/files/metadata.go"
+// Copied so that depedency on github.com/buildpacks/lifecycle/platform/files can be removed.
+package metadata
+
+import (
+	"encoding/json"
+
+	"github.com/buildpacks/lifecycle/api"
+	"github.com/buildpacks/lifecycle/buildpack"
+	"github.com/buildpacks/lifecycle/launch"
+	"github.com/buildpacks/lifecycle/layers"
+)
+
+// BuildMetadata is written by the builder as <layers>/config/metadata.toml to record information about the build.
+// It is also serialized by the exporter as the `io.buildpacks.build.metadata` label on the output image.
+type BuildMetadata struct {
+	// BOM (deprecated) holds the unstructured bill-of-materials.
+	BOM []buildpack.BOMEntry `toml:"bom,omitempty" json:"bom"`
+	// Buildpacks are the buildpacks used in the build.
+	Buildpacks []buildpack.GroupElement `toml:"buildpacks" json:"buildpacks"`
+	// Extensions are the image extensions used in the build.
+	Extensions []buildpack.GroupElement `toml:"extensions,omitempty" json:"extensions,omitempty"`
+	// Labels are labels provided by buildpacks.
+	Labels []buildpack.Label `toml:"labels" json:"-"`
+	// Launcher is metadata to describe the launcher.
+	Launcher LauncherMetadata `toml:"-" json:"launcher"`
+	// Processes are processes provided by buildpacks.
+	Processes []launch.Process `toml:"processes" json:"processes"`
+	// Slices are application slices provided by buildpacks,
+	// used by the exporter to "slice" the application directory into distinct layers.
+	Slices []layers.Slice `toml:"slices" json:"-"`
+	// BuildpackDefaultProcessType is the buildpack-provided default process type.
+	// It will be the default process type for the image unless overridden by the end user.
+	BuildpackDefaultProcessType string `toml:"buildpack-default-process-type,omitempty" json:"buildpack-default-process-type,omitempty"`
+	// PlatformAPI is the Platform API version used for the build.
+	PlatformAPI *api.Version `toml:"-" json:"-"`
+}
+
+func (m *BuildMetadata) MarshalJSON() ([]byte, error) {
+	if m.PlatformAPI == nil || m.PlatformAPI.LessThan("0.9") {
+		return json.Marshal(*m)
+	}
+	type BuildMetadataSerializer BuildMetadata // prevent infinite recursion when serializing
+	return json.Marshal(&struct {
+		*BuildMetadataSerializer
+		BOM []buildpack.BOMEntry `json:"bom,omitempty"`
+	}{
+		BuildMetadataSerializer: (*BuildMetadataSerializer)(m),
+		BOM:                     []buildpack.BOMEntry{},
+	})
+}
+
+func (m BuildMetadata) ToLaunchMD() launch.Metadata {
+	lmd := launch.Metadata{
+		Processes: m.Processes,
+	}
+	for _, bp := range m.Buildpacks {
+		lmd.Buildpacks = append(lmd.Buildpacks, launch.Buildpack{
+			API: bp.API,
+			ID:  bp.ID,
+		})
+	}
+	return lmd
+}
+
+type LauncherMetadata struct {
+	Version string         `json:"version"`
+	Source  SourceMetadata `json:"source"`
+}
+
+type SourceMetadata struct {
+	Git GitMetadata `json:"git"`
+}
+
+type GitMetadata struct {
+	Repository string `json:"repository"`
+	Commit     string `json:"commit"`
+}

pkg/skaffold/deploy/docker/deploy_test.go

@@ -20,9 +20,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/go-connections/nat"
-
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/debug/types"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/deploy/label"
@@ -31,6 +28,8 @@ import (
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/util"
 	"github.com/GoogleContainerTools/skaffold/v2/testutil"
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/go-connections/nat"
 )
 
 type debugArtifact struct {
@@ -203,6 +202,7 @@ func TestDebugBindings(t *testing.T) {
 					if v == nil {
 						continue
 					}
+					t.Logf("Test: %s", test.name)
 					testutil.CheckDeepEqual(t, v, bindings[k])
 				}
 				if len(a.expectedBindings) != len(bindings) {

pkg/skaffold/docker/image.go

@@ -530,7 +530,7 @@ func (l *localDaemon) Pull(ctx context.Context, out io.Writer, ref string, platf
 
 // Load loads an image from a tar file. Returns the imageID for the loaded image.
 func (l *localDaemon) Load(ctx context.Context, out io.Writer, input io.Reader, ref string) (string, error) {
-	resp, err := l.apiClient.ImageLoad(ctx, input, false)
+	resp, err := l.apiClient.ImageLoad(ctx, input, client.ImageLoadWithQuiet(false))
 	if err != nil {
 		return "", fmt.Errorf("loading image into docker daemon: %w", err)
 	}

pkg/skaffold/docker/testdata/README.md

@@ -0,0 +1,3 @@
+The *.pem files in this testdata was generated by
+following instructions in:
+https://docs.docker.com/engine/security/protect-access/#use-tls-https-to-protect-the-docker-daemon-socket

pkg/skaffold/docker/testdata/ca.pem

@@ -1,17 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIFazCCA1OgAwIBAgIUdmUndvDCf9T5aJollbBGYieck/cwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNTAzMjcyMTAyNTNaFw0yNTA0
+MjYyMTAyNTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDO0wJzrYCqj2jhFkDwdMSANZMnJ+dLbP3+JVlS1+Zg
+zfNn9ZtC6hesMg44zyWGAPPT3C80pdODIUgJ+c0vb6RXxCqT8R7aU+6NQJtuPpNX
+SDF01XlPeHwp48rhYvJWqK8VQ9IIxjhEFlJWCVh4q0HGTz5EMW+f1ckUiHMWdKeE
+XXBPROlY5wnbRvqIofcS0yOIPwHvB8bk48rwhZ67oyFbExkQBKIsDfIiVdheN7j3
+lbvMnyZPXAcP2LhoWf1WCoC1M4NhvcHj0Q+oZsX3UpjZKp0bGx5j7Za9RsNQcnGa
+5FeqblvNaarzsu+SimnqG5i0xoL1+MV5bLwpTNKywCr1oM7Q8LibRGHyKYFAMevV
+Zag4SbwETwlHRgKLFR1fFGBojga0mVrbToMLChL+Dzpax3vQNRrK+JHM9cCHace6
+zNreLZlM/9sWHjXsfE6IebW3iN9mbF8A3Ehmn11EXjOh5QO9czMGoanqHWffvoXb
+c9mCKOYnrgpxsPyVBrnSumoVIYCgXgwKch02GCWdmIk7d1TavT61ZJ1NwRQHiT/8
+rI3zLdEZm9jKL2zDyFOy3Nnc9AXA2qw2cvTyn6yjHcY9EAwkrym50xtanVfHSv/T
+DSzHTVpNNA1RdbnZaxEXZCJjAo3cQyQ+gYriMx5COtTfuJMVI3rtt1E4+BMN+xLD
+UQIDAQABo1MwUTAdBgNVHQ4EFgQUFRyVRhuh4YVhtAthke0Mua0YNsEwHwYDVR0j
+BBgwFoAUFRyVRhuh4YVhtAthke0Mua0YNsEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEAvv9nn/oMu+xcnUdhkHs45gvm2QQCV2ScjgyB74kjqgzo
+E5a+vPuRgbkvpCg5PomCVgn/BmLGwawDVYGpoOlaIEwR9+iqh6phCKT/2a3Th2NG
+eNhhYpG0J5OlYxU5ifwUQJ5occbORfSB95yQT1/upKSee50OVnjA2T700Kwmbe47
+6knW+/b9sPyEDAAzNEGXWUnv2pf7MYRVUSI4vkLUzNlUL3hADe4rC+Jj9iQal5tV
+kDzQsRfcVhG+qzbgDVTvKsAXoud7l7N4UwKZ4ezOt6FJJa39UfvII18SM5BCz0Cw
+KWQnq7USn1p2n+948bkGoZF4Qqar3aFkpBF8GmAbLGffO7NQqQDt6744NNUQpWfa
+0jwsas9JccBAZBrKLaJHfVlkbppF1AvlR9kPuYVCeQiJ+LbU8RuKenQUgtxKPELn
+/4KsIOlQPs4nx7hO27myxcOw/AYwj+Qt+osdK8k56iK9mO0lMrAJ1WLdQjlY6gM+
+Rlp2zanbXDDB4yzjiuCDyHdGp3sKr5z/AsCvvPXB+ypoxDXUyXMllwNdPIyBFskM
+T6BxUlYEl+yd2Wvan2ApoYol0i7+nWDSk9mLnBvkNboy7rKX/8RYyAim5sgQV0US
+VfMWhTL879yS9Qb1157PtDtp4ouU7gZCfWeF3rQvls/EzmHroum2rhQZUIRGq3c=
 -----END CERTIFICATE-----

pkg/skaffold/docker/testdata/cert.pem

@@ -1,18 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----