chore: opeanpi

highcard-dev · Jul 21, 2024 · cda71a4 · cda71a4
1 parent 4e1c000
commit cda71a4
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 63 deletions.
diff --git a/docs/docs.go b/docs/docs.go
@@ -374,17 +374,6 @@ const docTemplate = `{
                 "wait": {}
             }
         },
-        "ProcessCommand": {
-            "type": "object",
-            "properties": {
-                "commands": {
-                    "type": "object",
-                    "additionalProperties": {
-                        "$ref": "#/definitions/CommandInstructionSet"
-                    }
-                }
-            }
-        },
         "ProcessMonitorMetrics": {
             "type": "object",
             "properties": {
@@ -494,6 +483,18 @@ const docTemplate = `{
                     "description": "don't make this a semver, it's not allways",
                     "type": "string"
                 },
+                "commands": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "$ref": "#/definitions/CommandInstructionSet"
+                    }
+                },
+                "cronjobs": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/domain.Cronjob"
+                    }
+                },
                 "desc": {
                     "type": "string"
                 },
@@ -512,12 +513,6 @@ const docTemplate = `{
                         }
                     }
                 },
-                "processes": {
-                    "type": "object",
-                    "additionalProperties": {
-                        "$ref": "#/definitions/ProcessCommand"
-                    }
-                },
                 "version": {
                     "type": "string"
                 }
@@ -565,6 +560,20 @@ const docTemplate = `{
                 "ConsoleTypePlugin"
             ]
         },
+        "domain.Cronjob": {
+            "type": "object",
+            "properties": {
+                "command": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "schedule": {
+                    "type": "string"
+                }
+            }
+        },
         "domain.Process": {
             "type": "object",
             "properties": {
@@ -626,9 +635,6 @@ const docTemplate = `{
                 "command": {
                     "type": "string"
                 },
-                "process": {
-                    "type": "string"
-                },
                 "sync": {
                     "type": "boolean"
                 }

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -363,17 +363,6 @@
                 "wait": {}
             }
         },
-        "ProcessCommand": {
-            "type": "object",
-            "properties": {
-                "commands": {
-                    "type": "object",
-                    "additionalProperties": {
-                        "$ref": "#/definitions/CommandInstructionSet"
-                    }
-                }
-            }
-        },
         "ProcessMonitorMetrics": {
             "type": "object",
             "properties": {
@@ -483,6 +472,18 @@
                     "description": "don't make this a semver, it's not allways",
                     "type": "string"
                 },
+                "commands": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "$ref": "#/definitions/CommandInstructionSet"
+                    }
+                },
+                "cronjobs": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/domain.Cronjob"
+                    }
+                },
                 "desc": {
                     "type": "string"
                 },
@@ -501,12 +502,6 @@
                         }
                     }
                 },
-                "processes": {
-                    "type": "object",
-                    "additionalProperties": {
-                        "$ref": "#/definitions/ProcessCommand"
-                    }
-                },
                 "version": {
                     "type": "string"
                 }
@@ -554,6 +549,20 @@
                 "ConsoleTypePlugin"
             ]
         },
+        "domain.Cronjob": {
+            "type": "object",
+            "properties": {
+                "command": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "schedule": {
+                    "type": "string"
+                }
+            }
+        },
         "domain.Process": {
             "type": "object",
             "properties": {
@@ -615,9 +624,6 @@
                 "command": {
                     "type": "string"
                 },
-                "process": {
-                    "type": "string"
-                },
                 "sync": {
                     "type": "boolean"
                 }

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -40,13 +40,6 @@ definitions:
         type: string
       wait: {}
     type: object
-  ProcessCommand:
-    properties:
-      commands:
-        additionalProperties:
-          $ref: '#/definitions/CommandInstructionSet'
-        type: object
-    type: object
   ProcessMonitorMetrics:
     properties:
       connections:
@@ -119,6 +112,14 @@ definitions:
       app_version:
         description: don't make this a semver, it's not allways
         type: string
+      commands:
+        additionalProperties:
+          $ref: '#/definitions/CommandInstructionSet'
+        type: object
+      cronjobs:
+        items:
+          $ref: '#/definitions/domain.Cronjob'
+        type: array
       desc:
         type: string
       init:
@@ -131,10 +132,6 @@ definitions:
             type: string
           type: object
         type: object
-      processes:
-        additionalProperties:
-          $ref: '#/definitions/ProcessCommand'
-        type: object
       version:
         type: string
     type: object
@@ -167,6 +164,15 @@ definitions:
     - ConsoleTypeTTY
     - ConsoleTypeProcess
     - ConsoleTypePlugin
+  domain.Cronjob:
+    properties:
+      command:
+        type: string
+      name:
+        type: string
+      schedule:
+        type: string
+    type: object
   domain.Process:
     properties:
       name:
@@ -208,8 +214,6 @@ definitions:
     properties:
       command:
         type: string
-      process:
-        type: string
       sync:
         type: boolean
     type: object

diff --git a/examples/htop/.scroll/scroll-lock.json b/examples/htop/.scroll/scroll-lock.json
@@ -1 +1 @@
-{"statuses":{"main.start":"running"},"scroll_version":"0.0.1","scroll_name":"registry-1.docker.io/highcard/scroll-htop"}
+{"statuses":{},"scroll_version":"0.0.1","scroll_name":"registry-1.docker.io/highcard/scroll-htop"}
diff --git a/examples/htop/.scroll/scroll.yaml b/examples/htop/.scroll/scroll.yaml
@@ -2,13 +2,11 @@ name: registry-1.docker.io/highcard/scroll-htop
 desc: Nginx server
 version: 0.0.1
 app_version: latest
-init: "main.start"
+init: start"
 processes:
-  main:
-    commands:
-      start:
-        run: restart
-        procedures:
-          - mode: exec-tty
-            data:
-              - htop
+  start:
+    run: restart
+    procedures:
+      - mode: exec-tty
+        data:
+          - htop