RELTEC-12316: add required conditions in repository configuration for…

… patch repository
Interhyp · Dec 9, 2024 · 4b341d6 · 4b341d6
1 parent 844e03e
commit 4b341d6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/api/generated_model_repository_configuration_patch_dto.go b/api/generated_model_repository_configuration_patch_dto.go
diff --git a/api/openapi-v3-spec.yaml b/api/openapi-v3-spec.yaml
@@ -2187,6 +2187,14 @@ components:
             - ORGANIZATION
             - ENTERPRISE
           example: NOT_ACCESSIBLE
+        requireConditions:
+          description: Configuration of conditional builds as map of structs (key name e.g. some-key) of target references.
+          type: object
+          examples:
+            - some-key:
+                refMatcher: main
+          additionalProperties:
+            $ref: '#/components/schemas/ConditionReferenceDto'
     MergeStrategy:
       type: object
       properties:

diff --git a/internal/service/repositories/repositories.go b/internal/service/repositories/repositories.go
@@ -458,10 +458,10 @@ func patchConfiguration(patch *openapi.RepositoryConfigurationPatchDto, original
 			Watchers:                patchStringSlice(patch.Watchers, original.Watchers),
 			Archived:                patchPtr[bool](patch.Archived, original.Archived),
 			ActionsAccess:           patchStringPtr(patch.ActionsAccess, original.ActionsAccess),
+			RequireConditions:       patchRequireConditions(patch.RequireConditions, original.RequireConditions),
 			// fields not allowed for patching carry over from original
-			RequireIssue:      original.RequireIssue,
-			RequireConditions: original.RequireConditions,
-			RefProtections:    original.RefProtections,
+			RequireIssue:   original.RequireIssue,
+			RefProtections: original.RefProtections,
 		}
 	} else {
 		return original
@@ -549,6 +549,19 @@ func patchAccessKeys(patch []openapi.RepositoryConfigurationAccessKeyDto, origin
 	}
 }
 
+func patchRequireConditions(patch map[string]openapi.ConditionReferenceDto, original map[string]openapi.ConditionReferenceDto) map[string]openapi.ConditionReferenceDto {
+	if patch != nil {
+		if len(patch) == 0 {
+			// remove
+			return nil
+		} else {
+			return patch
+		}
+	} else {
+		return original
+	}
+}
+
 func patchStringSlice(patch []string, original []string) []string {
 	if patch != nil {
 		if len(patch) == 0 {

diff --git a/test/acceptance/util_dtos_test.go b/test/acceptance/util_dtos_test.go
@@ -300,8 +300,7 @@ func tstRepositoryPatchWithIgnoredConfigurationFields() interface{} {
 	}{
 		Mainline: ptr("main"),
 		Configuration: &openapi.RepositoryConfigurationDto{
-			RequireIssue:      ptr(true),
-			RequireConditions: make(map[string]openapi.ConditionReferenceDto),
+			RequireIssue: ptr(true),
 			RefProtections: &openapi.RefProtections{
 				Branches: &openapi.RefProtectionsBranches{
 					RequirePR: []openapi.ProtectedRef{