Merge pull request #6 from Doer-org/refactor/cmd-to-internal

refactor : all directory

cmd/create.go

@@ -4,18 +4,12 @@ Copyright © 2024 Do'er
 package cmd
 
 import (
-	"context"
-	"os"
-	"os/exec"
-
-	"github.com/docker/docker/client"
 	"github.com/spf13/cobra"
-)
 
-const (
-	TarTmpDir   = "tmp-tar"
-	ImageName   = "ketos-tmp-image"
+	"github.com/Doer-org/ketos/internal/api"
+	"github.com/Doer-org/ketos/internal/docker"
 )
+
 var dirPath string
 
 // createCmd represents the create command
@@ -25,59 +19,12 @@ var createCmd = &cobra.Command{
 	Long: `This command creates a docker image based on the local environment, 
 	compresses it, and sends it to the server.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		createImageWithPack()
-		compressImageToTar()
-		sendTarToServer()
+		docker.CreateImageWithPack()
+		docker.CompressImageToTar()
+		api.SendTarToServer()
 	},
 }
 
-func createImageWithPack() {
-	// Packを外部コマンドで実行してimageを作成
-	cmd := exec.Command("pack", "build", ImageName, "--builder", "gcr.io/buildpacks/builder:v1")
-	if dirPath != "" {
-		cmd.Dir = dirPath
-	}
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		panic(err)
-	}
-}
-
-func compressImageToTar() {
-	// imageをtarに圧縮
-	ctx := context.Background()
-    cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-    if err != nil {
-        panic(err)
-    }
-	if _, err := os.Stat(TarTmpDir); os.IsNotExist(err) {
-		os.Mkdir(TarTmpDir, 0777)
-	}
-	tarFileName := TarTmpDir + "/" + ImageName + ".tar"
-	imageSaveResponse, err := cli.ImageSave(ctx, []string{ImageName})
-    if err != nil {
-        panic(err)
-    }
-    defer imageSaveResponse.Close()
-    file, err := os.Create(tarFileName)
-    if err != nil {
-        panic(err)
-    }
-    defer file.Close()
-    _, err = file.ReadFrom(imageSaveResponse)
-    if err != nil {
-        panic(err)
-    }
-}
-
-func sendTarToServer() {
-	// tarをサーバに送信
-	// TODO: サーバに送信する処理を実装
-	// TODO: サーバに送信したらtarを削除する
-}
-
 func init() {
 	rootCmd.AddCommand(createCmd)
 	createCmd.Flags().StringVarP(&dirPath, "path", "p", "", "directory path to create docker image")

internal/api/send_file.go

@@ -0,0 +1,7 @@
+package api
+
+func SendTarToServer() {
+	// tarをサーバに送信
+	// TODO: サーバに送信する処理を実装
+	// TODO: サーバに送信したらtarを削除する
+}

internal/api/send_file_test.go

@@ -0,0 +1 @@
+package api

internal/docker/compress_docker_image.go

@@ -0,0 +1,35 @@
+package docker
+
+import (
+	"context"
+	"os"
+
+	"github.com/docker/docker/client"
+)
+
+func CompressImageToTar() {
+	// imageをtarに圧縮
+	ctx := context.Background()
+	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+	if err != nil {
+		panic(err)
+	}
+	if _, err := os.Stat(TarTmpDir); os.IsNotExist(err) {
+		os.Mkdir(TarTmpDir, 0777)
+	}
+	tarFileName := TarTmpDir + "/" + ImageName + ".tar"
+	imageSaveResponse, err := cli.ImageSave(ctx, []string{ImageName})
+	if err != nil {
+		panic(err)
+	}
+	defer imageSaveResponse.Close()
+	file, err := os.Create(tarFileName)
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+	_, err = file.ReadFrom(imageSaveResponse)
+	if err != nil {
+		panic(err)
+	}
+}

internal/docker/compress_docker_image_test.go

@@ -0,0 +1 @@
+package docker

internal/docker/create_docker_image.go

@@ -0,0 +1,20 @@
+package docker
+
+import (
+	"os"
+	"os/exec"
+)
+
+func CreateImageWithPack() {
+	// Packを外部コマンドで実行してimageを作成
+	cmd := exec.Command("pack", "build", ImageName, "--builder", "gcr.io/buildpacks/builder:v1")
+	if dirPath != "" {
+		cmd.Dir = dirPath
+	}
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		panic(err)
+	}
+}

internal/docker/value.go

@@ -0,0 +1,8 @@
+package docker
+
+const (
+	TarTmpDir = "tmp-tar"
+	ImageName = "ketos-tmp-image"
+)
+
+var dirPath string