Change userIdentifiers to userEmails for branch rules bypass (#47)

* rename userIdentifiers to userEmails for branch rules bypass
harness · Jul 16, 2024 · bcd612e · bcd612e
1 parent 328e912
commit bcd612e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/internal/gitexporter/exporter.go b/internal/gitexporter/exporter.go
@@ -381,8 +381,8 @@ func extractUsers(repo *types.RepoData, users map[string]bool) {
 	}
 
 	for _, rule := range repo.BranchRules {
-		for _, user := range rule.RuleDefinition.Bypass.UserIdentifiers {
-			users[user] = true
+		for _, email := range rule.RuleDefinition.Bypass.UserEmails {
+			users[email] = true
 		}
 	}
 }

diff --git a/internal/migrate/stash/utils.go b/internal/migrate/stash/utils.go
@@ -241,9 +241,9 @@ func convertBranchModelsMap(from branchModels) map[string]modelValue {
 }
 
 func mapRuleDefinition(t string, bypassUsers []author) types.RuleDefinition {
-	var users []string
+	var emails []string
 	for _, u := range bypassUsers {
-		users = append(users, u.EmailAddress)
+		emails = append(emails, u.EmailAddress)
 	}
 
 	lifecycle := types.Lifecycle{}
@@ -263,7 +263,7 @@ func mapRuleDefinition(t string, bypassUsers []author) types.RuleDefinition {
 	return types.RuleDefinition{
 		Lifecycle: lifecycle,
 		Bypass: types.Bypass{
-			UserIdentifiers: users,
+			UserEmails: emails,
 		},
 	}
 }

diff --git a/internal/types/types.go b/internal/types/types.go
@@ -128,8 +128,8 @@ type (
 	}
 
 	Bypass struct {
-		UserIdentifiers []string
-		RepoOwners      bool
+		UserEmails []string
+		RepoOwners bool
 	}
 
 	Approvals struct {

diff --git a/types/git_exporter.go b/types/git_exporter.go
@@ -162,8 +162,8 @@ type (
 	}
 
 	Bypass struct {
-		UserIdentifiers []string `json:"user_identifiers,omitempty"`
-		RepoOwners      bool     `json:"repo_owners,omitempty"`
+		UserEmails []string `json:"user_emails,omitempty"`
+		RepoOwners bool     `json:"repo_owners,omitempty"`
 	}
 
 	Approvals struct {