fix: patch pipeline

StamusNetworks · Jul 4, 2024 · dd9e158 · dd9e158
1 parent 064d322
commit dd9e158
Show file tree

Hide file tree

Showing 7 changed files with 203 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,4 @@
 dist/
 
 .configs/
-tmp/
-docs/
+tmp/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -93,8 +93,6 @@ build cli:
     script:
         - |
             apk add --no-cache gcc musl-dev make
-            go install github.com/swaggo/swag/cmd/swag@latest
-            swag init -g root.go -o cmd/docs -d cmd/daemon/run/
             make cli
             mv dist/stamusctl .
 
@@ -124,8 +122,6 @@ build test:
     script:
         - |
             apk add --no-cache gcc musl-dev make
-            go install github.com/swaggo/swag/cmd/swag@latest
-            swag init -g root.go -o cmd/docs -d cmd/daemon/run/
             chmod +x $(pwd)/scripts/move.sh
             $(pwd)/scripts/move.sh
             make test-cli
@@ -139,7 +135,7 @@ test cli:
         - build cli
     script:
         - |
-            ./stamusctl
+            STAMUS_APP_NAME=stamusctl ./stamusctl
 
 test daemon:
     image: busybox
@@ -148,7 +144,7 @@ test daemon:
         - build daemon
     script:
         - |
-            ./stamusd
+            STAMUS_APP_NAME=stamusd ./stamusd
 
 unit tests:
     image: golang:alpine
@@ -165,7 +161,7 @@ compose init:
         - build test
     script:
         - |
-            ./cli compose init --default nginx.exec=nginx
+            STAMUS_APP_NAME=stamusctl ./cli compose init --default nginx.exec=nginx
             chmod +x $(pwd)/scripts/compare.sh
             $(pwd)/scripts/compare.sh ./tmp ./outputs/compose-init
 
@@ -176,7 +172,7 @@ compose init set:
         - build test
     script:
         - |
-            ./cli compose init --default nginx.exec=nginx websocket.response=lel
+            STAMUS_APP_NAME=stamusctl ./cli compose init --default nginx.exec=nginx websocket.response=lel
             chmod +x $(pwd)/scripts/compare.sh
             $(pwd)/scripts/compare.sh ./tmp ./outputs/compose-init-set
 
@@ -187,7 +183,7 @@ compose init optional:
         - build test
     script:
         - |
-            ./cli compose init --default nginx=false
+            STAMUS_APP_NAME=stamusctl ./cli compose init --default nginx=false
             chmod +x $(pwd)/scripts/compare.sh
             $(pwd)/scripts/compare.sh ./tmp ./outputs/compose-init-optional
 
@@ -198,7 +194,7 @@ compose init arbitrary:
         - build test
     script:
         - |
-            ./cli compose init --default nginx.exec=nginx websocket.port=6969
+            STAMUS_APP_NAME=stamusctl ./cli compose init --default nginx.exec=nginx websocket.port=6969
             chmod +x $(pwd)/scripts/compare.sh
             $(pwd)/scripts/compare.sh ./tmp ./outputs/compose-init-arbitrary
 
@@ -209,8 +205,8 @@ compose config set:
         - build test
     script:
         - |
-            ./cli compose init --default nginx.exec=nginx
-            ./cli compose config set websocket.response=lel
+            STAMUS_APP_NAME=stamusctl ./cli compose init --default nginx.exec=nginx
+            STAMUS_APP_NAME=stamusctl ./cli compose config set websocket.response=lel
             chmod +x $(pwd)/scripts/compare.sh
             $(pwd)/scripts/compare.sh ./tmp ./outputs/compose-init-set
 
@@ -221,8 +217,8 @@ compose config reload:
         - build test
     script:
         - |
-            ./cli compose init --default nginx.exec=nginx
-            ./cli compose config set websocket.port=6969
-            ./cli compose config set --reload
+            STAMUS_APP_NAME=stamusctl ./cli compose init --default nginx.exec=nginx
+            STAMUS_APP_NAME=stamusctl ./cli compose config set websocket.port=6969
+            STAMUS_APP_NAME=stamusctl ./cli compose config set --reload
             chmod +x $(pwd)/scripts/compare.sh
             $(pwd)/scripts/compare.sh ./tmp ./outputs/compose-init
