chef-zero 15.0.3 → 15.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c8864d1d61055163c2ec8a520cd353a83f51a26f436b8e94c643af34b19b03a
-  data.tar.gz: e4534535132a965e524591758abd89c4341b1caf39b20e10e744ae4281ed7018
+  metadata.gz: 726ae260c0156949d88bb48d7ac3846b50545f4275847c76efd1f31cff5c2d78
+  data.tar.gz: 8f7c4d509919162ab492d4b117f85f4303f38922942ab6eeafc27d4fa1913810
 SHA512:
-  metadata.gz: a5e04a3c6d2f6e6dc829724ba02d9cb9e56de22b349ba805efc65aa8bc2c1939f181bf538081452cf9d87ad6c5e923a314d9629cc9b5bca334cb3399a9d3c242
-  data.tar.gz: 8ee240ea4eae4ac4b0333ba6632bd9eafca73e2ffcc02dee78ce498271f8891c8f5d729fdf58c16fa56b1471893c9fc0ddcb18666a57afd773226c8e6c26b641
+  metadata.gz: b9bdf42f23dd2fb336f281fa3b148d6f1566488bcba8a171757519bfc63f74b4d371caae4c3eb2aca2fabec5032d2f4c4c5ad92ee22f7b35ac68a8fc15bb5c28
+  data.tar.gz: 7b6dc1ed42a4d873b6c5ac64030c69688cb8213a28da48efc02792ba9786b2728cc1bdaf297b905b70f917e0ff580ac97432bb0db4baca204839ca64262d1ccf

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 # gem 'rest-client', :git => 'https://github.com/chef/rest-client.git'
 
 group :pedant do
-  gem "oc-chef-pedant", git: "https://github.com/chef/chef-server.git"
+  gem "oc-chef-pedant", git: "https://github.com/chef/chef-server.git", branch: "main"
 end
 
 group :development, :test do

data/LICENSE

@@ -192,7 +192,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

data/chef-zero.gemspec

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/lib")
+$:.unshift(__dir__ + "/lib")
 require "chef_zero/version"
 
 Gem::Specification.new do |s|
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "rack", "~> 2.0", ">= 2.0.6"
+  s.add_dependency "webrick"
 
   s.bindir       = "bin"
   s.executables  = ["chef-zero"]

data/lib/chef_zero/data_store/data_already_exists_error.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/data_store/data_error.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/data_store/data_not_found_error.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/data_store/memory_store.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/data_store/memory_store_v2.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/data_store/raw_file_store.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/endpoints/license_endpoint.rb

@@ -17,7 +17,7 @@ module ChefZero
           "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
           "node_license" => MAX_NODE_COUNT,
           "node_count" => node_count,
-          "upgrade_url" => "http://blah.com",
+          "upgrade_url" => "https://blah.com",
         })
       end
     end

data/lib/chef_zero/endpoints/policy_revision_endpoint.rb

@@ -7,7 +7,50 @@ module ChefZero
       # GET /organizations/ORG/policies/NAME/revisions/REVISION
       def get(request)
         data = parse_json(get_data(request))
-        data = ChefData::DataNormalizer.normalize_policy(data, request.rest_path[3], request.rest_path[5])
+        
+        # need to add another field in the response called 'policy_group_list'
+        # example response
+        #     {
+        #       "revision_id": "909c26701e291510eacdc6c06d626b9fa5350d25",
+        #       "name": "some_policy_name",
+        #       "run_list": [
+        #         "recipe[policyfile_demo::default]"
+        #       ],
+        #       "cookbook_locks": {
+        #         "policyfile_demo": {
+        #           "identifier": "f04cc40faf628253fe7d9566d66a1733fb1afbe9",
+        #           "version": "1.2.3"
+        #         }
+        #       },
+        #       "policy_group_list": ["some_policy_group"]
+        #     }
+        data[:policy_group_list] = Array.new
+
+        # extracting policy name and revision
+        request_policy_name = request.rest_path[3]
+        request_policy_revision = request.rest_path[5]
+
+        # updating the request to fetch the policy group list
+        request.rest_path[2] = "policy_groups"
+        request.rest_path = request.rest_path.slice(0,3)
+
+        list_data(request).each do |group_name|
+          group_path = request.rest_path + [group_name]
+
+          # fetching all the policies associated with each group
+          policy_list = list_data(request, group_path + ["policies"])
+          policy_list.each do |policy_name|
+            revision_id = parse_json(get_data(request, group_path + ["policies", policy_name]))
+
+            # if the name and revision matchs, we add the group to the response
+            if (policy_name == request_policy_name) && (revision_id == request_policy_revision)
+              policy_group_list = data[:policy_group_list]
+              data[:policy_group_list] = [group_name] + policy_group_list
+            end
+          end
+        end
+        
+        data = ChefData::DataNormalizer.normalize_policy(data, request_policy_name, request_policy_revision)
         json_response(200, data)
       end
 

data/lib/chef_zero/rest_base.rb

@@ -68,7 +68,7 @@ module ChefZero
 
     def accepts?(request, category, type)
       # If HTTP_ACCEPT is not sent at all, assume it accepts anything
-      # This parses as per http://tools.ietf.org/html/rfc7231#section-5.3
+      # This parses as per https://datatracker.ietf.org/doc/html/rfc7231#section-5.3
       return true unless request.env["HTTP_ACCEPT"]
 
       accepts = request.env["HTTP_ACCEPT"].split(/,\s*/).map { |x| x.split(";", 2)[0].strip }

data/lib/chef_zero/server.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/socketless_server_map.rb

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "15.0.3".freeze
+  VERSION = "15.0.11".freeze
 end

data/spec/run_oc_pedant.rb

@@ -188,6 +188,11 @@ begin
     # tests from chef-server as the user acls are not supported in chef-zero
     # at this time.
     "--skip-chef-zero-quirks",
+
+    "--skip-status",
+    "--skip=email_case_insensitive",
+    "--skip=nginx_default_error",
+    "--skip=response_headers"
   ]
 
   # The knife tests are very slow and don't give us a lot of extra coverage,

data/spec/support/oc_pedant.rb

@@ -5,7 +5,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 15.0.3
+  version: 15.0.11
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -98,6 +98,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.6
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 email: oss@chef.io
@@ -245,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing