Merge pull request #52 from mkanoor/miq_ae_git_import

Don't unconditionally update verify_ssl
(cherry picked from commit 928f892b7e06f57082bb81557b292f0240d73101)

https://bugzilla.redhat.com/show_bug.cgi?id=1478554

lib/miq_automation_engine/models/miq_ae_git_import.rb

@@ -44,7 +44,7 @@ def repo_from_id
 
   def create_repo
     @git_repo = GitRepository.find_or_create_by(:url => @options['git_url'])
-    @git_repo.update_attributes(:verify_ssl => @options['verify_ssl'] || OpenSSL::SSL::VERIFY_PEER)
+    @git_repo.update_attributes(:verify_ssl => @options['verify_ssl']) if @options['verify_ssl']
     if @options['userid'] && @options['password']
       @git_repo.update_authentication(:default => @options.slice(*AUTH_KEYS).symbolize_keys)
     end

spec/lib/miq_automation_engine/models/miq_ae_git_import_spec.rb

@@ -5,12 +5,13 @@
     let(:tag_name) { "SomeTag1" }
     let(:domain_name) { "BB8" }
     let(:url) { "http://www.example.com/x/y" }
+    let(:verify_ssl_disabled) { 0 }
     let(:domain) do
       FactoryGirl.create(:miq_ae_git_domain,
                          :tenant => user.current_tenant,
                          :name   => domain_name)
     end
-    let(:repo) { FactoryGirl.create(:git_repository, :url => url) }
+    let(:repo) { FactoryGirl.create(:git_repository, :url => url, :verify_ssl => verify_ssl_disabled) }
     let(:user) { FactoryGirl.create(:user_with_group) }
     let(:branch_hash) do
       {'ref' => branch_name, 'ref_type' => MiqAeGitImport::BRANCH}
@@ -168,6 +169,14 @@
           expect(repo.authentications.first.userid).to eq('fred')
           expect(repo.authentications.first.password).to eq('secret')
         end
+
+        it "doesn't overwrite verify_ssl" do
+          expect(MiqAeYamlImportGitfs).to receive(:new).with(domain_name, import_options)
+            .and_return(miq_ae_yaml_import_gitfs)
+          allow(miq_ae_yaml_import_gitfs).to receive(:import).and_return(domain)
+          miq_ae_git_import.import
+          expect(repo.verify_ssl).to eq(verify_ssl_disabled)
+        end
       end
     end