diff --git a/cmd/daemon/run/root.go b/cmd/daemon/run/root.go
@@ -20,6 +20,7 @@ import (
 
 func NewPrometheusServer(ctx context.Context) {
 	engineProm := gin.New()
+
 	p := ginprometheus.NewPrometheus("gin")
 	p.Use(engineProm)
 
@@ -70,7 +71,7 @@ func RunCmd() *cobra.Command {
 
 			logging.LoggerWithSpanContext(span.SpanContext()).Info("Setup middleware")
 			r.Use(gin.Recovery())
-			r.Use(otelgin.Middleware("service-name", otelgin.WithTracerProvider(logging.TracerProvider)))
+			r.Use(otelgin.Middleware("stamusd", otelgin.WithTracerProvider(logging.TracerProvider)))
 
 			logging.LoggerWithSpanContext(span.SpanContext()).Info("Setup routes")
 			v1 := r.Group("/api/v1")

diff --git a/cmd/docs/docs.go b/cmd/docs/docs.go
@@ -0,0 +1,83 @@
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
+package docs
+
+import "github.com/swaggo/swag"
+
+const docTemplate = `{
+    "schemes": {{ marshal .Schemes }},
+    "swagger": "2.0",
+    "info": {
+        "description": "{{escape .Description}}",
+        "title": "{{.Title}}",
+        "contact": {},
+        "version": "{{.Version}}"
+    },
+    "host": "{{.Host}}",
+    "basePath": "{{.BasePath}}",
+    "paths": {
+        "/compose/pingcompose": {
+            "get": {
+                "description": "do ping",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "example"
+                ],
+                "summary": "ping example",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "/ping": {
+            "get": {
+                "description": "do ping",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "example"
+                ],
+                "summary": "ping example",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}`
+
+// SwaggerInfo holds exported Swagger Info so clients can modify it
+var SwaggerInfo = &swag.Spec{
+	Version:          "1.0",
+	Host:             "",
+	BasePath:         "/api/v1",
+	Schemes:          []string{},
+	Title:            "Swagger Stamusd API",
+	Description:      "Stamus daemon server.",
+	InfoInstanceName: "swagger",
+	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
+}
+
+func init() {
+	swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo)
+}
diff --git a/cmd/docs/swagger.json b/cmd/docs/swagger.json
@@ -0,0 +1,58 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "description": "Stamus daemon server.",
+        "title": "Swagger Stamusd API",
+        "contact": {},
+        "version": "1.0"
+    },
+    "basePath": "/api/v1",
+    "paths": {
+        "/compose/pingcompose": {
+            "get": {
+                "description": "do ping",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "example"
+                ],
+                "summary": "ping example",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "/ping": {
+            "get": {
+                "description": "do ping",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "example"
+                ],
+                "summary": "ping example",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/cmd/docs/swagger.yaml b/cmd/docs/swagger.yaml
@@ -0,0 +1,38 @@
+basePath: /api/v1
+info:
+  contact: {}
+  description: Stamus daemon server.
+  title: Swagger Stamusd API
+  version: "1.0"
+paths:
+  /compose/pingcompose:
+    get:
+      consumes:
+      - application/json
+      description: do ping
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+      summary: ping example
+      tags:
+      - example
+  /ping:
+    get:
+      consumes:
+      - application/json
+      description: do ping
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            type: string
+      summary: ping example
+      tags:
+      - example
+swagger: "2.0"
diff --git a/cmd/main.go b/cmd/main.go
@@ -3,6 +3,7 @@ package main
 import (
 
 	// cli "stamus-ctl/cmd/stamusctl/commands"
+	"os"
 	ctl "stamus-ctl/cmd/ctl"
 	daemon "stamus-ctl/cmd/daemon"
 	"stamus-ctl/internal/app"
@@ -17,7 +18,15 @@ func main() {
 	case "stamusd":
 		daemon.Execute()
 	default:
-		daemon.Execute()
+		exec := os.Getenv("STAMUS_APP_NAME")
+		switch exec {
+		case "stamusctl":
+			ctl.Execute()
+		case "stamusd":
+			daemon.Execute()
+		default:
+			daemon.Execute()
+		}
 	}
 
 	// if err != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,4 @@ @@
     dist/
     .configs/
-    tmp/
-    docs/
+    tmp/