Add missing fields to BranchProtection and related structs #626

infinoid · 2023-08-01T13:49:23Z

infinoid commented

2023-08-01 13:49:23 +00:00

the gitea.BranchProtection struct is missing some fields which are present in the actual gitea API (and swagger).

BranchProtection.RuleName was added in gitea v1.19.0, via PR #20825
BranchProtection.UnprotectedFilePatterns was added in gitea v1.16.0, via PR #16395

This PR adds those fields to the BranchProtection struct, and the related Create and Edit option structs, to match the structs defined on the gitea server side.

the `gitea.BranchProtection` struct is missing some fields which are present in the actual gitea API (and swagger). * BranchProtection.RuleName was added in gitea v1.19.0, via [PR #20825](https://github.com/go-gitea/gitea/pull/20825) * BranchProtection.UnprotectedFilePatterns was added in gitea v1.16.0, via [PR #16395](https://github.com/go-gitea/gitea/pull/16395) This PR adds those fields to the BranchProtection struct, and the related Create and Edit option structs, to match the structs [defined](https://github.com/go-gitea/gitea/blob/main/modules/structs/repo_branch.go#L27) on the gitea server side.

infinoid commented

2023-08-01 13:51:08 +00:00

By the way, your PR template needs an update. It says:

Make sure you are targeting the master branch, pull requests on release branches are only allowed for bug fixes.

However, the default branch for go-sdk seems to be main, not master.

By the way, your PR template needs an update. It says: > 1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes. However, the default branch for go-sdk seems to be `main`, not `master`.

jolheiser reviewed 2023-08-01 14:47:23 +00:00

gitea/repo_branch_protection.go Outdated

						
				@ -86,6 +90,7 @@ type EditBranchProtectionOption struct {

					DismissStaleApprovals         *bool    `json:"dismiss_stale_approvals"`

					RequireSignedCommits          *bool    `json:"require_signed_commits"`

					ProtectedFilePatterns         *string  `json:"protected_file_patterns"`

					UnprotectedFilePatterns       string   `json:"unprotected_file_patterns"`

jolheiser commented

2023-08-01 14:47:23 +00:00

This should likely be a pointer so that nil is usable and doesn't marshal an empty string.

This should likely be a pointer so that `nil` is usable and doesn't marshal an empty string.

infinoid commented

2023-08-01 16:01:56 +00:00

Fixed. Good catch, thanks.

infinoid marked this conversation as resolved

infinoid force-pushed add-branch-protection-rule-name from ef0cc2820c to fbfdb2173a

2023-08-01 16:01:23 +00:00

Compare

jolheiser approved these changes 2023-08-01 16:05:32 +00:00

delvh approved these changes 2023-08-01 16:19:56 +00:00

infinoid force-pushed add-branch-protection-rule-name from fbfdb2173a to 7dd8441d0b

2023-08-01 16:23:45 +00:00

Compare

infinoid commented

2023-08-01 16:24:53 +00:00

I rebased to current main.

jolheiser merged commit ae1583a7be into main

2023-08-01 16:26:43 +00:00

jolheiser referenced this issue from a commit

2023-08-01 16:26:43 +00:00

Add missing fields to BranchProtection and related structs (#626)

infinoid deleted branch add-branch-protection-rule-name

2023-08-01 16:32:57 +00:00

Sign in to join this conversation.

No reviewers

No Milestone

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: gitea/go-sdk#626