Remove native WebDAV blobstore provider

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "src/github.com/cloudfoundry/blobstore_url_signer"]
-	path = src/github.com/cloudfoundry/blobstore_url_signer
-	url = https://github.com/cloudfoundry/blobstore_url_signer
 [submodule "src/cloud_controller_ng"]
 	path = src/cloud_controller_ng
 	url = https://github.com/cloudfoundry/cloud_controller_ng

README.md

@@ -11,7 +11,6 @@ This is the [bosh release](http://bosh.io/docs/release.html) for Cloud Foundry's
 * [Cloud Controller](https://github.com/cloudfoundry/cloud_controller_ng): The primary API of Cloud Foundry.
 * [Cloud Controller Clock](https://github.com/cloudfoundry/cloud_controller_ng): Triggers periodic jobs for the Cloud Controller.
 * [Cloud Controller Workers](https://github.com/cloudfoundry/cloud_controller_ng): Execute background jobs for the Cloud Controller.
-* [Webdav Blobstore](https://github.com/cloudfoundry/capi-release/tree/develop/jobs/blobstore): An optional stand-alone blobstore for the Cloud Controller. 
 * [NFS Mounter](https://github.com/cloudfoundry/capi-release/tree/develop/jobs/nfs_mounter): Connects Cloud Controller with an NFS blobstore.
 * [CC Uploader](https://github.com/cloudfoundry/cc-uploader): Uploads files from [Diego](https://github.com/cloudfoundry/diego-release) to the Cloud Controller.
 * [TPS Watcher](https://github.com/cloudfoundry/tps): Reports crash events from Diego to the Cloud Controller.

jobs/blobstore/monit

@@ -5,12 +5,6 @@ check process blobstore_nginx
   stop program "/var/vcap/jobs/bpm/bin/bpm stop blobstore -p nginx"
   group vcap
 
- check process blobstore_url_signer
-   with pidfile /var/vcap/sys/run/bpm/blobstore/url_signer.pid
-   start program "/var/vcap/jobs/bpm/bin/bpm start blobstore -p url_signer"
-   stop program "/var/vcap/jobs/bpm/bin/bpm stop blobstore -p url_signer"
-   group vcap
-
 <% else %>
 # This file intentionally left blank
 # Blobstore job is only run on the bootstrap instance

jobs/blobstore/spec

@@ -19,7 +19,6 @@ templates:
 
 packages:
 - nginx_webdav
-- blobstore_url_signer
 - capi_utils
 
 consumes:
@@ -60,6 +59,10 @@ properties:
     description: The TCP port on which the internal blobstore server listens
     default: 4443
 
+  blobstore.internal_hostname:
+    description: Internal hostname used by the singleton blobstore
+    default: "blobstore.service.cf.internal"
+
   blobstore.tls.cert:
     description: The PEM-encoded certificate (optionally as a certificate chain) for serving blobs over TLS/SSL
 

jobs/blobstore/templates/blobstore.conf.erb

@@ -56,14 +56,10 @@ server {
   return 404;
 }
 
-upstream blob_url_signer {
-  server unix:/var/vcap/data/blobstore/signer.sock;
-}
-
 # Internal server
 server {
   listen      <%= p('blobstore.tls.port') %> ssl;
-  server_name blobstore.service.cf.internal;
+  server_name <%= p('blobstore.internal_hostname', 'blobstore.service.cf.internal') %>;
   ssl_certificate     /var/vcap/jobs/blobstore/ssl/blobstore.crt;
   ssl_certificate_key /var/vcap/jobs/blobstore/ssl/blobstore.key;
 
@@ -94,13 +90,6 @@ server {
     alias /var/vcap/store/shared/;
   }
 
-  location /sign {
-    auth_basic "Blobstore Signing";
-    auth_basic_user_file write_users;
-
-    proxy_pass http://blob_url_signer;
-  }
-
 <%= signed_location %>
 
   # ensure the contents of this location block always match the public server /read/ location block

jobs/blobstore/templates/bpm.yml.erb

@@ -7,10 +7,3 @@ processes:
       writable: true
   ephemeral_disk: true
   persistent_disk: true
-- name: url_signer
-  executable: /var/vcap/packages/blobstore_url_signer/bin/blobstore_url_signer
-  ephemeral_disk: true
-  args:
-    - --secret=<%= p("blobstore.secure_link.secret") %>
-    - --network=unix
-    - --laddr=/var/vcap/data/blobstore/signer.sock

jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb

@@ -60,7 +60,7 @@
     section = cc_cfg[k]
     next unless section.is_a?(Hash)
 
-    %w[connection_config webdav_config].each do |hk|
+    %w[connection_config].each do |hk|
       section[hk] = {} if section.key?(hk) && section[hk].nil?
     end
 

jobs/cc_deployment_updater/spec

@@ -23,10 +23,6 @@ templates:
   mutual_tls.crt.erb: config/certs/mutual_tls.crt
   mutual_tls.key.erb: config/certs/mutual_tls.key
   credhub_ca.crt.erb: config/certs/credhub_ca.crt
-  packages_ca_cert.pem.erb: config/certs/packages_ca_cert.pem
-  resource_pool_ca_cert.pem.erb: config/certs/resource_pool_ca_cert.pem
-  droplets_ca_cert.pem.erb: config/certs/droplets_ca_cert.pem
-  buildpacks_ca_cert.pem.erb: config/certs/buildpacks_ca_cert.pem
   prom_scraper_config.yml.erb: config/prom_scraper_config.yml
   scrape.crt.erb: config/certs/scrape.crt
   scrape.key.erb: config/certs/scrape.key

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

@@ -200,15 +200,6 @@ storage_cli_optional_flags: <%= link("cloud_controller_internal").p("cc.storage_
 
 resource_pool:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.resource_pool.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= link("cloud_controller_internal").p("cc.resource_pool.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= link("cloud_controller_internal").p("cc.resource_pool.webdav_config.public_endpoint") %>
-    private_endpoint: <%= link("cloud_controller_internal").p("cc.resource_pool.webdav_config.private_endpoint") %>
-    username: <%= link("cloud_controller_internal").p("cc.resource_pool.webdav_config.username") %>
-    password: <%= yaml_escape(link("cloud_controller_internal").p("cc.resource_pool.webdav_config.password")) %>
-    <% if link("cloud_controller_internal").p("cc.resource_pool.webdav_config.ca_cert") != "" && link("cloud_controller_internal").p("cc.resource_pool.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/resource_pool_ca_cert.pem"
-    <% end %>
   minimum_size: <%= link("cloud_controller_internal").p("cc.resource_pool.minimum_size") %>
   maximum_size: <%= link("cloud_controller_internal").p("cc.resource_pool.maximum_size") %>
   resource_directory_key: <%= link("cloud_controller_internal").p("cc.resource_pool.resource_directory_key") %>
@@ -219,15 +210,6 @@ resource_pool:
 
 packages:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.packages.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= link("cloud_controller_internal").p("cc.packages.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= link("cloud_controller_internal").p("cc.packages.webdav_config.public_endpoint") %>
-    private_endpoint: <%= link("cloud_controller_internal").p("cc.packages.webdav_config.private_endpoint") %>
-    username: <%= link("cloud_controller_internal").p("cc.packages.webdav_config.username") %>
-    password: <%= yaml_escape(link("cloud_controller_internal").p("cc.packages.webdav_config.password")) %>
-    <% if link("cloud_controller_internal").p("cc.packages.webdav_config.ca_cert") != "" && link("cloud_controller_internal").p("cc.packages.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/packages_ca_cert.pem"
-    <% end %>
   app_package_directory_key: <%= link("cloud_controller_internal").p("cc.packages.app_package_directory_key") %>
   <% if (pk_provider = link("cloud_controller_internal").p("cc.packages.blobstore_provider", nil)) %>
   blobstore_provider: <%= pk_provider %>
@@ -238,15 +220,6 @@ packages:
 
 droplets:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.droplets.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= link("cloud_controller_internal").p("cc.droplets.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= link("cloud_controller_internal").p("cc.droplets.webdav_config.public_endpoint") %>
-    private_endpoint: <%= link("cloud_controller_internal").p("cc.droplets.webdav_config.private_endpoint") %>
-    username: <%= link("cloud_controller_internal").p("cc.droplets.webdav_config.username") %>
-    password: <%= yaml_escape(link("cloud_controller_internal").p("cc.droplets.webdav_config.password")) %>
-    <% if link("cloud_controller_internal").p("cc.droplets.webdav_config.ca_cert") != "" && link("cloud_controller_internal").p("cc.droplets.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/droplets_ca_cert.pem"
-    <% end %>
   droplet_directory_key: <%= link("cloud_controller_internal").p("cc.droplets.droplet_directory_key") %>
   <% if (dp_provider = link("cloud_controller_internal").p("cc.droplets.blobstore_provider", nil)) %>
   blobstore_provider: <%= dp_provider %>
@@ -255,15 +228,6 @@ droplets:
 
 buildpacks:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.buildpacks.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= link("cloud_controller_internal").p("cc.buildpacks.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= link("cloud_controller_internal").p("cc.buildpacks.webdav_config.public_endpoint") %>
-    private_endpoint: <%= link("cloud_controller_internal").p("cc.buildpacks.webdav_config.private_endpoint") %>
-    username: <%= link("cloud_controller_internal").p("cc.buildpacks.webdav_config.username") %>
-    password: <%= yaml_escape(link("cloud_controller_internal").p("cc.buildpacks.webdav_config.password")) %>
-    <% if link("cloud_controller_internal").p("cc.buildpacks.webdav_config.ca_cert") != "" && link("cloud_controller_internal").p("cc.buildpacks.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/buildpacks_ca_cert.pem"
-    <% end %>
   buildpack_directory_key: <%= link("cloud_controller_internal").p("cc.buildpacks.buildpack_directory_key") %>
   <% if (bp_provider = link("cloud_controller_internal").p("cc.buildpacks.blobstore_provider", nil)) %>
   blobstore_provider: <%= bp_provider %>

jobs/cloud_controller_clock/spec

@@ -210,26 +210,8 @@ properties:
   cc.resource_pool.connection_config:
       description: "Storage CLI connection configuration"
   cc.resource_pool.blobstore_type:
-    description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
+    description: "The type of blobstore backing to use. Valid values: ['storage-cli']"
     default: "storage-cli"
-  cc.resource_pool.webdav_config.blobstore_timeout:
-    description: "The timeout in seconds for requests to the blobstore"
-    default: 5
-  cc.resource_pool.webdav_config.public_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.com"
-    default: ""
-  cc.resource_pool.webdav_config.private_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.internal"
-    default: "https://blobstore.service.cf.internal:4443"
-  cc.resource_pool.webdav_config.username:
-    description: "The basic auth user that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.resource_pool.webdav_config.password:
-    description: "The basic auth password that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.resource_pool.webdav_config.ca_cert:
-    description: "The ca cert to use when communicating with webdav"
-    default: ""
   cc.resource_pool.minimum_size:
     description: "Minimum size of a resource to add to the pool"
     default: 65536
@@ -246,26 +228,8 @@ properties:
   cc.packages.connection_config:
     description: "Storage CLI connection configuration"
   cc.packages.blobstore_type:
-    description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
+    description: "The type of blobstore backing to use. Valid values: ['storage-cli']"
     default: "storage-cli"
-  cc.packages.webdav_config.blobstore_timeout:
-    description: "The timeout in seconds for requests to the blobstore"
-    default: 5
-  cc.packages.webdav_config.public_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.com"
-    default: ""
-  cc.packages.webdav_config.private_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.internal"
-    default: "https://blobstore.service.cf.internal:4443"
-  cc.packages.webdav_config.username:
-    description: "The basic auth user that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.packages.webdav_config.password:
-    description: "The basic auth password that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.packages.webdav_config.ca_cert:
-    description: "The ca cert to use when communicating with webdav"
-    default: ""
   cc.packages.app_package_directory_key:
     description: "Directory (bucket) used store app packages.  It does not have be pre-created."
     default: "cc-packages"
@@ -279,26 +243,8 @@ properties:
   cc.droplets.connection_config:
     description: "Storage CLI connection configuration"
   cc.droplets.blobstore_type:
-    description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
+    description: "The type of blobstore backing to use. Valid values: ['storage-cli']"
     default: "storage-cli"
-  cc.droplets.webdav_config.blobstore_timeout:
-    description: "The timeout in seconds for requests to the blobstore"
-    default: 5
-  cc.droplets.webdav_config.public_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.com"
-    default: ""
-  cc.droplets.webdav_config.private_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.internal"
-    default: "https://blobstore.service.cf.internal:4443"
-  cc.droplets.webdav_config.username:
-    description: "The basic auth user that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.droplets.webdav_config.password:
-    description: "The basic auth password that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.droplets.webdav_config.ca_cert:
-    description: "The ca cert to use when communicating with webdav"
-    default: ""
   cc.droplets.droplet_directory_key:
     description: "Directory (bucket) used store droplets.  It does not have be pre-created."
     default: "cc-droplets"
@@ -309,26 +255,8 @@ properties:
   cc.buildpacks.connection_config:
     description: "Storage CLI connection configuration"
   cc.buildpacks.blobstore_type:
-    description: "The type of blobstore backing to use. Valid values: ['webdav', 'storage-cli']"
+    description: "The type of blobstore backing to use. Valid values: ['storage-cli']"
     default: "storage-cli"
-  cc.buildpacks.webdav_config.blobstore_timeout:
-    description: "The timeout in seconds for requests to the blobstore"
-    default: 5
-  cc.buildpacks.webdav_config.public_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.com"
-    default: ""
-  cc.buildpacks.webdav_config.private_endpoint:
-    description: "The location of the webdav server eg: https://blobstore.internal"
-    default: "https://blobstore.service.cf.internal:4443"
-  cc.buildpacks.webdav_config.username:
-    description: "The basic auth user that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.buildpacks.webdav_config.password:
-    description: "The basic auth password that CC uses to connect to the admin endpoint on webdav"
-    default: ""
-  cc.buildpacks.webdav_config.ca_cert:
-    description: "The ca cert to use when communicating with webdav"
-    default: ""
   cc.buildpacks.buildpack_directory_key:
     description: "Directory (bucket) used store buildpacks.  It does not have be pre-created."
     default: "cc-buildpacks"

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

@@ -233,58 +233,22 @@ default_health_check_timeout: <%= p("cc.default_health_check_timeout") %>
 
 resource_pool:
   blobstore_type: <%= p("cc.resource_pool.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= p("cc.resource_pool.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= p("cc.resource_pool.webdav_config.public_endpoint") %>
-    private_endpoint: <%= p("cc.resource_pool.webdav_config.private_endpoint") %>
-    username: <%= p("cc.resource_pool.webdav_config.username") %>
-    password: <%= yaml_escape(p("cc.resource_pool.webdav_config.password")) %>
-    <% if p("cc.resource_pool.webdav_config.ca_cert") != "" && p("cc.resource_pool.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cloud_controller_clock/config/certs/resource_pool_ca_cert.pem"
-    <% end %>
   minimum_size: <%= p("cc.resource_pool.minimum_size") %>
   maximum_size: <%= p("cc.resource_pool.maximum_size") %>
   resource_directory_key: <%= p("cc.resource_pool.resource_directory_key") %>
 
 
 packages:
   blobstore_type: <%= p("cc.packages.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= p("cc.packages.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= p("cc.packages.webdav_config.public_endpoint") %>
-    private_endpoint: <%= p("cc.packages.webdav_config.private_endpoint") %>
-    username: <%= p("cc.packages.webdav_config.username") %>
-    password: <%= yaml_escape(p("cc.packages.webdav_config.password")) %>
-    <% if p("cc.packages.webdav_config.ca_cert") != "" && p("cc.packages.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cloud_controller_clock/config/certs/packages_ca_cert.pem"
-    <% end %>
   app_package_directory_key: <%= p("cc.packages.app_package_directory_key") %>
   max_package_size: <%= p("cc.packages.max_package_size") %>
 
 droplets:
   blobstore_type: <%= p("cc.droplets.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= p("cc.droplets.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= p("cc.droplets.webdav_config.public_endpoint") %>
-    private_endpoint: <%= p("cc.droplets.webdav_config.private_endpoint") %>
-    username: <%= p("cc.droplets.webdav_config.username") %>
-    password: <%= yaml_escape(p("cc.droplets.webdav_config.password")) %>
-    <% if p("cc.droplets.webdav_config.ca_cert") != "" && p("cc.droplets.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cloud_controller_clock/config/certs/droplets_ca_cert.pem"
-    <% end %>
   droplet_directory_key: <%= p("cc.droplets.droplet_directory_key") %>
 
 buildpacks:
   blobstore_type: <%= p("cc.buildpacks.blobstore_type") %>
-  webdav_config:
-    blobstore_timeout: <%= p("cc.buildpacks.webdav_config.blobstore_timeout") %>
-    public_endpoint: <%= p("cc.buildpacks.webdav_config.public_endpoint") %>
-    private_endpoint: <%= p("cc.buildpacks.webdav_config.private_endpoint") %>
-    username: <%= p("cc.buildpacks.webdav_config.username") %>
-    password: <%= yaml_escape(p("cc.buildpacks.webdav_config.password")) %>
-    <% if p("cc.buildpacks.webdav_config.ca_cert") != "" && p("cc.buildpacks.webdav_config.ca_cert") != nil %>
-    ca_cert_path: "/var/vcap/jobs/cloud_controller_clock/config/certs/buildpacks_ca_cert.pem"
-    <% end %>
   buildpack_directory_key: <%= p("cc.buildpacks.buildpack_directory_key") %>
 
 db_encryption_key: <%= p("cc.db_encryption_key") %>