dpl-cloud_foundry 1.10.2.travis.2987.6 → 1.10.2.travis.2992.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c602eca2ea4af5223c31763e4b1742a53ddaabe9924fbb5147235565ed1f41
-  data.tar.gz: 4705cce332eeee9006c26ded53f1c3081a9a98e20ab9ec6c20eb33cc38bc33c6
+  metadata.gz: 06f0e0c763132b4800abb6984c32f7704212e2df2a3bc18d30310a9a6e9f0d58
+  data.tar.gz: 7ec0d3b8a3fdef110f0466409896cb9a9765fff2638fc436d6a7b780f96d4af0
 SHA512:
-  metadata.gz: d0295cec0a3a942de1e3b0f80de879f3451960c2f817353860561c4067c86e43ffcf964bce9611aaa96e203a099d2a9e495f1d4c375b1f9203e041d8d9566da8
-  data.tar.gz: 122e69db0ae71ca034e52bc6db05c13400dd7e20b28af80410cf978576d0f9ecf58f9b79b0a470103369f0bd5aa4b7cde3afb24f1a51340e395cdf226f0a7f0a
+  metadata.gz: 29858dd0e1277cb899882cdc333b504ae8eebe05f7c01073ca2df958f579b907a0f3cdadc5b624ec24e6fb6d72b4cc9d7086e0e33dc3897288d4153f171afff5
+  data.tar.gz: 2ac60684353d3c565f004f9008926a4cc0f560659ac86a2f22d328407f2cef4e2287779e688bb99d22dcaee90225e9b05193d1b276bf51822db5aef1005c6f2d

data/lib/dpl/provider/cloud_foundry.rb

@@ -9,7 +9,7 @@ module DPL
       def check_auth
         initial_go_tools_install
         context.shell "./cf api #{option(:api)} #{'--skip-ssl-validation' if options[:skip_ssl_validation]}"
-        context.shell "./cf login -u #{option(:username)} -p #{option(:password)} -o #{option(:organization)} -s #{option(:space)}"
+        options[:client_id] ? check_client_auth : check_basic_auth
       end
 
       def check_app
@@ -38,6 +38,17 @@ module DPL
       def manifest
         options[:manifest].nil? ? "" : " -f #{options[:manifest]}"
       end
+
+      private
+
+      def check_basic_auth
+        context.shell "./cf login -u #{option(:username)} -p #{option(:password)} -o '#{option(:organization)}' -s '#{option(:space)}'"
+      end
+
+      def check_client_auth
+        context.shell "./cf auth #{option(:client_id)} #{option(:client_secret)} --client-credentials"
+        context.shell "./cf target -o '#{option(:organization)}' -s '#{option(:space)}'"
+      end
     end
   end
 end

data/spec/provider/cloud_foundry_spec.rb

@@ -11,12 +11,34 @@ describe DPL::Provider::CloudFoundry do
                         skip_ssl_validation: true)
   end
 
+
   describe "#check_auth" do
-    example do
-      expect(provider.context).to receive(:shell).with('test x$TRAVIS_OS_NAME = "xlinux" && rel="linux64-binary" || rel="macosx64"; wget "https://cli.run.pivotal.io/stable?release=${rel}&source=github" -qO cf.tgz && tar -zxvf cf.tgz && rm cf.tgz')
-      expect(provider.context).to receive(:shell).with('./cf api api.run.awesome.io --skip-ssl-validation')
-      expect(provider.context).to receive(:shell).with('./cf login -u mallomar -p myreallyawesomepassword -o myorg -s outer')
-      provider.check_auth
+    context 'when basic credentials are provided' do
+      example do
+        expect(provider.context).to receive(:shell).with('test x$TRAVIS_OS_NAME = "xlinux" && rel="linux64-binary" || rel="macosx64"; wget "https://cli.run.pivotal.io/stable?release=${rel}&source=github" -qO cf.tgz && tar -zxvf cf.tgz && rm cf.tgz')
+        expect(provider.context).to receive(:shell).with('./cf api api.run.awesome.io --skip-ssl-validation')
+        expect(provider.context).to receive(:shell).with('./cf login -u mallomar -p myreallyawesomepassword -o \'myorg\' -s \'outer\'')
+        provider.check_auth
+      end
+    end
+
+    context 'when client credentials are provided' do
+      subject :provider do
+        described_class.new(DummyContext.new, api: 'api.run.awesome.io', client_id: 'craw',
+                            client_secret: 'myreallyawesomesecret',
+                            organization: 'myorg',
+                            space: 'outer',
+                            manifest: 'worker-manifest.yml',
+                            skip_ssl_validation: true)
+      end
+
+      example do
+        expect(provider.context).to receive(:shell).with('test x$TRAVIS_OS_NAME = "xlinux" && rel="linux64-binary" || rel="macosx64"; wget "https://cli.run.pivotal.io/stable?release=${rel}&source=github" -qO cf.tgz && tar -zxvf cf.tgz && rm cf.tgz')
+        expect(provider.context).to receive(:shell).with('./cf api api.run.awesome.io --skip-ssl-validation')
+        expect(provider.context).to receive(:shell).with('./cf auth craw myreallyawesomesecret --client-credentials')
+        expect(provider.context).to receive(:shell).with('./cf target -o \'myorg\' -s \'outer\'')
+        provider.check_auth
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl-cloud_foundry
 version: !ruby/object:Gem::Version
-  version: 1.10.2.travis.2987.6
+  version: 1.10.2.travis.2992.6
 platform: ruby
 authors:
 - Konstantin Haase
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2.travis.2987.6
+        version: 1.10.2.travis.2992.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2.travis.2987.6
+        version: 1.10.2.travis.2992.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement