Merge pull request #301 from Interhyp/updated_api

RELTEC-11865: updated api, added new fields: "branchNameRegex" and "c…
Interhyp · Jun 19, 2024 · b88d6c0 · b88d6c0
2 parents 3040679 + 60de08e
commit b88d6c0
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 36 deletions.
diff --git a/api/generated_model_repository_configuration_dto.go b/api/generated_model_repository_configuration_dto.go
diff --git a/api/generated_model_repository_configuration_webhooks_dto.go b/api/generated_model_repository_configuration_webhooks_dto.go
diff --git a/api/openapi-v3-spec.json b/api/openapi-v3-spec.json
@@ -2872,6 +2872,8 @@
                 "url": "ssh://git@bitbucket.some-organisation.com:7999/UNICORNS/unicorn-finder-service-deployment.git",
                 "mainline": "main",
                 "configuration": {
+                  "branchNameRegex": "(testing_[^_-]+_[^-]+$|development.*|production.*|versioncheck.*|renovate.*)",
+                  "commitMessageRegex": "(([A-Z][A-Z_0-9]+-[0-9]+)|(Ticket#[0-9]{16})[^0-9]|((SCTASK|INC|RITM|CHG)[0-9]{7}))(.|\\n)*",
                   "commitMessageType": "DEFAULT",
                   "requireIssue": true,
                   "requireSuccessfulBuilds": 1,
@@ -2883,7 +2885,6 @@
                     }
                   ],
                   "webhooks": {
-                    "pipelineTrigger": true,
                     "predefined": [
                       "jenkinsPipeline"
                     ],
@@ -2958,6 +2959,14 @@
               }
             }
           },
+          "branchNameRegex": {
+            "type": "string",
+            "description": "Use an explicit branch name regex."
+          },
+          "commitMessageRegex": {
+            "type": "string",
+            "description": "Use an explicit commit message regex."
+          },
           "commitMessageType": {
             "type": "string",
             "description": "Adds a corresponding commit message regex.",
@@ -3125,10 +3134,6 @@
         "type": "object",
         "description": "Webhooks configured to the repository.",
         "properties": {
-          "pipelineTrigger": {
-            "type": "boolean",
-            "description": "Default pipeline trigger webhook."
-          },
           "predefined": {
             "type": "array",
             "description": "List of predefined webhooks",

diff --git a/internal/service/repositories/repositories.go b/internal/service/repositories/repositories.go
@@ -447,6 +447,8 @@ func patchConfiguration(patch *openapi.RepositoryConfigurationDto, original *ope
 		}
 		return &openapi.RepositoryConfigurationDto{
 			AccessKeys:              patchAccessKeys(patch.AccessKeys, original.AccessKeys),
+			BranchNameRegex:         patchStringPtr(patch.BranchNameRegex, original.BranchNameRegex),
+			CommitMessageRegex:      patchStringPtr(patch.CommitMessageRegex, original.CommitMessageRegex),
 			CommitMessageType:       patchStringPtr(patch.CommitMessageType, original.CommitMessageType),
 			RequireIssue:            patchPtr[bool](patch.RequireIssue, original.RequireIssue),
 			RequireSuccessfulBuilds: patchPtr[int32](patch.RequireSuccessfulBuilds, original.RequireSuccessfulBuilds),
@@ -516,8 +518,7 @@ func patchWebhooks(patch *openapi.RepositoryConfigurationWebhooksDto, original *
 			original = &openapi.RepositoryConfigurationWebhooksDto{}
 		}
 		return &openapi.RepositoryConfigurationWebhooksDto{
-			PipelineTrigger: patchPtr[bool](patch.PipelineTrigger, original.PipelineTrigger),
-			Additional:      patchAdditionalWebhooks(patch.Additional, original.Additional),
+			Additional: patchAdditionalWebhooks(patch.Additional, original.Additional),
 		}
 	} else {
 		return original

diff --git a/internal/service/repositories/repositories_test.go b/internal/service/repositories/repositories_test.go
@@ -41,7 +41,6 @@ func createRepositoryDto() openapi.RepositoryDto {
 			RequireIssue:            ptr(false),
 			RequireSuccessfulBuilds: i(1),
 			Webhooks: &openapi.RepositoryConfigurationWebhooksDto{
-				PipelineTrigger: ptr(false),
 				Additional: []openapi.RepositoryConfigurationWebhookDto{
 					{
 						Name:          "webhookname",
@@ -115,11 +114,12 @@ func TestPatchRepository_ReplaceAll(t *testing.T) {
 					Permission: ptr("REPO_READ"),
 				},
 			},
+			BranchNameRegex:         ptr("(testing_[^_-]+_[^-]+$)"),
+			CommitMessageRegex:      ptr("(([A-Z][A-Z_0-9]+-[0-9]+))(.|\\n)*"),
 			CommitMessageType:       ptr("DEFAULT"),
 			RequireIssue:            ptr(true),
 			RequireSuccessfulBuilds: i(2),
 			Webhooks: &openapi.RepositoryConfigurationWebhooksDto{
-				PipelineTrigger: ptr(false),
 				Additional: []openapi.RepositoryConfigurationWebhookDto{
 					{
 						Name:          "newwebhookname",
@@ -151,11 +151,12 @@ func TestPatchRepository_ReplaceAll(t *testing.T) {
 					Permission: ptr("REPO_READ"),
 				},
 			},
+			BranchNameRegex:         ptr("(testing_[^_-]+_[^-]+$)"),
+			CommitMessageRegex:      ptr("(([A-Z][A-Z_0-9]+-[0-9]+))(.|\\n)*"),
 			CommitMessageType:       ptr("DEFAULT"),
 			RequireIssue:            ptr(true),
 			RequireSuccessfulBuilds: i(2),
 			Webhooks: &openapi.RepositoryConfigurationWebhooksDto{
-				PipelineTrigger: ptr(false),
 				Additional: []openapi.RepositoryConfigurationWebhookDto{
 					{
 						Name:          "newwebhookname",
@@ -210,8 +211,7 @@ func TestPatchRepository_ClearFields(t *testing.T) {
 			RequireIssue:            ptr(false),
 			RequireSuccessfulBuilds: i(1),
 			Webhooks: &openapi.RepositoryConfigurationWebhooksDto{
-				PipelineTrigger: ptr(false),
-				Additional:      nil,
+				Additional: nil,
 			},
 			Approvers:        nil,
 			DefaultReviewers: nil,

diff --git a/test/acceptance/util_dtos_test.go b/test/acceptance/util_dtos_test.go
@@ -243,7 +243,6 @@ func tstRepository() openapi.RepositoryDto {
 			RequireSuccessfulBuilds: pi(1),
 			RequireConditions:       &map[string]openapi.ConditionReferenceDto{"snyk-key": {RefMatcher: "master"}},
 			Webhooks: &openapi.RepositoryConfigurationWebhooksDto{
-				PipelineTrigger: pb(false),
 				Additional: []openapi.RepositoryConfigurationWebhookDto{
 					{
 						Name:   "webhookname",
@@ -305,7 +304,6 @@ configuration:
         snyk-key:
             refMatcher: master
     webhooks:
-        pipelineTrigger: false
         additional:
             - name: webhookname
               url: webhookurl

diff --git a/test/mock/metadatamock/metadata.go b/test/mock/metadatamock/metadata.go
@@ -98,8 +98,6 @@ configuration:
     permission: REPO_READ
   - data: 'ssh-key abcdefgh.....'
     permission: REPO_WRITE
-  webhooks:
-    pipelineTrigger: true
   commitMessageType: DEFAULT
   mergeConfig:
     defaultStrategy:

diff --git a/test/resources/acceptance-expected/repositories-filtered-service.json b/test/resources/acceptance-expected/repositories-filtered-service.json
@@ -38,10 +38,7 @@
             }
           ]
         },
-        "requireIssue": true,
-        "webhooks": {
-          "pipelineTrigger": true
-        }
+        "requireIssue": true
       },
       "generator": "third-party-software",
       "jiraIssue": "ISSUE-0000",

diff --git a/test/resources/acceptance-expected/repositories.json b/test/resources/acceptance-expected/repositories.json
@@ -65,10 +65,7 @@
             }
           ]
         },
-        "requireIssue": true,
-        "webhooks": {
-          "pipelineTrigger": true
-        }
+        "requireIssue": true
       },
       "generator": "third-party-software",
       "jiraIssue": "ISSUE-0000",

diff --git a/test/resources/acceptance-expected/repository-create.json b/test/resources/acceptance-expected/repository-create.json
@@ -25,8 +25,7 @@
           "name": "webhookname",
           "url": "webhookurl"
         }
-      ],
-      "pipelineTrigger": false
+      ]
     }
   },
   "filecategory": {

diff --git a/test/resources/acceptance-expected/repository-update-newowner.json b/test/resources/acceptance-expected/repository-update-newowner.json
@@ -25,8 +25,7 @@
           "name": "webhookname",
           "url": "webhookurl"
         }
-      ],
-      "pipelineTrigger": false
+      ]
     }
   },
   "filecategory": {

diff --git a/test/resources/acceptance-expected/repository-update.json b/test/resources/acceptance-expected/repository-update.json
@@ -25,8 +25,7 @@
           "name": "webhookname",
           "url": "webhookurl"
         }
-      ],
-      "pipelineTrigger": false
+      ]
     }
   },
   "filecategory": {

diff --git a/test/resources/acceptance-expected/repository.json b/test/resources/acceptance-expected/repository.json
@@ -36,10 +36,7 @@
         }
       ]
     },
-    "requireIssue": true,
-    "webhooks": {
-      "pipelineTrigger": true
-    }
+    "requireIssue": true
   },
   "generator": "third-party-software",
   "jiraIssue": "ISSUE-0000",