Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AllCops:
NewCops: disable
SuggestExtensions: false
DisplayCopNames: true
TargetRubyVersion: 3.3
TargetRubyVersion: 3.4.4
Exclude:
- 'bin/*'
- 'spec/acceptance/fixtures/**/*'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.4.4
133 changes: 72 additions & 61 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,140 +11,151 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3.3)
activesupport (8.0.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
ast (2.4.3)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.2)
concurrent-ruby (1.3.5)
connection_pool (2.5.3)
contracts (0.17.2)
crack (1.0.0)
bigdecimal
rexml
diff-lcs (1.5.1)
docile (1.4.0)
drb (2.2.1)
entitlements-app (1.1.0)
diff-lcs (1.6.2)
docile (1.4.1)
drb (2.2.3)
entitlements-app (1.2.0)
concurrent-ruby (~> 1.3, >= 1.3.1)
faraday (~> 2.0)
logger (~> 1.6)
net-ldap (~> 0.19)
octokit (~> 4.18)
optimist (~> 3.1)
ostruct (~> 0.6.0)
faraday (2.12.1)
faraday (2.13.1)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.4.0)
faraday-net_http (3.4.1)
net-http (>= 0.5.0)
faraday-retry (2.2.1)
faraday-retry (2.3.2)
faraday (~> 2.0)
hashdiff (1.1.1)
i18n (1.14.5)
hashdiff (1.2.0)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
json (2.8.2)
language_server-protocol (3.17.0.3)
logger (1.6.2)
minitest (5.23.1)
mutex_m (0.2.0)
json (2.12.2)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
minitest (5.25.5)
net-http (0.6.0)
uri
net-ldap (0.19.0)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
optimist (3.1.0)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.5.0)
optimist (3.2.1)
ostruct (0.6.2)
parallel (1.27.0)
parser (3.3.8.0)
ast (~> 2.4.1)
racc
prism (1.1.0)
public_suffix (6.0.1)
prism (1.4.0)
public_suffix (6.0.2)
racc (1.8.1)
rack (3.0.14)
rack (3.1.16)
rainbow (3.1.1)
rake (13.2.1)
rbs (3.6.1)
rake (13.3.0)
rbs (3.9.4)
logger
regexp_parser (2.9.2)
regexp_parser (2.10.0)
retryable (3.0.5)
rexml (3.3.9)
rexml (3.4.1)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.66.1)
rspec-support (3.13.4)
rubocop (1.77.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-github (0.20.0)
rubocop (>= 1.37)
rubocop-performance (>= 1.15)
rubocop-rails (>= 2.17)
rubocop-performance (1.22.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.25.0)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.45.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-github (0.26.0)
rubocop (>= 1.76)
rubocop-performance (>= 1.24)
rubocop-rails (>= 2.23)
rubocop-performance (1.25.0)
lint_roller (~> 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rails (2.32.0)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0)
ruby-lsp (0.19.1)
language_server-protocol (~> 3.17.0)
prism (>= 1.1, < 2.0)
rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782)
ruby-progressbar (1.13.0)
rugged (1.7.2)
rugged (1.9.0)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
securerandom (0.4.1)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-erb (1.0.1)
simplecov (< 1.0)
simplecov-html (0.12.3)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
sorbet-runtime (0.5.11597)
sorbet-runtime (0.5.12203)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.3)
vcr (6.3.1)
base64
webmock (3.24.0)
webmock (3.25.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand All @@ -169,4 +180,4 @@ DEPENDENCIES
webmock (~> 3.23, >= 3.23.1)

BUNDLED WITH
2.5.9
2.6.9
2 changes: 1 addition & 1 deletion lib/entitlements/backend/github_team/provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def create_github_team_group(entitlement_group)
metadata = entitlement_group.metadata
metadata["team_id"] = -999
rescue Entitlements::Models::Group::NoMetadata
metadata = {"team_id" => -999}
metadata = { "team_id" => -999 }
end
Entitlements::Backend::GitHubTeam::Models::Team.new(
team_id: -999,
Expand Down
2 changes: 1 addition & 1 deletion lib/entitlements/service/github.rb
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def graphql_http_post(query)
return result
else
Entitlements.logger.warn "GraphQL failed on try #{try_number} of #{MAX_GRAPHQL_RETRIES}. Will retry."
sleep WAIT_BETWEEN_GRAPHQL_RETRIES * (2 ** (try_number - 1))
sleep WAIT_BETWEEN_GRAPHQL_RETRIES * (2**(try_number - 1))
end
end
end
Expand Down
4 changes: 3 additions & 1 deletion spec/acceptance/github-server/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def graphql_org_query(query)
result.each do |user, role|
end_cursor = Base64.strict_encode64(user)
next if !cursor_flag && end_cursor != cursor
edges << { "node" => { "login" => user }, "role" => role} if cursor_flag
edges << { "node" => { "login" => user }, "role" => role } if cursor_flag
cursor_flag = true
break if edges.size >= first
end
Expand Down Expand Up @@ -406,9 +406,11 @@ def graphql_pending_query(query)
end

[:get, :patch, :put, :delete, :post].each do |verb|
# rubocop:disable GitHub/AvoidObjectSendWithDynamicMethod
send verb, "/*" do
raise "No route registered for #{params}. Take a look in #{__FILE__}"
end
# rubocop:enable GitHub/AvoidObjectSendWithDynamicMethod
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/tests/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def ldap_obj
host: uri.host,
port: uri.port,
encryption: (uri.scheme == "ldaps" ? :simple_tls : nil),
auth: {method: :simple, username: ENV["LDAP_BINDDN"], password: ENV["LDAP_BINDPW"]}
auth: { method: :simple, username: ENV["LDAP_BINDDN"], password: ENV["LDAP_BINDPW"] }
)

ldap_object.bind
Expand Down
Loading
Loading