Skip to content

Commit 5f2fd0c

Browse files
committed
add back ruby platform in gemfile.lock
Remove chef gem form Gemfile, update comments, fix spec Signed-off-by: neha-p6 <[email protected]>
1 parent 12cd90e commit 5f2fd0c

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

oc-chef-pedant/Gemfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ gem "pry-stack_explorer"
88
gem "rake"
99
gem "rest-client", git: "https://github.com/chef/rest-client.git", branch: "jfm/ucrt_update1"
1010

11-
# We require chef internally to get the version in
12-
# lib/pedant/request.rb. It's really strange code and it should be
13-
# revisited.
14-
# gem "chef", "18.8.46" - commmenting this out to get past loading that enormous gem to only get a version number.
15-
1611
# For "rake chef_zero_spec"
1712
# PR #352 merged to main but not released yet - use main branch
1813
gem 'chef-zero', git: "https://github.com/chef/chef-zero.git", branch: "main"

oc-chef-pedant/Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ GEM
6060
diff-lcs (1.6.2)
6161
domain_name (0.6.20240107)
6262
erubis (2.7.0)
63+
ffi (1.17.2)
6364
ffi (1.17.2-arm64-darwin)
6465
ffi (1.17.2-x64-mingw-ucrt)
6566
ffi-win32-extensions (1.0.4)
@@ -131,6 +132,7 @@ GEM
131132
wmi-lite (1.0.7)
132133

133134
PLATFORMS
135+
ruby
134136
arm64-darwin-23
135137
x64-mingw-ucrt
136138

oc-chef-pedant/lib/pedant/request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def server_api_version
3535
$server_api_version
3636
end
3737

38-
KNIFE_VERSION = "18.8.46" # Hardcoded for now since we removed chef from the Gemfile. Why on earth would we need the entire chef gem just to get a version number?
38+
KNIFE_VERSION = "18.8.46" # This version should be updated manually to point to valid chef release. We've removed chef gem from the Gemfile. Why on earth would we need the entire chef gem just to get a version number?
3939
# FYI, this must be a valid, shipping version of Chef, or the server will reject requests.
4040

4141
# Headers that are added to all requests

oc-chef-pedant/spec/org_creation/validate_acls_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def self.should_have_default_acls_for(endpoint, *tags, &additional_examples)
135135
end
136136

137137
context "[default clients]" do
138-
should_have_default_acls_for "/clients/#{Pedant::Config.pedant_platform.test_org.name}-validator" do
138+
should_have_default_acls_for "/clients/#{validator_name}" do
139139
let(:create_groups) { admin_groups }
140140
let(:read_groups) { user_groups }
141141
let(:update_groups) { admin_groups }

0 commit comments

Comments
 (0)