chore: fix ko test and lint issues

Author: ericzzzzzzz

cmd/skaffold/app/cmd/fix_test.go

@@ -22,10 +22,11 @@ import (
 	"os"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/latest"
 	v1 "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/v1"
 	"github.com/GoogleContainerTools/skaffold/v2/testutil"
-	"github.com/google/go-cmp/cmp"
 )
 
 func TestFix(t *testing.T) {

integration/ko_test.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/google/go-containerregistry/pkg/registry"
+	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/google/go-containerregistry/pkg/v1/random"
 
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/build/ko"
@@ -86,6 +87,19 @@ func registryServerWithImage(namespace string) (*httptest.Server, error) {
 	if err != nil {
 		return nil, fmt.Errorf("random.Image(): %+v", err)
 	}
+	// ko 0.12 starts to validate image platform, the random generated image doesn't that info, we need to manually to set
+	// image platform back to the image. image.ConfigFile() is a deepCopy() method, we need to use mutate.ConfigFile() to inject
+	// the platform info.
+	configFile, _ := image.ConfigFile()
+	configFile.OS = runtime.GOOS
+	configFile.Architecture = runtime.GOARCH
+	configFile.OSVersion = runtime.Version()
+
+	image, err = mutate.ConfigFile(image, configFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to mutate image: %+v", err)
+	}
+
 	err = crane.Push(image, imageName)
 	if err != nil {
 		return nil, fmt.Errorf("crane.Push(): %+v", err)

pkg/skaffold/instrumentation/export.go

@@ -42,7 +42,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
-	"go.opentelemetry.io/otel/semconv/v1.17.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
 	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/api/option"
 

pkg/skaffold/render/renderer/kubectl/kubectl_test.go

@@ -19,10 +19,11 @@ package kubectl
 import (
 	"bytes"
 	"context"
-	"github.com/google/go-cmp/cmp"
 	"path/filepath"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/graph"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/render"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/latest"