RELTEC-11852: added "mergeConfig" as optional configuration

Interhyp · Jun 14, 2024 · 0dacc7a · 0dacc7a
1 parent 4b6c15f
commit 0dacc7a
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 9 deletions.
diff --git a/api/generated_apimodel.go b/api/generated_apimodel.go
diff --git a/api/openapi-v3-spec.json b/api/openapi-v3-spec.json
@@ -2651,11 +2651,10 @@
           }
         ],
         "example": {
-            "url": "/swagger-ui/index.html",
-            "title": "SwaggerUI",
-            "description": "Displays the frontend for the API."
-          }
-
+          "url": "/swagger-ui/index.html",
+          "title": "SwaggerUI",
+          "description": "Displays the frontend for the API."
+        }
       },
       "Link": {
         "type": "object",
@@ -2669,9 +2668,9 @@
         },
         "description": "A link ",
         "example": {
-            "url": "/swagger-ui/index.html",
-            "title": "SwaggerUI"
-          }
+          "url": "/swagger-ui/index.html",
+          "title": "SwaggerUI"
+        }
       },
       "RepositoryDto": {
         "required": [
@@ -2944,6 +2943,20 @@
               "$ref": "#/components/schemas/RepositoryConfigurationAccessKeyDto"
             }
           },
+          "mergeConfig": {
+            "type": "object",
+            "properties": {
+              "defaultStrategy": {
+                "$ref": "#/components/schemas/MergeStrategy"
+              },
+              "strategies": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/MergeStrategy"
+                }
+              }
+            }
+          },
           "commitMessageType": {
             "type": "string",
             "description": "Adds a corresponding commit message regex.",
@@ -3028,6 +3041,35 @@
           }
         }
       },
+      "MergeStrategy": {
+        "type": "object",
+        "required": ["id"],
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "enum": [
+              "no-ff",
+              "ff",
+              "ff-only",
+              "squash",
+              "squash-ff-only",
+              "rebase-no-ff",
+              "rebase-ff-only"
+            ],
+            "example": [
+              "no-ff",
+              "ff",
+              "ff-only",
+              "squash",
+              "squash-ff-only",
+              "rebase-no-ff",
+              "rebase-ff-only"
+            ]
+          }
+        },
+        "title": "Strategy"
+      },
       "RepositoryConfigurationAccessKeyDto": {
         "properties": {
           "key": {

diff --git a/test/mock/metadatamock/metadata.go b/test/mock/metadatamock/metadata.go
@@ -96,9 +96,19 @@ configuration:
   accessKeys:
   - key: DEPLOYMENT
     permission: REPO_READ
+  - data: 'ssh-key abcdefgh.....'
+    permission: REPO_WRITE
   webhooks:
     pipelineTrigger: true
   commitMessageType: DEFAULT
+  mergeConfig:
+    defaultStrategy:
+      id: "no-ff"
+    strategies:
+      - id: "no-ff"
+      - id: "ff"
+      - id: "ff-only"
+      - id: "squash"
   requireIssue: true
   approvers:
     testing:

diff --git a/test/resources/acceptance-expected/repositories-filtered-service.json b/test/resources/acceptance-expected/repositories-filtered-service.json
@@ -7,6 +7,10 @@
           {
             "key": "DEPLOYMENT",
             "permission": "REPO_READ"
+          },
+          {
+            "data": "ssh-key abcdefgh.....",
+            "permission": "REPO_WRITE"
           }
         ],
         "approvers": {
@@ -15,6 +19,25 @@
           ]
         },
         "commitMessageType": "DEFAULT",
+        "mergeConfig": {
+          "defaultStrategy": {
+            "id": "no-ff"
+          },
+          "strategies": [
+            {
+              "id": "no-ff"
+            },
+            {
+              "id": "ff"
+            },
+            {
+              "id": "ff-only"
+            },
+            {
+              "id": "squash"
+            }
+          ]
+        },
         "requireIssue": true,
         "webhooks": {
           "pipelineTrigger": true

diff --git a/test/resources/acceptance-expected/repositories.json b/test/resources/acceptance-expected/repositories.json
@@ -34,6 +34,10 @@
           {
             "key": "DEPLOYMENT",
             "permission": "REPO_READ"
+          },
+          {
+            "data": "ssh-key abcdefgh.....",
+            "permission": "REPO_WRITE"
           }
         ],
         "approvers": {
@@ -42,6 +46,25 @@
           ]
         },
         "commitMessageType": "DEFAULT",
+        "mergeConfig": {
+          "defaultStrategy": {
+            "id": "no-ff"
+          },
+          "strategies": [
+            {
+              "id": "no-ff"
+            },
+            {
+              "id": "ff"
+            },
+            {
+              "id": "ff-only"
+            },
+            {
+              "id": "squash"
+            }
+          ]
+        },
         "requireIssue": true,
         "webhooks": {
           "pipelineTrigger": true

diff --git a/test/resources/acceptance-expected/repository.json b/test/resources/acceptance-expected/repository.json
@@ -5,6 +5,10 @@
       {
         "key": "DEPLOYMENT",
         "permission": "REPO_READ"
+      },
+      {
+        "data": "ssh-key abcdefgh.....",
+        "permission": "REPO_WRITE"
       }
     ],
     "approvers": {
@@ -13,6 +17,25 @@
       ]
     },
     "commitMessageType": "DEFAULT",
+    "mergeConfig": {
+      "defaultStrategy": {
+        "id": "no-ff"
+      },
+      "strategies": [
+        {
+          "id": "no-ff"
+        },
+        {
+          "id": "ff"
+        },
+        {
+          "id": "ff-only"
+        },
+        {
+          "id": "squash"
+        }
+      ]
+    },
     "requireIssue": true,
     "webhooks": {
       "pipelineTrigger": true