Merge pull request #377 from openinfradev/stack_template_fix

feature. bug fix for stack_templates
openinfradev · Apr 15, 2024 · b0ece2a · b0ece2a
2 parents 8286ab5 + 9a98908
commit b0ece2a
Show file tree

Hide file tree

Showing 8 changed files with 211 additions and 51 deletions.
diff --git a/api/swagger/docs.go b/api/swagger/docs.go
@@ -11266,12 +11266,21 @@ const docTemplate = `{
         },
         "github_com_openinfradev_tks-api_pkg_domain.CreatePolicyRequest": {
             "type": "object",
+            "required": [
+                "enforcementAction",
+                "policyName"
+            ],
             "properties": {
                 "description": {
                     "type": "string"
                 },
                 "enforcementAction": {
                     "type": "string",
+                    "enum": [
+                        "deny",
+                        "dryrun",
+                        "warn"
+                    ],
                     "example": "deny"
                 },
                 "mandatory": {
@@ -11333,7 +11342,9 @@ const docTemplate = `{
             "type": "object",
             "required": [
                 "kind",
-                "rego"
+                "rego",
+                "severity",
+                "templateName"
             ],
             "properties": {
                 "deprecated": {
@@ -15068,12 +15079,22 @@ const docTemplate = `{
         },
         "github_com_openinfradev_tks-api_pkg_domain.UpdatePolicyRequest": {
             "type": "object",
+            "required": [
+                "enforcementAction",
+                "policyName"
+            ],
             "properties": {
                 "description": {
                     "type": "string"
                 },
                 "enforcementAction": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "deny",
+                        "dryrun",
+                        "warn"
+                    ],
+                    "example": "deny"
                 },
                 "mandatory": {
                     "type": "boolean"
@@ -15110,6 +15131,9 @@ const docTemplate = `{
         },
         "github_com_openinfradev_tks-api_pkg_domain.UpdatePolicyTemplateRequest": {
             "type": "object",
+            "required": [
+                "templateName"
+            ],
             "properties": {
                 "deprecated": {
                     "type": "boolean",
@@ -15237,11 +15261,22 @@ const docTemplate = `{
         "github_com_openinfradev_tks-api_pkg_domain.UpdateStackTemplateRequest": {
             "type": "object",
             "required": [
-                "serviceIds"
+                "kubeType",
+                "kubeVersion",
+                "organizationIds",
+                "platform",
+                "serviceIds",
+                "template",
+                "version"
             ],
             "properties": {
                 "cloudService": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "AWS",
+                        "AZZURE",
+                        "GCP"
+                    ]
                 },
                 "description": {
                     "type": "string"
@@ -15252,6 +15287,12 @@ const docTemplate = `{
                 "kubeVersion": {
                     "type": "string"
                 },
+                "organizationIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "platform": {
                     "type": "string"
                 },
@@ -15265,7 +15306,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "templateType": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "STANDARD",
+                        "MSA"
+                    ]
                 },
                 "version": {
                     "type": "string"
@@ -15633,7 +15678,9 @@ const docTemplate = `{
             "type": "object",
             "required": [
                 "kind",
-                "rego"
+                "rego",
+                "severity",
+                "templateName"
             ],
             "properties": {
                 "deprecated": {
@@ -15987,6 +16034,9 @@ const docTemplate = `{
         },
         "github_com_openinfradev_tks-api_pkg_domain_admin.UpdatePolicyTemplateRequest": {
             "type": "object",
+            "required": [
+                "templateName"
+            ],
             "properties": {
                 "deprecated": {
                     "type": "boolean",

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -11260,12 +11260,21 @@
         },
         "github_com_openinfradev_tks-api_pkg_domain.CreatePolicyRequest": {
             "type": "object",
+            "required": [
+                "enforcementAction",
+                "policyName"
+            ],
             "properties": {
                 "description": {
                     "type": "string"
                 },
                 "enforcementAction": {
                     "type": "string",
+                    "enum": [
+                        "deny",
+                        "dryrun",
+                        "warn"
+                    ],
                     "example": "deny"
                 },
                 "mandatory": {
@@ -11327,7 +11336,9 @@
             "type": "object",
             "required": [
                 "kind",
-                "rego"
+                "rego",
+                "severity",
+                "templateName"
             ],
             "properties": {
                 "deprecated": {
@@ -15062,12 +15073,22 @@
         },
         "github_com_openinfradev_tks-api_pkg_domain.UpdatePolicyRequest": {
             "type": "object",
+            "required": [
+                "enforcementAction",
+                "policyName"
+            ],
             "properties": {
                 "description": {
                     "type": "string"
                 },
                 "enforcementAction": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "deny",
+                        "dryrun",
+                        "warn"
+                    ],
+                    "example": "deny"
                 },
                 "mandatory": {
                     "type": "boolean"
@@ -15104,6 +15125,9 @@
         },
         "github_com_openinfradev_tks-api_pkg_domain.UpdatePolicyTemplateRequest": {
             "type": "object",
+            "required": [
+                "templateName"
+            ],
             "properties": {
                 "deprecated": {
                     "type": "boolean",
@@ -15231,11 +15255,22 @@
         "github_com_openinfradev_tks-api_pkg_domain.UpdateStackTemplateRequest": {
             "type": "object",
             "required": [
-                "serviceIds"
+                "kubeType",
+                "kubeVersion",
+                "organizationIds",
+                "platform",
+                "serviceIds",
+                "template",
+                "version"
             ],
             "properties": {
                 "cloudService": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "AWS",
+                        "AZZURE",
+                        "GCP"
+                    ]
                 },
                 "description": {
                     "type": "string"
@@ -15246,6 +15281,12 @@
                 "kubeVersion": {
                     "type": "string"
                 },
+                "organizationIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "platform": {
                     "type": "string"
                 },
@@ -15259,7 +15300,11 @@
                     "type": "string"
                 },
                 "templateType": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": [
+                        "STANDARD",
+                        "MSA"
+                    ]
                 },
                 "version": {
                     "type": "string"
@@ -15627,7 +15672,9 @@
             "type": "object",
             "required": [
                 "kind",
-                "rego"
+                "rego",
+                "severity",
+                "templateName"
             ],
             "properties": {
                 "deprecated": {
@@ -15981,6 +16028,9 @@
         },
         "github_com_openinfradev_tks-api_pkg_domain_admin.UpdatePolicyTemplateRequest": {
             "type": "object",
+            "required": [
+                "templateName"
+            ],
             "properties": {
                 "deprecated": {
                     "type": "boolean",

diff --git a/api/swagger/swagger.yaml b/api/swagger/swagger.yaml
@@ -965,6 +965,10 @@ definitions:
       description:
         type: string
       enforcementAction:
+        enum:
+        - deny
+        - dryrun
+        - warn
         example: deny
         type: string
       mandatory:
@@ -993,6 +997,9 @@ definitions:
       templateId:
         example: d98ef5f1-4a68-4047-a446-2207787ce3ff
         type: string
+    required:
+    - enforcementAction
+    - policyName
     type: object
   github_com_openinfradev_tks-api_pkg_domain.CreatePolicyResponse:
     properties:
@@ -1046,6 +1053,8 @@ definitions:
     required:
     - kind
     - rego
+    - severity
+    - templateName
     type: object
   github_com_openinfradev_tks-api_pkg_domain.CreatePolicyTemplateVersionRequest:
     properties:
@@ -3492,6 +3501,11 @@ definitions:
       description:
         type: string
       enforcementAction:
+        enum:
+        - deny
+        - dryrun
+        - warn
+        example: deny
         type: string
       mandatory:
         type: boolean
@@ -3515,6 +3529,9 @@ definitions:
       templateId:
         example: d98ef5f1-4a68-4047-a446-2207787ce3ff
         type: string
+    required:
+    - enforcementAction
+    - policyName
     type: object
   github_com_openinfradev_tks-api_pkg_domain.UpdatePolicyTemplateRequest:
     properties:
@@ -3537,6 +3554,8 @@ definitions:
       templateName:
         example: 필수 Label 검사
         type: string
+    required:
+    - templateName
     type: object
   github_com_openinfradev_tks-api_pkg_domain.UpdatePrimaryClusterRequest:
     properties:
@@ -3602,13 +3621,21 @@ definitions:
   github_com_openinfradev_tks-api_pkg_domain.UpdateStackTemplateRequest:
     properties:
       cloudService:
+        enum:
+        - AWS
+        - AZZURE
+        - GCP
         type: string
       description:
         type: string
       kubeType:
         type: string
       kubeVersion:
         type: string
+      organizationIds:
+        items:
+          type: string
+        type: array
       platform:
         type: string
       serviceIds:
@@ -3618,11 +3645,20 @@ definitions:
       template:
         type: string
       templateType:
+        enum:
+        - STANDARD
+        - MSA
         type: string
       version:
         type: string
     required:
+    - kubeType
+    - kubeVersion
+    - organizationIds
+    - platform
     - serviceIds
+    - template
+    - version
     type: object
   github_com_openinfradev_tks-api_pkg_domain.UpdateSystemNotificationRequest:
     properties:
@@ -3906,6 +3942,8 @@ definitions:
     required:
     - kind
     - rego
+    - severity
+    - templateName
     type: object
   github_com_openinfradev_tks-api_pkg_domain_admin.CreatePolicyTemplateVersionRequest:
     properties:
@@ -4129,6 +4167,8 @@ definitions:
       templateName:
         example: 필수 Label 검사
         type: string
+    required:
+    - templateName
     type: object
   github_com_openinfradev_tks-api_pkg_httpErrors.RestError:
     properties: