Merge branch 'master' into dependabot/npm_and_yarn/docs/v3/glob-7.1.6

Author: selzoc

.editorconfig

@@ -0,0 +1,8 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*.rb]
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/unit_tests.yml

@@ -41,4 +41,18 @@ jobs:
         service mysql restart
     - name: Run tests
       run: DB=mysql bundle exec rake spec:all
+  test_docs:
+    runs-on: ubuntu-latest
+    container:
+      image: "cloudfoundry/capi:rc-docs"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          bundle install
+          cd docs/v3
+          bundle install
+          cd -
+      - name: Run docs tests
+        run: bundle exec rake check_doc_links
 

.gitignore

@@ -12,6 +12,7 @@ spec/examples.txt
 ci-artifacts-dir
 ci-working-dir
 coverage
+db/schema.rb
 doc
 *.rbc
 *.swp

Gemfile

@@ -39,7 +39,7 @@ gem 'steno'
 gem 'talentbox-delayed_job_sequel', '~> 4.3.0'
 gem 'thin'
 gem 'unf'
-gem 'vmstat', '~> 2.0'
+gem 'vmstat', '~> 2.3'
 gem 'yajl-ruby'
 
 # Rails Components
@@ -49,7 +49,7 @@ gem 'activemodel', '~> 5.2.4', '>= 5.2.4.3'
 gem 'railties', '~> 5.2.4', '>= 5.2.4.3'
 
 # Blobstore and Bits Service Dependencies
-gem 'azure-storage', '0.14.0.preview' # https://github.com/Azure/azure-storage-ruby/issues/122
+gem 'azure-storage', '0.15.0.preview' # https://github.com/Azure/azure-storage-ruby/issues/122
 gem 'bits_service_client', '~> 3.3', '>= 3.3.0'
 gem 'fog-aliyun'
 gem 'fog-aws'

Gemfile.lock

@@ -65,11 +65,11 @@ GEM
       i18n
     ast (2.4.1)
     awesome_print (1.8.0)
-    azure-core (0.1.14)
+    azure-core (0.1.15)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6)
-    azure-storage (0.14.0.preview)
+    azure-storage (0.15.0.preview)
       azure-core (~> 0.1)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
@@ -135,7 +135,7 @@ GEM
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
-    em-http-request (1.1.5)
+    em-http-request (1.1.6)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -146,12 +146,12 @@ GEM
     erubi (1.9.0)
     eventmachine (1.0.9.1)
     excon (0.71.0)
-    faraday (0.15.4)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.25)
     ffi-compiler (1.0.1)
@@ -289,16 +289,16 @@ GEM
     mustache (1.1.1)
     mustermann (1.0.3)
     mysql2 (0.5.2)
-    net-ssh (5.0.2)
+    net-ssh (6.1.0)
     netaddr (2.0.4)
     netrc (0.11.0)
-    newrelic_rpm (5.3.0.346)
+    newrelic_rpm (6.11.0.365)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     os (1.0.1)
     palm_civet (1.1.0)
     parallel (1.19.1)
-    parallel_tests (2.27.1)
+    parallel_tests (3.0.0)
       parallel
     parser (2.7.1.3)
       ast (~> 2.4.0)
@@ -357,7 +357,7 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-collection_matchers (1.1.3)
+    rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
@@ -394,7 +394,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-debug-ide (0.7.0.beta4)
+    ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     ruby-mysql (2.9.14)
     ruby-progressbar (1.10.1)
@@ -472,7 +472,7 @@ GEM
     unicode-display_width (1.6.1)
     vhd (0.0.4)
       bit-struct
-    vmstat (2.3.0)
+    vmstat (2.3.1)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -495,7 +495,7 @@ DEPENDENCIES
   addressable
   allowy (>= 2.1.0)
   awesome_print
-  azure-storage (= 0.14.0.preview)
+  azure-storage (= 0.15.0.preview)
   bits_service_client (~> 3.3, >= 3.3.0)
   byebug
   cf-copilot (= 0.0.14)
@@ -571,7 +571,7 @@ DEPENDENCIES
   timecop
   unf
   vcap-concurrency!
-  vmstat (~> 2.0)
+  vmstat (~> 2.3)
   webmock (> 2.3.1)
   yajl-ruby
 

app/actions/space_diff_manifest.rb

