Merge pull request #7586 from chef/openssl_updates

 Add openssl_x509_crl resource and fix default modes in x509_certificate / x509_request 

3 files changed, 71 insertions, 8 deletions

diff --git a/spec/unit/resource/openssl_openssl_x509_certificate_spec.rb b/spec/unit/resource/openssl_x509_certificate_spec.rb
index b8e49db164..795987f569 100644
--- a/spec/unit/resource/openssl_openssl_x509_certificate_spec.rb
+++ b/spec/unit/resource/openssl_x509_certificate_spec.rb
@@ -41,10 +41,6 @@ describe Chef::Resource::OpensslX509Certificate do
     expect(resource.expire).to eql(365)
   end
 
-  it "has a default mode of '0644'" do
-    expect(resource.mode).to eql("0644")
-  end
-
   it "has a default key_type of 'rsa'" do
     expect(resource.key_type).to eql("rsa")
   end
@@ -68,4 +64,9 @@ describe Chef::Resource::OpensslX509Certificate do
   it "only accepts valid key_curve values" do
     expect { resource.key_curve "fako" }.to raise_error(ArgumentError)
   end
+
+  it "mode accepts both String and Integer values" do
+    expect { resource.mode "644" }.not_to raise_error
+    expect { resource.mode 644 }.not_to raise_error
+  end
 end
diff --git a/spec/unit/resource/openssl_x509_crl_spec.rb b/spec/unit/resource/openssl_x509_crl_spec.rb
new file mode 100644
index 0000000000..4f852be0c2
--- /dev/null
+++ b/spec/unit/resource/openssl_x509_crl_spec.rb
@@ -0,0 +1,61 @@
+#
+# Copyright:: Copyright 2018, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::OpensslX509Crl do
+
+  let(:resource) { Chef::Resource::OpensslX509Crl.new("fakey_fakerton") }
+
+  it "has a resource name of :openssl_x509_crl" do
+    expect(resource.resource_name).to eql(:openssl_x509_crl)
+  end
+
+  it "the path property is the name_property" do
+    expect(resource.path).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :create" do
+    expect(resource.action).to eql([:create])
+  end
+
+  it "supports :create action" do
+    expect { resource.action :create }.not_to raise_error
+  end
+
+  it "has a default revocation_reason of 0" do
+    expect(resource.revocation_reason).to eql(0)
+  end
+
+  it "has a default expiration of 8" do
+    expect(resource.expire).to eql(8)
+  end
+
+  it "has a default renewal_threshold of 1" do
+    expect(resource.renewal_threshold).to eql(1)
+  end
+
+  it "serial_to_revoke accepts both String and Integer values" do
+    expect { resource.serial_to_revoke "123" }.not_to raise_error
+    expect { resource.serial_to_revoke 123 }.not_to raise_error
+  end
+
+  it "mode accepts both String and Integer values" do
+    expect { resource.mode "644" }.not_to raise_error
+    expect { resource.mode 644 }.not_to raise_error
+  end
+end
diff --git a/spec/unit/resource/openssl_openssl_x509_request.rb b/spec/unit/resource/openssl_x509_request.rb
index 59abdc666e..28ca4f7345 100644
--- a/spec/unit/resource/openssl_openssl_x509_request.rb
+++ b/spec/unit/resource/openssl_x509_request.rb
@@ -37,10 +37,6 @@ describe Chef::Resource::OpensslX509Request do
     expect { resource.action :create }.not_to raise_error
   end
 
-  it "has a default mode of '0644'" do
-    expect(resource.mode).to eql("0644")
-  end
-
   it "has a default key_type of 'ec'" do
     expect(resource.key_type).to eql("ec")
   end
@@ -64,4 +60,9 @@ describe Chef::Resource::OpensslX509Request do
   it "only accepts valid key_curve values" do
     expect { resource.key_curve "fako" }.to raise_error(ArgumentError)
   end
+
+  it "mode accepts both String and Integer values" do
+    expect { resource.mode "644" }.not_to raise_error
+    expect { resource.mode 644 }.not_to raise_error
+  end
 end