Chefstyle fixes

Signed-off-by: Ashique Saidalavi <Ashique.saidalavi@progress.com>

Author: ashiqueps

lib/chef/knife/ec2_server_create.rb

@@ -495,13 +495,11 @@ def default_bootstrap_template
       end
 
       def validation_key_path
-        @validation_key_path ||= begin
-          if URI(config[:validation_key_url]).scheme == "file"
-            URI(config[:validation_key_url]).path
-          else
-            validation_key_tmpfile.path
-          end
-        end
+        @validation_key_path ||= if URI(config[:validation_key_url]).scheme == "file"
+                                   URI(config[:validation_key_url]).path
+                                 else
+                                   validation_key_tmpfile.path
+                                 end
       end
 
       # @return [Tempfile]
@@ -521,9 +519,7 @@ def download_validation_key(tempfile)
       end
 
       def s3_validation_key
-        @s3_validation_key ||= begin
-          Chef::Knife::S3Source.fetch(config[:validation_key_url], config)
-        end
+        @s3_validation_key ||= Chef::Knife::S3Source.fetch(config[:validation_key_url], config)
       end
 
       def s3_secret
@@ -759,8 +755,8 @@ def ssl_config_user_data
         user = connection_user.split("\\")
         if (user[0] == ".") || (user[0] == "") || (user.length == 1)
           user_related_commands = <<~EOH
-            net user /add #{connection_user.delete('.\\')} #{windows_password} #{@allow_long_password};
-            net localgroup Administrators /add #{connection_user.delete('.\\')};
+            net user /add #{connection_user.delete(".\\")} #{windows_password} #{@allow_long_password};
+            net localgroup Administrators /add #{connection_user.delete(".\\")};
           EOH
         end
         <<~EOH
@@ -1141,15 +1137,13 @@ def connection_host
       # Otherwise assign public DNS or public IP.
       # @return [String]
       def connect_attribute
-        @connect_attribute ||= begin
-          if !!config[:server_connect_attribute]
-            config[:server_connect_attribute]
-          elsif vpc_mode? && !(subnet_public_ip_on_launch? || config[:associate_public_ip] || config[:associate_eip])
-            "private_ip_address"
-          else
-            server.public_dns_name ? "public_dns_name" : "public_ip_address"
-          end
-        end
+        @connect_attribute ||= if !!config[:server_connect_attribute]
+                                 config[:server_connect_attribute]
+                               elsif vpc_mode? && !(subnet_public_ip_on_launch? || config[:associate_public_ip] || config[:associate_eip])
+                                 "private_ip_address"
+                               else
+                                 server.public_dns_name ? "public_dns_name" : "public_ip_address"
+                               end
       end
 
       def create_tags(hashed_tags)

lib/chef/knife/helpers/ec2_base.rb

@@ -234,13 +234,11 @@ def validate_aws_config!(keys = %i{aws_access_key_id aws_secret_access_key})
     # if default location exists on disk fallback to that
     # @return [String, nil] location to aws credentials file or nil if none exists
     def aws_cred_file_location
-      @cred_file ||= begin
-        if !config[:aws_credential_file].nil?
-          config[:aws_credential_file]
-        else
-          Chef::Util::PathHelper.home(".aws", "credentials") if ::File.exist?(Chef::Util::PathHelper.home(".aws", "credentials"))
-        end
-      end
+      @cred_file ||= if !config[:aws_credential_file].nil?
+                       config[:aws_credential_file]
+                     else
+                       Chef::Util::PathHelper.home(".aws", "credentials") if ::File.exist?(Chef::Util::PathHelper.home(".aws", "credentials"))
+                     end
     end
 
     # @return [String]

spec/spec_helper.rb

@@ -24,10 +24,10 @@ def self.from(system_exit)
   end
 
   c.around(:example) do |ex|
-    begin
-      ex.run
-    rescue SystemExit => e
-      raise UnexpectedSystemExit.from(e)
-    end
+
+    ex.run
+  rescue SystemExit => e
+    raise UnexpectedSystemExit.from(e)
+
   end
 end

spec/unit/s3_source_deps_spec.rb

@@ -5,31 +5,31 @@
 
 describe "Check Dependencies", exclude: Object.constants.include?(:Aws) do
   it "should not load Aws::S3::Client by default" do
-    begin
-      Aws::S3::Client.new
-    rescue Exception => e
-      expect(e).to be_a_kind_of(NameError)
-    end
+
+    Aws::S3::Client.new
+  rescue Exception => e
+    expect(e).to be_a_kind_of(NameError)
+
   end
 
   it "lazy loads Aws::S3::Client without required config" do
-    begin
-      knife_config = {}
-      Chef::Knife::S3Source.fetch("test", knife_config)
-    rescue Exception => e
-      expect(e).to be_a_kind_of(ArgumentError)
-    end
+
+    knife_config = {}
+    Chef::Knife::S3Source.fetch("test", knife_config)
+  rescue Exception => e
+    expect(e).to be_a_kind_of(ArgumentError)
+
   end
 
   it "lazy loads Aws::S3::Client with required config" do
-    begin
-      knife_config = {}
-      knife_config[:aws_access_key_id] = "aws_access_key_id"
-      knife_config[:aws_secret_access_key] = "aws_secret_access_key"
-      knife_config[:region] = "test-region"
-      Chef::Knife::S3Source.fetch("/test/testfile", knife_config)
-    rescue Exception => e
-      expect(e).to be_a_kind_of(Aws::Errors::NoSuchEndpointError)
-    end
+
+    knife_config = {}
+    knife_config[:aws_access_key_id] = "aws_access_key_id"
+    knife_config[:aws_secret_access_key] = "aws_secret_access_key"
+    knife_config[:region] = "test-region"
+    Chef::Knife::S3Source.fetch("/test/testfile", knife_config)
+  rescue Exception => e
+    expect(e).to be_a_kind_of(Aws::Errors::NoSuchEndpointError)
+
   end
 end