From 80b839e258bff2dc57513f36e1b6f7a3ffe60bcb Mon Sep 17 00:00:00 2001 From: CodesphereBot Date: Thu, 15 Jan 2026 17:08:47 +0000 Subject: [PATCH 1/4] fix(deps): update module github.com/yaml/go-yaml to v3 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a204607..dbdf521 100644 --- a/go.mod +++ b/go.mod @@ -542,7 +542,7 @@ require ( github.com/tcnksm/go-gitconfig v0.1.2 // indirect github.com/ulikunitz/xz v0.5.15 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/yaml/go-yaml v2.1.0+incompatible + github.com/yaml/go-yaml/v3 v3.0.4 golang.org/x/crypto v0.46.0 // indirect golang.org/x/net v0.48.0 // indirect golang.org/x/oauth2 v0.34.0 // indirect From 0a2fd8262a873b1a542edb9cf6a5dabba47ce7ca Mon Sep 17 00:00:00 2001 From: Jonas Kauke Date: Fri, 16 Jan 2026 15:14:57 +0100 Subject: [PATCH 2/4] fix: go get & tidy to fix imports --- go.mod | 3 +-- go.sum | 3 --- pkg/ci/yml.go | 2 +- pkg/exporter/exporter_test.go | 27 +++++++++++++-------------- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index dbdf521..47da590 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/rhysd/go-github-selfupdate v1.2.3 github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.11.1 + go.yaml.in/yaml/v3 v3.0.4 gopkg.in/validator.v2 v2.0.1 k8s.io/apimachinery v0.35.0 ) @@ -470,7 +471,6 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect gocloud.dev v0.44.0 // indirect golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect golang.org/x/exp/typeparams v0.0.0-20251219203646-944ab1f22d93 // indirect @@ -542,7 +542,6 @@ require ( github.com/tcnksm/go-gitconfig v0.1.2 // indirect github.com/ulikunitz/xz v0.5.15 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/yaml/go-yaml/v3 v3.0.4 golang.org/x/crypto v0.46.0 // indirect golang.org/x/net v0.48.0 // indirect golang.org/x/oauth2 v0.34.0 // indirect diff --git a/go.sum b/go.sum index e2dcbe4..6ceff3c 100644 --- a/go.sum +++ b/go.sum @@ -1296,8 +1296,6 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= -github.com/yaml/go-yaml v2.1.0+incompatible h1:Zbv44MLd20eYMtiHHvsEnw575Z8bfjNotykoUKcxgO0= -github.com/yaml/go-yaml v2.1.0+incompatible/go.mod h1:XQjxMnX5ELtnGhPE/q0z8IRHbNlc0Oe8iA6GK4uSRJw= github.com/yeya24/promlinter v0.3.0 h1:JVDbMp08lVCP7Y6NP3qHroGAO6z2yGKQtS5JsjqtoFs= github.com/yeya24/promlinter v0.3.0/go.mod h1:cDfJQQYv9uYciW60QT0eeHlFodotkYZlL+YcPQN+mW4= github.com/ykadowak/zerologlint v0.1.5 h1:Gy/fMz1dFQN9JZTPjv1hxEk+sRWm05row04Yoolgdiw= @@ -1602,7 +1600,6 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/pkg/ci/yml.go b/pkg/ci/yml.go index 047bc01..1826916 100644 --- a/pkg/ci/yml.go +++ b/pkg/ci/yml.go @@ -8,7 +8,7 @@ import ( "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/util" - "github.com/yaml/go-yaml" + "go.yaml.in/yaml/v3" ) type CiYml struct { diff --git a/pkg/exporter/exporter_test.go b/pkg/exporter/exporter_test.go index e90f992..7f2f3ff 100644 --- a/pkg/exporter/exporter_test.go +++ b/pkg/exporter/exporter_test.go @@ -6,13 +6,12 @@ package exporter_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/stretchr/testify/mock" "github.com/codesphere-cloud/cs-go/pkg/cs" "github.com/codesphere-cloud/cs-go/pkg/exporter" ) -const ymlContent = `schemaVersion: v0.2 +const ymlContent = ` schemaVersion: v0.2 prepare: steps: @@ -68,23 +67,23 @@ var _ = Describe("GenerateDockerfile", func() { It("should generate files and don't return an error", func() { _, err := e.ReadYmlFile(defaultInput) Expect(err).To(Not(HaveOccurred())) - err = e.ExportDockerArtifacts() - Expect(err).To(Not(HaveOccurred())) + // err = e.ExportDockerArtifacts() + // Expect(err).To(Not(HaveOccurred())) - Expect(memoryFs.DirExists("workspace-repo/export")).To(BeTrue()) - Expect(memoryFs.FileExists("workspace-repo/export/docker-compose.yml")).To(BeTrue()) + // Expect(memoryFs.DirExists("workspace-repo/export")).To(BeTrue()) + // Expect(memoryFs.FileExists("workspace-repo/export/docker-compose.yml")).To(BeTrue()) - Expect(memoryFs.DirExists("workspace-repo/export/frontend")).To(BeTrue()) - Expect(memoryFs.FileExists("workspace-repo/export/frontend/Dockerfile")).To(BeTrue()) - Expect(memoryFs.FileExists("workspace-repo/export/frontend/entrypoint.sh")).To(BeTrue()) + // Expect(memoryFs.DirExists("workspace-repo/export/frontend")).To(BeTrue()) + // Expect(memoryFs.FileExists("workspace-repo/export/frontend/Dockerfile")).To(BeTrue()) + // Expect(memoryFs.FileExists("workspace-repo/export/frontend/entrypoint.sh")).To(BeTrue()) - err = e.ExportKubernetesArtifacts("registry", "image", mock.Anything, mock.Anything, mock.Anything, mock.Anything) - Expect(err).To(Not(HaveOccurred())) + // err = e.ExportKubernetesArtifacts("registry", "image", mock.Anything, mock.Anything, mock.Anything, mock.Anything) + // Expect(err).To(Not(HaveOccurred())) - Expect(memoryFs.DirExists("workspace-repo/export/kubernetes")).To(BeTrue()) - Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/ingress.yml")).To(BeTrue()) + // Expect(memoryFs.DirExists("workspace-repo/export/kubernetes")).To(BeTrue()) + // Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/ingress.yml")).To(BeTrue()) - Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/service-frontend.yml")).To(BeTrue()) + // Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/service-frontend.yml")).To(BeTrue()) }) }) }) From 0a4981b6200b801bab3cd8e566eab22770a6a4e8 Mon Sep 17 00:00:00 2001 From: Jonas Kauke Date: Fri, 16 Jan 2026 15:15:31 +0100 Subject: [PATCH 3/4] fix: go get & tidy to fix imports --- pkg/exporter/exporter_test.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkg/exporter/exporter_test.go b/pkg/exporter/exporter_test.go index 7f2f3ff..cdfdc28 100644 --- a/pkg/exporter/exporter_test.go +++ b/pkg/exporter/exporter_test.go @@ -6,6 +6,7 @@ package exporter_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + mock "github.com/stretchr/testify/mock" "github.com/codesphere-cloud/cs-go/pkg/cs" "github.com/codesphere-cloud/cs-go/pkg/exporter" @@ -67,23 +68,23 @@ var _ = Describe("GenerateDockerfile", func() { It("should generate files and don't return an error", func() { _, err := e.ReadYmlFile(defaultInput) Expect(err).To(Not(HaveOccurred())) - // err = e.ExportDockerArtifacts() - // Expect(err).To(Not(HaveOccurred())) + err = e.ExportDockerArtifacts() + Expect(err).To(Not(HaveOccurred())) - // Expect(memoryFs.DirExists("workspace-repo/export")).To(BeTrue()) - // Expect(memoryFs.FileExists("workspace-repo/export/docker-compose.yml")).To(BeTrue()) + Expect(memoryFs.DirExists("workspace-repo/export")).To(BeTrue()) + Expect(memoryFs.FileExists("workspace-repo/export/docker-compose.yml")).To(BeTrue()) - // Expect(memoryFs.DirExists("workspace-repo/export/frontend")).To(BeTrue()) - // Expect(memoryFs.FileExists("workspace-repo/export/frontend/Dockerfile")).To(BeTrue()) - // Expect(memoryFs.FileExists("workspace-repo/export/frontend/entrypoint.sh")).To(BeTrue()) + Expect(memoryFs.DirExists("workspace-repo/export/frontend")).To(BeTrue()) + Expect(memoryFs.FileExists("workspace-repo/export/frontend/Dockerfile")).To(BeTrue()) + Expect(memoryFs.FileExists("workspace-repo/export/frontend/entrypoint.sh")).To(BeTrue()) - // err = e.ExportKubernetesArtifacts("registry", "image", mock.Anything, mock.Anything, mock.Anything, mock.Anything) - // Expect(err).To(Not(HaveOccurred())) + err = e.ExportKubernetesArtifacts("registry", "image", mock.Anything, mock.Anything, mock.Anything, mock.Anything) + Expect(err).To(Not(HaveOccurred())) - // Expect(memoryFs.DirExists("workspace-repo/export/kubernetes")).To(BeTrue()) - // Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/ingress.yml")).To(BeTrue()) + Expect(memoryFs.DirExists("workspace-repo/export/kubernetes")).To(BeTrue()) + Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/ingress.yml")).To(BeTrue()) - // Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/service-frontend.yml")).To(BeTrue()) + Expect(memoryFs.FileExists("workspace-repo/export/kubernetes/service-frontend.yml")).To(BeTrue()) }) }) }) From 98d298419ba68f96aae6647e32726f4ed5d43071 Mon Sep 17 00:00:00 2001 From: Jonas Kauke Date: Fri, 16 Jan 2026 15:16:13 +0100 Subject: [PATCH 4/4] fix: go get & tidy to fix imports --- pkg/exporter/exporter_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/exporter/exporter_test.go b/pkg/exporter/exporter_test.go index cdfdc28..d2613c3 100644 --- a/pkg/exporter/exporter_test.go +++ b/pkg/exporter/exporter_test.go @@ -6,7 +6,7 @@ package exporter_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - mock "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/mock" "github.com/codesphere-cloud/cs-go/pkg/cs" "github.com/codesphere-cloud/cs-go/pkg/exporter"