Updating source codes such as docker compose

Author: hippo-an

.gitignore

@@ -49,3 +49,11 @@ docker-compose-mode-files/data/cb-dragonfly/
 
 # Binary
 src/mcc
+
+
+*.db
+package.json
+yarn.lock
+
+docker-compose-mode-files/data/*
+conf/docker/data/*

bin/mcc

@@ -1,18 +1,18 @@
-version: 1
-grpc:
-  spidersrv:
-    addr: :2048
-    #reflection: enable
-    #tls:
-    #  tls_cert: $CBSPIDER_ROOT/certs/server.crt
-    #  tls_key: $CBSPIDER_ROOT/certs/server.key
-    interceptors:
-      #auth_jwt:
-      #  jwt_key: your_secret_key
-      prometheus_metrics:
-        listen_port: 9092
-      opentracing:
-        jaeger:
-          endpoint: localhost:6831
-          service_name: spider grpc server
-          sample_rate: 1
+version: 1
+grpc:
+  spidersrv:
+    addr: :2048
+    #reflection: enable
+    #tls:
+    #  tls_cert: $CBSPIDER_ROOT/certs/server.crt
+    #  tls_key: $CBSPIDER_ROOT/certs/server.key
+    interceptors:
+      #auth_jwt:
+      #  jwt_key: your_secret_key
+      prometheus_metrics:
+        listen_port: 9092
+      opentracing:
+        jaeger:
+          endpoint: localhost:6831
+          service_name: spider grpc server
+          sample_rate: 1

docker-compose-mode-files/conf/cb-spider/calllog_conf.yaml conf/docker/conf/cb-spider/calllog_conf.yaml

@@ -1,31 +1,31 @@
-version: 1
-grpc:
-  tumblebugsrv:
-    addr: :50252
-    reflection: enable
-    #tls:
-    #  tls_cert: $CBTUMBLEBUG_ROOT/certs/server.crt
-    #  tls_key: $CBTUMBLEBUG_ROOT/certs/server.key
-    interceptors:
-      #auth_jwt:
-      #  jwt_key: your_secret_key
-      prometheus_metrics:
-        listen_port: 9093
-      opentracing:
-        jaeger:
-          endpoint: localhost:6832
-          service_name: tumblebug grpc server
-          sample_rate: 1  
-  spidercli:
-    server_addr: cb-spider:2048
-    timeout: 90s
-    #tls:
-    #  tls_ca: $CBTUMBLEBUG_ROOT/certs/ca.crt
-    interceptors:
-      #auth_jwt:
-      #  jwt_token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRJUCI6IjEyNy4wLjAuMSIsImV4cGlyZSI6MTkwODMyNTY1OCwib3JnTmFtZSI6IkVUUkkiLCJ1c2VyTmFtZSI6IkhvbmdHaWxEb25nIn0.4lkjYduo8iwv4AcKH96MpTnk8d7HRhi_p1xlnvZts8A
-      opentracing:
-        jaeger:
-          endpoint: localhost:6832
-          service_name: spider grpc client for tumblebug
-          sample_rate: 1
+version: 1
+grpc:
+  tumblebugsrv:
+    addr: :50252
+    reflection: enable
+    #tls:
+    #  tls_cert: $CBTUMBLEBUG_ROOT/certs/server.crt
+    #  tls_key: $CBTUMBLEBUG_ROOT/certs/server.key
+    interceptors:
+      #auth_jwt:
+      #  jwt_key: your_secret_key
+      prometheus_metrics:
+        listen_port: 9093
+      opentracing:
+        jaeger:
+          endpoint: localhost:6832
+          service_name: tumblebug grpc server
+          sample_rate: 1  
+  spidercli:
+    server_addr: cb-spider:2048
+    timeout: 90s
+    #tls:
+    #  tls_ca: $CBTUMBLEBUG_ROOT/certs/ca.crt
+    interceptors:
+      #auth_jwt:
+      #  jwt_token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRJUCI6IjEyNy4wLjAuMSIsImV4cGlyZSI6MTkwODMyNTY1OCwib3JnTmFtZSI6IkVUUkkiLCJ1c2VyTmFtZSI6IkhvbmdHaWxEb25nIn0.4lkjYduo8iwv4AcKH96MpTnk8d7HRhi_p1xlnvZts8A
+      opentracing:
+        jaeger:
+          endpoint: localhost:6832
+          service_name: spider grpc client for tumblebug
+          sample_rate: 1

docker-compose-mode-files/conf/cb-spider/grpc_conf.yaml conf/docker/conf/cb-spider/grpc_conf.yaml

@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.9"
 
 services:
 # The priority used by Compose to choose which env var value to use:
@@ -10,12 +10,13 @@ services:
 
   # CB-Spider
   cb-spider:
-    image: cloudbaristaorg/cb-spider:0.8.10
+    image: cloudbaristaorg/cb-spider:0.8.19
     container_name: mc-infra-connector #cb-spider
     ports:
       - "0.0.0.0:1024:1024"
       - "0.0.0.0:2048:2048"
-      - "0.0.0.0:4096:4096"
+    networks:
+      - spider_net
     volumes:
       - ./conf/cb-spider/:/root/go/src/github.com/mcc/cb-spider/conf/
       - ./data/cb-spider/meta_db/:/root/go/src/github.com/mcc/cb-spider/meta_db/
@@ -31,33 +32,37 @@ services:
 
   # CB-Tumblebug
   cb-tumblebug:
-    image: cloudbaristaorg/cb-tumblebug:0.8.4
+    image: cloudbaristaorg/cb-tumblebug:0.8.13
     container_name: mc-infra-manager #cb-tumblebug
     ports:
       - "0.0.0.0:1323:1323"
-      - "0.0.0.0:50252:50252"
+      # - "0.0.0.0:50252:50252"
+    networks:
+      - spider_net
+      - default
     depends_on:
-      #- cb-restapigw
       - cb-spider
-      # - cb-tumblebug-mysql
     volumes:
       - ./conf/cb-tumblebug/:/app/conf/
       - ./data/cb-tumblebug/meta_db/:/app/meta_db/
       - ./data/cb-tumblebug/log/:/app/log/
     environment:
       - SPIDER_CALL_METHOD=REST
       - SPIDER_REST_URL=http://cb-spider:1024/spider
-      - DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly
+      # - DRAGONFLY_REST_URL=http://cb-dragonfly:9090/dragonfly
       - API_USERNAME=default
       - API_PASSWORD=default
-      - CB_NETWORK_SERVICE_ENDPOINT=localhost:8053
-      - CB_NETWORK_ETCD_ENDPOINTS="localhost:2379"
-      - AUTOCONTROL_DURATION_MS=10000
+      # - CB_NETWORK_SERVICE_ENDPOINT=localhost:8053
+      # - CB_NETWORK_ETCD_ENDPOINTS="localhost:2379"
+      # - AUTOCONTROL_DURATION_MS=10000
       - SELF_ENDPOINT=localhost:1323
-      - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=ignore
-      - API_DOC_PATH=/app/src/api/rest/docs/swagger.json
+      # - GOLANG_PROTOBUF_REGISTRATION_CONFLICT=ignore
+      # - API_DOC_PATH=/app/src/api/rest/docs/swagger.json
       # - DB_URL=cb-tumblebug-mysql:3306
       # - DB_DATABASE=cb_tumblebug
       # - DB_USER=cb_tumblebug
       # - DB_PASSWORD=cb_tumblebug
-      # - GODEBUG=netdns=go
+      # - GODEBUG=netdns=go
+
+networks:
+  spider_net:

docker-compose-mode-files/conf/cb-spider/log_conf.yaml conf/docker/conf/cb-spider/log_conf.yaml

@@ -8,7 +8,12 @@ require (
 	github.com/spf13/viper v1.10.1
 )
 
-require golang.org/x/net v0.22.0 // indirect
+require (
+	github.com/tidwall/gjson v1.17.3 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	golang.org/x/net v0.22.0 // indirect
+)
 
 require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect

docker-compose-mode-files/conf/cb-spider/store_conf.yaml conf/docker/conf/cb-spider/store_conf.yaml

@@ -356,6 +356,13 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
+github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

docker-compose-mode-files/conf/cb-tumblebug/cloud_conf.yaml conf/docker/conf/cb-tumblebug/cloud_conf.yaml

@@ -0,0 +1,90 @@
+package apicall
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"github.com/tidwall/gjson"
+)
+
+var swaggerFile string
+
+// pullCmd represents the pull command
+var parseCmd = &cobra.Command{
+	Use:   "tool",
+	Short: "Swagger JSON file parsing",
+	Long:  `Swagger JSON file parsing to assist in writing api.yaml files`,
+	Run: func(cmd *cobra.Command, args []string) {
+		parseJson()
+	},
+}
+
+func parseJson() {
+	// swagger.json 파일 읽기
+	data, err := os.ReadFile(swaggerFile)
+	if err != nil {
+		log.Fatalf("파일 읽기 오류: %s", err)
+	}
+
+	json := string(data)
+
+	// 기본 정보 추출
+	title := gjson.Get(json, "info.title")
+	version := gjson.Get(json, "info.version")
+	host := gjson.Get(json, "host")
+	basePath := gjson.Get(json, "basePath")
+
+	fmt.Println("API Title:", title.String())
+	fmt.Println("API Version:", version.String())
+	fmt.Println("Host:", host.String())
+	fmt.Println("Base Path:", basePath.String())
+
+	// paths 하위의 URI, method 및 operationId 추출
+	paths := gjson.Get(json, "paths").Map()
+	for path, methods := range paths {
+		//fmt.Println("URI:", path)
+		for method, details := range methods.Map() {
+			operationId := details.Get("operationId")
+			if strings.ToLower(method) == "parameters" {
+				continue
+			}
+
+			//fmt.Printf("  Method: %s, OperationId: %s\n", method, operationId.String())
+			tmpActionName := convertActionlName(operationId.String())
+			fmt.Printf("    %s:\n", tmpActionName)
+			fmt.Printf("      method: %s\n", method)
+			fmt.Printf("      resourcePath: %s\n", path)
+			fmt.Printf("      description: %q\n", details.Get("description").String())
+		}
+	}
+}
+
+func convertActionlName(tmpActionName string) string {
+	//일부 특수 기호들 제거
+	tmpActionName = strings.ReplaceAll(tmpActionName, ":", "-")
+	tmpActionName = strings.ReplaceAll(tmpActionName, "`", "")
+	tmpActionName = strings.ReplaceAll(tmpActionName, "'", "")
+	//tmpActionName = strings.ReplaceAll(tmpActionName, "\n", " ")
+
+	//카멜타입으로 변경
+	tmpActionName = toCamelCase(tmpActionName)
+
+	return tmpActionName
+}
+
+func toCamelCase(str string) string {
+	words := strings.Fields(str) // 문자열을 공백을 기준으로 단어로 분할
+	var result strings.Builder
+	for _, word := range words {
+		result.WriteString(strings.Title(word)) // 각 단어의 첫 글자를 대문자로 만듦
+	}
+	return result.String()
+}
+
+func init() {
+	apiCmd.AddCommand(parseCmd)
+	parseCmd.PersistentFlags().StringVarP(&swaggerFile, "file", "f", "../conf/swagger.json", "Swagger JSON file full path")
+}

docker-compose-mode-files/conf/cb-tumblebug/grpc_conf.yaml conf/docker/conf/cb-tumblebug/grpc_conf.yaml

@@ -6,6 +6,7 @@ package apicall
 import (
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"strings"
 
 	"github.com/go-resty/resty/v2"
@@ -28,6 +29,7 @@ var queryString string
 var client = resty.New()
 var req = client.R()
 var sendData string
+var inputFileData string
 var fileData string
 
 type ServiceInfo struct {
@@ -300,11 +302,26 @@ func SetBasicAuth() {
 }
 
 // func SetReqData(req *resty.Request) {
-func SetReqData() {
-	if isVerbose {
-		fmt.Println("request data : \n" + sendData)
+func SetReqData() error {
+	if inputFileData != "" {
+		if isVerbose {
+			fmt.Printf("use [%s] data file\n" + inputFileData)
+		}
+
+		// 파일에서 데이터 읽기
+		data, err := ioutil.ReadFile(inputFileData)
+		if err != nil {
+			return err
+		}
+		req.SetBody(data)
+	} else {
+		if isVerbose {
+			fmt.Printf("request data : %s\n" + sendData)
+		}
+		req.SetBody(sendData)
 	}
-	req.SetBody(sendData)
+
+	return nil
 }
 
 func ProcessResultInfo(resp *resty.Response) {