Skip to content
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

Fix resource property in role library #763

Merged
merged 13 commits into from
Dec 18, 2023
Merged

Fix resource property in role library #763

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
87494ab
Fix resource property in role library
Nov 24, 2023
23ab55c
add CHANGELOG and new version
Nov 25, 2023
d16b117
Revert new version
Dec 10, 2023
05c5bb0
Update actions/stale action to v9 (#764)
renovate[bot] Dec 15, 2023
0e7cc65
Update changelog for 11.8.4
kitchen-porter Dec 15, 2023
c641e70
Update metadata for 11.8.4
kitchen-porter Dec 15, 2023
982006f
Set Changelog to ## Unreleased
kitchen-porter Dec 15, 2023
c3d3af5
Fix resource property in role library
Nov 25, 2023
e9a6459
Revert new version
Dec 10, 2023
9c75e1b
Fix resource property in role library
Dec 17, 2023
87089f1
Update changelog for 11.8.4
kitchen-porter Dec 15, 2023
392b539
Set Changelog to ## Unreleased
kitchen-porter Dec 15, 2023
fb59d56
Merge branch 'main' into bugfix/in_role
Dec 17, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ This file is used to list changes made in the last 3 major versions of the postg

## Unreleased

- Fix resource property in role library

## 11.8.3 - *2023-10-31*

## 11.8.2 - *2023-09-28*
Expand Down
4 changes: 2 additions & 2 deletions libraries/sql/role.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ def role_sql(new_resource)
sql.push("VALID UNTIL '#{new_resource.valid_until}'") if new_resource.valid_until

unless new_resource.action.eql?(:update)
sql.push("IN ROLE #{new_resource.role}") if new_resource.in_role
sql.push("IN ROLE #{new_resource.in_role}") if new_resource.in_role
sql.push("ROLE #{new_resource.role}") if new_resource.role
sql.push("ADMIN #{new_resource.role}") if new_resource.admin
sql.push("ADMIN #{new_resource.admin}") if new_resource.admin
end

"#{sql.join(' ').strip};"
Expand Down
Loading