Merge pull request #31 from Doer-org/fix/test-failed

refactor : go test pass & go fmt
Doer-org · Feb 12, 2024 · 260fbaa · 260fbaa
2 parents b85976e + 08e92ab
commit 260fbaa
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 58 deletions.
diff --git a/cmd/pull.go b/cmd/pull.go
@@ -6,7 +6,8 @@ package cmd
 import (
 	"github.com/Doer-org/ketos/internal"
 	"github.com/Doer-org/ketos/internal/api"
-	docker "github.com/Doer-org/ketos/internal/docker/pull"
+	"github.com/Doer-org/ketos/internal/docker"
+	dockerpull "github.com/Doer-org/ketos/internal/docker/pull"
 	"github.com/spf13/cobra"
 )
 
@@ -26,15 +27,16 @@ var pullCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		err = docker.DecompressTarGzToImage()
+		tarGzFileName := "./tmp-tar" + "/" + docker.ImageName + ".tar.gz"
+		err = dockerpull.DecompressTarGzToImage(tarGzFileName)
 		if err != nil {
 			return err
 		}
-		respID, err := docker.CreateContainer(port)
+		respID, err := dockerpull.CreateContainer(port)
 		if err != nil {
 			return err
 		}
-		err = docker.RunContainer(respID)
+		err = dockerpull.RunContainer(respID)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/push.go b/cmd/push.go
@@ -19,54 +19,57 @@ var pushCmd = &cobra.Command{
 	Long: `This command creates a docker image based on the local environment, 
 	compresses it, and sends it to the server.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-			// TODO: 余分な引数がある場合はエラーを返したい
-			// if len(args) > 0 {
-			// 	return fmt.Errorf("unexpected argument(s): %v\nUsage: %s", args, cmd.UseLine())
-			// }
-			directory, err := cmd.Flags().GetString("directory")
-			if err != nil {
-				return err
-			}
-			language, err := cmd.Flags().GetString("language")
-			if err != nil {
-				return err
-			}
-			filename, err := cmd.Flags().GetString("filename")
-			if err != nil {
-				return err
-			}
-			dockerfile, err := cmd.Flags().GetBool("dockerfile")
-			if err != nil {
-				return err
-			}
-			publishList, err := cmd.Flags().GetStringSlice("publish")
-			if err != nil {
-				return err
-			}
-			envList, err := cmd.Flags().GetStringSlice("env")
-			if err != nil {
-				return err
-			}
-			fmt.Println("directory: ", directory)
-
-			err = docker.CreateImage(dockerfile, language, directory, filename)
-			if err != nil {
-				return err
-			}
-			docker.CompressImageToTarGz()
-			err = api.SendTarToServer(publishList, envList)
-			if err != nil {
-				return err
-			}
-			return nil
-		},
-	}
-
-	func init() {
-		rootCmd.AddCommand(pushCmd)
-		pushCmd.Flags().StringP("directory", "d", "", "Directory path to create docker image")
-		pushCmd.Flags().StringP("language", "l", "", "Language type to create docker image")
-		pushCmd.Flags().StringP("filename", "f", "", "Dockerfile name to create docker image")
+		// TODO: 余分な引数がある場合はエラーを返したい
+		// if len(args) > 0 {
+		// 	return fmt.Errorf("unexpected argument(s): %v\nUsage: %s", args, cmd.UseLine())
+		// }
+		directory, err := cmd.Flags().GetString("directory")
+		if err != nil {
+			return err
+		}
+		language, err := cmd.Flags().GetString("language")
+		if err != nil {
+			return err
+		}
+		filename, err := cmd.Flags().GetString("filename")
+		if err != nil {
+			return err
+		}
+		dockerfile, err := cmd.Flags().GetBool("dockerfile")
+		if err != nil {
+			return err
+		}
+		publishList, err := cmd.Flags().GetStringSlice("publish")
+		if err != nil {
+			return err
+		}
+		envList, err := cmd.Flags().GetStringSlice("env")
+		if err != nil {
+			return err
+		}
+		fmt.Println("directory: ", directory)
+
+		err = docker.CreateImage(dockerfile, language, directory, filename)
+		if err != nil {
+			return err
+		}
+		err = docker.CompressImageToTarGz()
+		if err != nil {
+			return err
+		}
+		err = api.SendTarToServer(publishList, envList)
+		if err != nil {
+			return err
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(pushCmd)
+	pushCmd.Flags().StringP("directory", "d", "", "Directory path to create docker image")
+	pushCmd.Flags().StringP("language", "l", "", "Language type to create docker image")
+	pushCmd.Flags().StringP("filename", "f", "", "Dockerfile name to create docker image")
 	pushCmd.Flags().BoolP("dockerfile", "D", false, "Dockerfile or buildpacks")
 	pushCmd.Flags().StringSliceP("publish", "p", []string{}, "Publish a container's port(s) to the host")
 	pushCmd.Flags().StringSliceP("env", "e", []string{}, "Set environment variable(s)")

diff --git a/internal/docker/pull/decompress_tar_gz.go b/internal/docker/pull/decompress_tar_gz.go
@@ -5,18 +5,16 @@ import (
 	"context"
 	"os"
 
-	"github.com/Doer-org/ketos/internal/docker"
 	"github.com/docker/docker/client"
 )
 
-func DecompressTarGzToImage() error {
+func DecompressTarGzToImage(tarGzFileName string) error {
 	// tar.gzをimageに展開
 	ctx := context.Background()
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
 		return err
 	}
-	tarGzFileName := "./tmp-tar" + "/" + docker.ImageName + ".tar.gz"
 
 	gzFile, err := os.Open(tarGzFileName)
 	if err != nil {

diff --git a/internal/docker/pull/decompress_tar_gz_test.go b/internal/docker/pull/decompress_tar_gz_test.go
@@ -7,6 +7,7 @@ import (
 )
 
 func TestDecompressTarGzToImage(t *testing.T) {
-	err := DecompressTarGzToImage()
+	tarGzFileName := "../../../testdata/test-tar/ketos-tmp-image.tar.gz"
+	err := DecompressTarGzToImage(tarGzFileName)
 	assert.NoError(t, err)
-}
+}
diff --git a/internal/docker/push/create_docker_image_test.go b/internal/docker/push/create_docker_image_test.go
@@ -8,6 +8,6 @@ import (
 
 func TestCreateImageWithDockerFile(t *testing.T) {
 	// dockerfileを使ってイメージを作成
-	err := createImageWithDockerFile("../../examples/go", "Dockerfile")
+	err := createImageWithDockerFile("../../../examples/go", "Dockerfile")
 	assert.NoError(t, err)
 }
diff --git a/internal/utils/testutil/docker.go b/internal/utils/testutil/docker.go
@@ -0,0 +1 @@
+package testutil
diff --git a/testdata/test-tar/ketos-tmp-image.tar.gz b/testdata/test-tar/ketos-tmp-image.tar.gz