@@ -0,0 +1,48 @@
+require 'presenters/v3/app_manifest_presenter'
+require 'json-diff'
+
+module VCAP::CloudController
+  class SpaceDiffManifest
+    def self.generate_diff(app_manifests, space)
+      json_diff = []
+
+      app_manifests.each_with_index do |manifest_app_hash, index|
+        existing_app = space.app_models.find { |app| app.name == manifest_app_hash['name'] }
+
+        if existing_app.nil?
+          existing_app_hash = {}
+        else
+          manifest_presenter = Presenters::V3::AppManifestPresenter.new(
+            existing_app,
+            existing_app.service_bindings,
+            existing_app.routes,
+          )
+          existing_app_hash = manifest_presenter.to_hash.deep_stringify_keys['applications'][0]
+          web_process_hash = existing_app_hash['processes'].find { |p| p['type'] == 'web' }
+          existing_app_hash = existing_app_hash.merge(web_process_hash) if web_process_hash
+        end
+
+        manifest_app_hash.each do |key, value|
+          existing_value = existing_app_hash[key]
+
+          key_diffs = JsonDiff.diff(
+            existing_value,
+            value,
+            include_was: true,
+          )
+          key_diffs.each do |diff|
+            diff['path'] = "/applications/#{index}/#{key}" + diff['path']
+
+            if diff['op'] == 'replace' && diff['was'].nil?
+              diff['op'] = 'add'
+            end
+
+            json_diff << diff
+          end
+        end
+      end
+
+      json_diff
+    end
+  end
+end

app/actions/v3/service_instance_delete.rb

@@ -17,12 +17,12 @@ def delete(service_instance)
         cannot_delete_shared_instances! if service_instance.shared?
 
         lock = DeleterLock.new(service_instance)
-        lock.lock!
 
         job = case service_instance
               when ManagedServiceInstance
                 asynchronous_destroy(service_instance)
               when UserProvidedServiceInstance
+                lock.lock!
                 synchronous_destroy(service_instance, lock)
               end
 

app/controllers/runtime/helpers/blob_dispatcher.rb

@@ -6,11 +6,17 @@ def initialize(blobstore:, controller:)
     end
 
     def send_or_redirect(guid:)
-      raise CloudController::Errors::BlobNotFound unless guid
+      unless guid
+        logger.error('No guid for BlobNotFound')
+        raise CloudController::Errors::BlobNotFound
+      end
 
       blob = @blobstore.blob(guid)
 
-      raise CloudController::Errors::BlobNotFound unless blob
+      unless blob
+        logger.error('No blob object for BlobNotFound')
+        raise CloudController::Errors::BlobNotFound
+      end
 
       send_or_redirect_blob(blob)
     end

app/controllers/v3/droplets_controller.rb

@@ -161,6 +161,10 @@ def download
   private
 
   def send_droplet_blob(droplet)
+    if droplet.blobstore_key.nil?
+      resource_not_found_with_message!('Blobstore key not present on droplet. This may be due to a failed build.')
+    end
+
     droplet_blobstore = CloudController::DependencyLocator.instance.droplet_blobstore
     BlobDispatcher.new(blobstore: droplet_blobstore, controller: self).send_or_redirect(guid: droplet.blobstore_key)
   rescue CloudController::Errors::BlobNotFound

app/controllers/v3/service_credential_bindings_controller.rb

@@ -0,0 +1,49 @@
+require 'fetchers/service_credential_binding_fetcher'
+
+class ServiceCredentialBindingsController < ApplicationController
+  before_action :ensure_service_credential_binding_exists!
+  before_action :ensure_user_has_access!
+
+  def show
+    render status: :ok, json: serialized
+  end
+
+  private
+
+  def serialized
+    {
+      guid: service_credential_binding.guid,
+      type: service_credential_binding.type
+    }
+  end
+
+  def ensure_service_credential_binding_exists!
+    not_found! unless service_credential_binding_exists?
+  end
+
+  def ensure_user_has_access!
+    not_found! unless allowed_to_access_space?
+  end
+
+  def not_found!
+    resource_not_found!(:service_credential_binding)
+  end
+
+  def service_credential_binding
+    @service_credential_binding ||= fetcher.fetch(hashed_params[:guid])
+  end
+
+  def fetcher
+    @fetcher ||= VCAP::CloudController::ServiceCredentialBindingFetcher.new
+  end
+
+  def service_credential_binding_exists?
+    !!service_credential_binding
+  end
+
+  def allowed_to_access_space?
+    space = service_credential_binding.space
+
+    permission_queryer.can_read_from_space?(space.guid, space.organization_guid)
+  end
+end