reorder and clean Bc

Author: BraisVQ

jenkins/webhook-proxy/main.go

@@ -81,22 +81,18 @@ type buildConfig struct {
         ResourceVersion string `json:"resourceVersion"`
     } `json:"metadata"`
     Spec struct {
-        Source struct {
-            Git struct {
-                Ref string `json:"ref"`
-            } `json:"git"`
-        } `json:"source"`
         Strategy struct {
             JenkinsPipelineStrategy struct {
                 JenkinsfilePath string `json:"jenkinsfilePath"`
             } `json:"jenkinsPipelineStrategy"`
         } `json:"strategy"`
+        Source struct {
+            Git struct {
+                Ref string `json:"ref"`
+            } `json:"git"`
+        } `json:"source"`
         Triggers []struct {
             Type string `json:"type"`
-            // Generic struct {
-            //     Secret string `json:"secret"`
-            //     AllowEnv bool `json:"allowEnv"`
-            // } `json:"generic"`
         } `json:"triggers"`
     } `json:"spec"`
 }

jenkins/webhook-proxy/pipeline.json.tmpl

@@ -7,16 +7,16 @@
         "resourceVersion": "{{.ResourceVersion}}"
     },
     "spec": {
-        "triggers": [
-            {
-                "type": "Generic",
-                "generic": {
-                    "secret": "{{.TriggerSecret}}",
-                    "allowEnv": true
-                }
+        "output": {},
+        "resources": {},
+        "strategy": {
+            "type": "JenkinsPipeline",
+            "jenkinsPipelineStrategy": {
+                "jenkinsfilePath": "{{.JenkinsfilePath}}",
+                "env": {{.Env}}
             }
-        ],
-        "runPolicy": "Serial",
+        },
+        "postCommit": {},
         "source": {
             "type": "Git",
             "git": {
@@ -27,16 +27,16 @@
                 "name": "cd-user-with-password"
             }
         },
-        "strategy": {
-            "type": "JenkinsPipeline",
-            "jenkinsPipelineStrategy": {
-                "jenkinsfilePath": "{{.JenkinsfilePath}}",
-                "env": {{.Env}}
+        "triggers": [
+            {
+                "type": "Generic",
+                "generic": {
+                    "secret": "{{.TriggerSecret}}",
+                    "allowEnv": true
+                }
             }
-        },
-        "output": {},
-        "resources": {},
-        "postCommit": {},
-        "nodeSelector": {}
+        ],
+        "nodeSelector": {},
+        "runPolicy": "Serial"
     }
 }