Merge pull request #4 from Bidaya0/develop-add-unittest

Develop add unittest

.github/workflows/gotest.yml

@@ -0,0 +1,20 @@
+name: "Go unittest"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+
+jobs:
+  unittest-check:
+    name: unittest-check
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/setup-go@v3
+      with:
+        go-version: '>=1.19.0'
+    - run: |
+        go test -v ./...
+

cmd/cmd.go

@@ -3,7 +3,10 @@ package cmd
 import (
 	"fmt"
 	"github.com/bidaya0/gbatect/converter"
+	batecttypes "github.com/bidaya0/gbatect/types"
+	"github.com/compose-spec/compose-go/loader"
 	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v3"
 	"os"
 )
 
@@ -25,18 +28,38 @@ var convertCmd = &cobra.Command{
 	gbatect take the docker-compose.yml and translates it to batect.yml.
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		//if len(args) > 0{
-		//	filepath := args[0]
-		//}
+
 		if fromfile != "" {
-			result := converter.ReadAndConvert(fromfile)
+			dockercomposefile, err := os.ReadFile(fromfile)
+			if err != nil {
+				fmt.Printf("error: %v", err)
+			}
+			k1, err := loader.ParseYAML(dockercomposefile)
+			if err != nil {
+				fmt.Printf("error: %v", err)
+			}
+			tmpk := k1["services"]
+			tmp3, _ := tmpk.(map[string]interface{})
+			services, err := converter.LoadServices(tmp3)
+			containers, err := converter.TransServicesToContainer(services)
+			var f1 = batecttypes.BatectConfig{
+				Containers: containers,
+			}
+			batectyaml, err := yaml.Marshal(&f1)
+			if err != nil {
+				fmt.Printf("error: %v", err)
+			}
+
+			if err != nil {
+				fmt.Printf("error: %v", err)
+			}
 			if tofile != "" {
-				err := os.WriteFile(tofile, result, 0644)
+				err := os.WriteFile(tofile, batectyaml, 0644)
 				if err != nil {
 					fmt.Printf("%v", err)
 				}
 			} else {
-				fmt.Printf("%v", string(result))
+				fmt.Printf("%v", string(batectyaml))
 			}
 		}
 	},

converter/converter.go

@@ -84,14 +84,15 @@ func TransServicesToContainer(servicesconfigs []composetypes.ServiceConfig) (bat
 	return containers, nil
 }
 
-func ReadAndConvert(sourceFilePath string) []byte {
+func ReadAndConvert(sourceFilePath string) ([]byte, error) {
 	dockercomposefile, err := os.ReadFile(sourceFilePath)
 	if err != nil {
 		fmt.Printf("error: %v", err)
+		return nil, err
 	}
 	k1, err := loader.ParseYAML(dockercomposefile)
 	if err != nil {
-		fmt.Printf("error: %v", err)
+		return nil, err
 	}
 	tmpk := k1["services"]
 	tmp3, _ := tmpk.(map[string]interface{})
@@ -102,7 +103,7 @@ func ReadAndConvert(sourceFilePath string) []byte {
 	}
 	batectyaml, err := yaml.Marshal(&f1)
 	if err != nil {
-		fmt.Printf("error: %v", err)
+		return nil, err
 	}
-	return batectyaml
+	return batectyaml, nil
 }

converter/converter_test.go

@@ -0,0 +1,89 @@
+package converter
+
+import (
+	"github.com/compose-spec/compose-go/loader"
+	"testing"
+)
+
+var dockercomposefile = []byte(`version: '3'
+
+services:
+
+  jobaggrv-mysql:
+    image: mysql:8-debian
+    extra_hosts:
+      - "somehost:162.242.195.82"
+      - "otherhost:50.31.209.229"
+    environment:
+      MYSQL_ROOT_PASSWORD: jobaggrv
+      MYSQL_USER: jobaggrv
+      MYSQL_PASSWORD: jobaggrv
+      MYSQL_DATABASE: jobaggrv
+    ports:
+      - 33060:3306
+    cap_add:
+      - ALL
+    cap_drop:
+      - NET_ADMIN
+      - SYS_ADMIN
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+
+  jobaggrv-scrapy:
+    build:
+      dockerfile: ./Dockerfile
+      context: .
+      target: prod
+      args:
+        GIT_COMMIT: cdc3b19
+    command: echo "I'm running ${COMPOSE_PROJECT_NAME}"
+    devices:
+      - "/dev/ttyUSB0:/dev/ttyUSB0"
+      - "/dev/sda:/dev/xvda:rwm"
+    init: true
+    shm_size: 1024kb
+    working_dir: /opt
+
+  jobaggrv-api:
+    build:
+      dockerfile: ./Dockerfile
+      context: .
+      args:
+        - GIT_COMMIT=cdc3b19
+    entrypoint: gunicorn  --worker-class gevent -w 4 --worker-connections 1000 -b 0.0.0.0:8000 'jobaggrv_api.app:app'
+    ports: 
+      - 8000:8000
+    depends_on:
+      - jobaggrv-scrapy
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "tcp://192.168.0.42:123"
+`)
+
+func TestLoadServices(t *testing.T) {
+	k1, _ := loader.ParseYAML(dockercomposefile)
+	tmpk := k1["services"]
+	tmp3, _ := tmpk.(map[string]interface{})
+	_, err := LoadServices(tmp3)
+	if err != nil {
+		t.Error("Expected success, got ", err)
+	}
+	return
+}
+
+func TestTransServicesToContainer(t *testing.T) {
+	k1, _ := loader.ParseYAML(dockercomposefile)
+	tmpk := k1["services"]
+	tmp3, _ := tmpk.(map[string]interface{})
+	services, err := LoadServices(tmp3)
+	_, err = TransServicesToContainer(services)
+	if err != nil {
+		t.Error("Expected success, got ", err)
+	}
+	return
+}