chef 16.4.35-universal-mingw32 → 16.4.38-universal-mingw32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/chef/resource/osx_profile.rb +3 -3
- data/lib/chef/version.rb +1 -1
- data/spec/unit/data_collector_spec.rb +6 -0
- data/spec/unit/resource/osx_profile_spec.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f5a1ff6498a5f9581a873db77ee290d2c4c2ab90979c8f690e37db745fe33265
|
|
4
|
+
data.tar.gz: 18f800622adc96e1a0aecf9156feb31688ab369e583f9e1e793db2864b476282
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4e873923869649205017ceeff860c071862d6ae4dcd209a551228dc98ddd53553397a09f618728fd146ebe5b4c7bd6a17f6388d255e9d995f66bc46f78d95964
|
|
7
|
+
data.tar.gz: 2e29fc4612a2ccfa5b131c80b318c26575543dbbace18f867081bcdc77e40df02ca4bde4125656f4efd04aa462d81f206a78df63cbe1c75a78a7d7c8c059377e
|
|
@@ -80,8 +80,8 @@ class Chef
|
|
|
80
80
|
end
|
|
81
81
|
|
|
82
82
|
def check_resource_semantics!
|
|
83
|
-
if mac? && node["platform_version"] =~ "
|
|
84
|
-
raise "The osx_profile resource is not available on macOS
|
|
83
|
+
if mac? && node["platform_version"] =~ ">= 11.0"
|
|
84
|
+
raise "The osx_profile resource is not available on macOS Big Sur or above due to Apple's removal of support for CLI profile installation"
|
|
85
85
|
end
|
|
86
86
|
|
|
87
87
|
if action == :remove
|
|
@@ -253,7 +253,7 @@ class Chef
|
|
|
253
253
|
|
|
254
254
|
def query_installed_profiles
|
|
255
255
|
Tempfile.open("allprofiles.plist") do |tempfile|
|
|
256
|
-
shell_out
|
|
256
|
+
shell_out( "/usr/bin/profiles", "-P", "-o", tempfile.path )
|
|
257
257
|
::Plist.parse_xml(tempfile)
|
|
258
258
|
end
|
|
259
259
|
end
|
data/lib/chef/version.rb
CHANGED
|
@@ -39,6 +39,12 @@ describe Chef::DataCollector do
|
|
|
39
39
|
let(:new_resource) do
|
|
40
40
|
new_resource = Chef::Resource::File.new("/tmp/a-file.txt")
|
|
41
41
|
new_resource.checksum nil
|
|
42
|
+
# This next line is a hack to work around the fact that the name property will not have been autovivified yet
|
|
43
|
+
# in these unit tests which breaks some assumptions. Really the Formatters::ErrorMapper.resource_failed and
|
|
44
|
+
# related APIs need to properly walk and get properties on the resource rather than walking through instance
|
|
45
|
+
# variables, but the ErrorMappers probably pre-date the conversion to properties. But this next line is necesary
|
|
46
|
+
# to populate the name_property instance variable (which will happen naturally during the course of running the
|
|
47
|
+
# provider, so I don't think this is a user-visibile bug).
|
|
42
48
|
new_resource.path
|
|
43
49
|
new_resource
|
|
44
50
|
end
|
|
@@ -155,7 +155,7 @@ describe Chef::Resource::OsxProfile do
|
|
|
155
155
|
resource.profile_name profile_name
|
|
156
156
|
allow(provider).to receive(:get_installed_profiles).and_call_original
|
|
157
157
|
allow(provider).to receive(:read_plist).and_return(all_profiles)
|
|
158
|
-
expect(provider).to receive(:shell_out_compacted
|
|
158
|
+
expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-P", "-o", kind_of(String))
|
|
159
159
|
provider.load_current_resource
|
|
160
160
|
end
|
|
161
161
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: chef
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 16.4.
|
|
4
|
+
version: 16.4.38
|
|
5
5
|
platform: universal-mingw32
|
|
6
6
|
authors:
|
|
7
7
|
- Adam Jacob
|
|
@@ -16,28 +16,28 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 16.4.
|
|
19
|
+
version: 16.4.38
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 16.4.
|
|
26
|
+
version: 16.4.38
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: chef-utils
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - '='
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 16.4.
|
|
33
|
+
version: 16.4.38
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - '='
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 16.4.
|
|
40
|
+
version: 16.4.38
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: train-core
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|