Skip to content

Fix an issue where upper-case letters in desired maintainers always cause a diff to be generated. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Fix an issue where upper-case letters in desired maintainers always cause a diff to be generated. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ac1a88
Fix an issue where upper-case letters in desired maintainers always c…
chrisgavin Dec 1, 2023
8deb564
Merge branch 'main' into case-sensitivity
chrisgavin Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/entitlements/backend/github_team/provider.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ def diff_existing_updated_metadata(existing_group, group, base_diff)
end
end

existing_maintainers = existing_group.metadata_fetch_if_exists("team_maintainers")
changed_maintainers = group.metadata_fetch_if_exists("team_maintainers")
existing_maintainers = existing_group.metadata_fetch_if_exists("team_maintainers")&.downcase
changed_maintainers = group.metadata_fetch_if_exists("team_maintainers")&.downcase
if existing_maintainers != changed_maintainers
base_diff[:metadata] ||= {}
if existing_maintainers.nil? && !changed_maintainers.nil?
Expand Down
22 changes: 22 additions & 0 deletions spec/unit/entitlements/backend/github_team/provider_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,28 @@
metadata: { team_maintainers: "remove" }
)
end

it "diffs team maintainers no change" do
entitlements_group = Entitlements::Models::Group.new(
dn: "cn=diff-cats,ou=Github,dc=github,dc=fake",
members: Set.new(%w[cuddles fluffy morris WHISKERS].map { |u| "uid=#{u},ou=People,dc=kittens,dc=net" }),
metadata: { "team_maintainers" => "cuddles,Fluffy" }
)

github_team = Entitlements::Backend::GitHubTeam::Models::Team.new(
team_id: 2222,
team_name: "diff-cats",
members: Set.new(%w[cuddles fluffy morris WHISKERS].map { |u| "uid=#{u},ou=People,dc=kittens,dc=net" }),
ou: "ou=kittensinc,ou=GitHub,dc=github,dc=fake",
metadata: { "team_maintainers" => "cuddles,fluffy" }
)

result = subject.diff_existing_updated(entitlements_group, github_team)
expect(result).to eq(
added: Set.new,
removed: Set.new,
)
end
end

describe "#create_github_team_group" do
Expand Down