feat: add integration test for kubernetes

.github/workflows/integration-test.yml

@@ -23,6 +23,10 @@ jobs:
           CS_TEAM_ID: ${{ secrets.CS_TEAM_ID }}
         run: make test-int
 
+      - name: Local Integration Tests
+        if: always()  # Run even if make test-int fails
+        run: make test-int-local
+
       - name: Cleanup Orphaned Test Resources
         if: always()  # Run even if tests fail
         env:

Makefile

@@ -14,7 +14,10 @@ test:
 	go test ./api/... ./cli/... ./pkg/... -count=1
 
 test-int: build
-	go test ./int/... -count=1 -v
+	go test ./int/... -count=1 -v -ginkgo.label-filter='!local'
+
+test-int-local: build
+	go test ./int/... -count=1 -v -ginkgo.label-filter='local'
 
 generate: install-build-deps
 	go generate ./...

NOTICE

@@ -401,9 +401,9 @@ License URL: https://cs.opensource.google/go/x/oauth2/+/v0.35.0:LICENSE
 
 ----------
 Module: golang.org/x/sync/errgroup
-Version: v0.19.0
+Version: v0.20.0
 License: BSD-3-Clause
-License URL: https://cs.opensource.google/go/x/sync/+/v0.19.0:LICENSE
+License URL: https://cs.opensource.google/go/x/sync/+/v0.20.0:LICENSE
 
 ----------
 Module: golang.org/x/sys

cli/cmd/generate_docker.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"path"
 
 	"github.com/codesphere-cloud/cs-go/pkg/cs"
 	"github.com/codesphere-cloud/cs-go/pkg/exporter"
@@ -28,17 +27,16 @@ type GenerateDockerOpts struct {
 }
 
 func (c *GenerateDockerCmd) RunE(cc *cobra.Command, args []string) error {
-	log.Println(c.Opts.Force)
-	fs := cs.NewOSFileSystem(".")
-	git := git.NewGitService(fs)
+	fs := cs.NewOSFileSystem(c.Opts.RepoRoot)
+	gitSvc := git.NewGitService(fs)
 
-	client, err := NewClient(*c.Opts.GlobalOptions)
-	if err != nil {
-		return fmt.Errorf("failed to create Codesphere client: %w", err)
+	exporter := exporter.NewExporterService(fs, c.Opts.Output, c.Opts.BaseImage, c.Opts.Envs, c.Opts.RepoRoot, c.Opts.Force)
+
+	clientFactory := func() (Client, error) {
+		return NewClient(*c.Opts.GlobalOptions)
 	}
 
-	exporter := exporter.NewExporterService(fs, c.Opts.Output, c.Opts.BaseImage, c.Opts.Envs, c.Opts.RepoRoot, c.Opts.Force)
-	if err := c.GenerateDocker(fs, exporter, git, client); err != nil {
+	if err := c.GenerateDocker(fs, exporter, gitSvc, clientFactory); err != nil {
 		return fmt.Errorf("failed to generate docker: %w", err)
 	}
 
@@ -95,16 +93,21 @@ func AddGenerateDockerCmd(generate *cobra.Command, opts *GenerateOpts) {
 	docker.cmd.RunE = docker.RunE
 }
 
-func (c *GenerateDockerCmd) GenerateDocker(fs *cs.FileSystem, exp exporter.Exporter, git git.Git, csClient Client) error {
+func (c *GenerateDockerCmd) GenerateDocker(fs *cs.FileSystem, exp exporter.Exporter, git git.Git, clientFactory func() (Client, error)) error {
 	if c.Opts.BaseImage == "" {
 		return errors.New("baseimage is required")
 	}
 
-	ciInput := path.Join(c.Opts.RepoRoot, c.Opts.Input)
+	ciInput := c.Opts.Input
 	if !fs.FileExists(ciInput) {
 		log.Printf("Input file %s not found attempting to clone workspace repository...\n", c.Opts.Input)
 
-		if err := c.CloneRepository(csClient, fs, git, c.Opts.RepoRoot); err != nil {
+		client, err := clientFactory()
+		if err != nil {
+			return fmt.Errorf("failed to create Codesphere client: %w", err)
+		}
+
+		if err := c.CloneRepository(client, fs, git, c.Opts.RepoRoot); err != nil {
 			return fmt.Errorf("failed to clone repository: %w", err)
 		}
 		if !fs.FileExists(ciInput) {

cli/cmd/generate_docker_test.go

@@ -56,7 +56,8 @@ var _ = Describe("GenerateDocker", func() {
 
 	Context("the baseimage is not provided", func() {
 		It("should return an error", func() {
-			err := c.GenerateDocker(memoryFs, mockExporter, mockGit, mockClient)
+			clientFactory := func() (cmd.Client, error) { return mockClient, nil }
+			err := c.GenerateDocker(memoryFs, mockExporter, mockGit, clientFactory)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("baseimage is required"))
 		})
@@ -79,7 +80,8 @@ var _ = Describe("GenerateDocker", func() {
 			It("should not return an error", func() {
 				mockExporter.EXPECT().ReadYmlFile(ciYmlPath).Return(&ci.CiYml{}, nil)
 				mockExporter.EXPECT().ExportDockerArtifacts().Return(nil)
-				err := c.GenerateDocker(memoryFs, mockExporter, mockGit, mockClient)
+				clientFactory := func() (cmd.Client, error) { return mockClient, nil }
+				err := c.GenerateDocker(memoryFs, mockExporter, mockGit, clientFactory)
 				Expect(err).To(Not(HaveOccurred()))
 			})
 		})

cli/cmd/generate_images.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"path"
 
 	"github.com/codesphere-cloud/cs-go/pkg/cs"
 	"github.com/codesphere-cloud/cs-go/pkg/exporter"
@@ -28,7 +27,7 @@ type GenerateImagesOpts struct {
 }
 
 func (c *GenerateImagesCmd) RunE(_ *cobra.Command, args []string) error {
-	fs := cs.NewOSFileSystem(".")
+	fs := cs.NewOSFileSystem(c.Opts.RepoRoot)
 
 	exporter := exporter.NewExporterService(fs, c.Opts.Output, "", []string{}, c.Opts.RepoRoot, c.Opts.Force)
 	if err := c.GenerateImages(fs, exporter); err != nil {
@@ -69,7 +68,7 @@ func AddGenerateImagesCmd(generate *cobra.Command, opts *GenerateOpts) {
 }
 
 func (c *GenerateImagesCmd) GenerateImages(fs *cs.FileSystem, exp exporter.Exporter) error {
-	ciInput := path.Join(c.Opts.RepoRoot, c.Opts.Input)
+	ciInput := c.Opts.Input
 	if c.Opts.Registry == "" {
 		return errors.New("registry is required")
 	}