rails_template_18f 0.1.0 → 0.2.0

data/lib/rails_template18f/generators/base.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RailsTemplate18f
+  module Generators
+    module Base
+      extend ActiveSupport::Concern
+      include ::Rails::Generators::AppName
+
+      included do
+        self.source_path = RailsTemplate18f::Generators.const_source_location(name).first
+      end
+
+      class_methods do
+        attr_accessor :source_path
+
+        def source_root
+          @source_root ||= File.expand_path("templates", File.dirname(source_path))
+        end
+      end
+
+      private
+
+      def file_content(filename)
+        File.read(File.expand_path(filename, destination_root))
+      end
+
+      def ruby_version
+        RUBY_VERSION
+      end
+
+      def skip_git?
+        !Dir.exist?(File.expand_path(".git", destination_root))
+      end
+    end
+  end
+end

data/lib/rails_template18f/generators/cloud_gov_options.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module RailsTemplate18f
+  module Generators
+    module CloudGovOptions
+      extend ActiveSupport::Concern
+
+      included do
+        class_option :cg_org, desc: "cloud.gov organization name"
+        class_option :cg_staging, desc: "cloud.gov space name for staging"
+        class_option :cg_prod, desc: "cloud.gov space name for production"
+      end
+
+      private
+
+      def cloud_gov_organization
+        if options[:cg_org].present?
+          return options[:cg_org]
+        elsif terraform_dir_exists?
+          staging_main = file_content("terraform/staging/main.tf")
+          if (matches = staging_main.match(/cf_org_name\s+= "(?<org_name>.*)"/))
+            return matches[:org_name]
+          end
+        end
+        "TKTK-cloud.gov-org-name"
+      end
+
+      def cloud_gov_staging_space
+        if options[:cg_staging].present?
+          return options[:cg_staging]
+        elsif terraform_dir_exists?
+          staging_main = file_content("terraform/staging/main.tf")
+          if (matches = staging_main.match(/cf_space_name\s+= "(?<space_name>.*)"/))
+            return matches[:space_name]
+          end
+        end
+        "staging"
+      end
+
+      def cloud_gov_production_space
+        if options[:cg_prod].present?
+          return options[:cg_prod]
+        elsif terraform_dir_exists?
+          prod_main = file_content("terraform/production/main.tf")
+          if (matches = prod_main.match(/cf_space_name\s+= "(?<space_name>.*)"/))
+            return matches[:space_name]
+          end
+        end
+        "prod"
+      end
+
+      def terraform_dir_exists?
+        Dir.exist? File.expand_path("terraform", destination_root)
+      end
+    end
+  end
+end

data/lib/rails_template18f/generators/pipeline_options.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RailsTemplate18f
+  module Generators
+    module PipelineOptions
+      extend ActiveSupport::Concern
+      include CloudGovOptions
+
+      included do
+        class_option :terraform, type: :boolean, desc: "Generate actions for planning and applying terraform"
+      end
+
+      def terraform?
+        options[:terraform].nil? ? terraform_dir_exists? : options[:terraform]
+      end
+    end
+  end
+end

data/lib/rails_template18f/generators.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module RailsTemplate18f
+  module Generators
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :CloudGovOptions
+    autoload :PipelineOptions
+  end
+end

data/lib/rails_template18f/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsTemplate18f
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/rails_template_18f.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 require_relative "rails_template18f/version"
+require_relative "rails_template18f/generators"
 
 module RailsTemplate18f
-  extend ActiveSupport::Autoload
-
-  autoload :TerraformOptions
-
   class Error < StandardError; end
 
   class Railtie < ::Rails::Railtie; end

data/template.rb

@@ -60,7 +60,6 @@ default_prod_space = "prod"
 
 @github_actions = yes?("Create Github Actions? (y/n)")
 @circleci_pipeline = yes?("Create CircleCI config? (y/n)")
-@adrs = yes?("Create initial Architecture Decision Records? (y/n)")
 @newrelic = yes?("Create FEDRAMP New Relic config files? (y/n)")
 @dap = yes?("If this will be a public site, should we include Digital Analytics Program code? (y/n)")
 @supported_languages = [:en]
@@ -151,34 +150,16 @@ else
   "policy.style_src :self"
 end
 
-script_policy = [":self"]
-connect_policy = [":self"]
-image_policy = [":self", ":data"]
-
-if @newrelic
-  script_policy << '"https://js-agent.newrelic.com"'
-  script_policy << '"https://*.nr-data.net"'
-  connect_policy << '"https://*.nr-data.net"'
-end
-
-if @dap
-  image_policy << '"https://www.google-analytics.com"'
-  script_policy << '"https://dap.digitalgov.gov"'
-  script_policy << '"https://www.google-analytics.com"'
-  connect_policy << '"https://dap.digitalgov.gov"'
-  connect_policy << '"https://www.google-analytics.com"'
-end
-
 gsub_file csp_initializer, /^#   config.*\|policy\|$.+^#   end$/m, <<EOM
   config.content_security_policy do |policy|
     policy.default_src :self
     policy.font_src :self
     policy.form_action :self
     policy.frame_ancestors :none
-    policy.img_src #{image_policy.join(", ")}
+    policy.img_src :self, :data
     policy.object_src :none
-    policy.script_src #{script_policy.join(", ")}
-    policy.connect_src #{connect_policy.join(", ")}
+    policy.script_src :self
+    policy.connect_src :self
     #{style_policy}
   end
 EOM
@@ -188,21 +169,13 @@ uncomment_lines csp_initializer, /end$/
 uncomment_lines csp_initializer, "content_security_policy_nonce"
 
 if @newrelic
-  gem "newrelic_rpm", "~> 8.4"
-  copy_file "config/newrelic.yml"
-
+  after_bundle do
+    generate "rails_template18f:newrelic"
+  end
   register_announcement("New Relic", <<~EOM)
     A New Relic config file has been written to `config/newrelic.yml`
 
-    To get started sending metrics via New Relic APM:
-    1. Replace `<APPNAME>` with what is registered for your application in New Relic
-    2. Add your New Relic license key to the Rails credentials with key `new_relic_key`.
-    3. Comment out the `agent_enabled: false` line
-
-    To enable browser monitoring:
-    4. Embed the Javascript snippet provided  by New Relic into `application.html.erb`.
-    It is recommended to vary this based on environment  (i.e. include one snippet
-    for staging and another for production).
+    See instructions in README to get started sending data to New Relic
   EOM
 end
 
@@ -222,11 +195,10 @@ end
 
 copy_file "lib/tasks/scanning.rake"
 copy_file "env", ".env"
+copy_file "githooks/pre-commit", ".githooks/pre-commit", mode: :preserve
 
 unless skip_git?
   rails_command "credentials:diff --enroll"
-  template "githooks/pre-commit", ".githooks/pre-commit"
-  chmod ".githooks/pre-commit", 0o755
   append_to_file ".gitignore", <<~EOM
 
     # Ignore local dotenv overrides
@@ -377,19 +349,13 @@ after_bundle do
 end
 
 if @terraform
-  directory "terraform", mode: :preserve
-  chmod "terraform/bootstrap/run.sh", 0o755
-  chmod "terraform/bootstrap/teardown_creds.sh", 0o755
-  unless skip_git?
-    append_to_file ".gitignore", <<~EOM
-
-      # Terraform
-      .terraform.lock.hcl
-      **/.terraform/*
-      secrets.auto.tfvars
-      terraform.tfstate
-      terraform.tfstate.backup
-    EOM
+  after_bundle do
+    generator_arguments = [
+      "--cg-org=#{@cloud_gov_organization}",
+      "--cg-staging=#{@cloud_gov_staging_space}",
+      "--cg-prod=#{@cloud_gov_production_space}"
+    ]
+    generate "rails_template18f:terraform", *generator_arguments
   end
   if cloud_gov_org_tktk?
     register_announcement("Terraform", <<~EOM)
@@ -437,11 +403,7 @@ if @circleci_pipeline
   EOM
 end
 
-if @adrs
-  directory "doc"
-else
-  directory "doc/compliance"
-end
+directory "doc"
 register_announcement("Documentation", <<~EOM)
   * Include a short description of your application in doc/compliance/apps/application.boundary.md
   * Remember to keep your Logical Data Model up to date in doc/compliance/apps/data.logical.md
@@ -449,13 +411,7 @@ EOM
 
 if @dap
   after_bundle do
-    insert_into_file "app/views/layouts/application.html.erb", <<-EODAP, before: /^\s+<\/head>/
-
-    <% if Rails.env.production? %>
-      <!-- We participate in the US government's analytics program. See the data at analytics.usa.gov. -->
-      <%= javascript_include_tag "https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA", async: true, id:"_fed_an_ua_tag" %>
-    <% end %>
-    EODAP
+    generate "rails_template18f:dap"
   end
   register_announcement("Digital Analytics Program", "Update the DAP agency code in app/views/layouts/application.html.erb")
 end

data/templates/README.md.tt

@@ -53,10 +53,9 @@ TBD
 
 The system's Content-Security-Policy header prevents `<script>` and `<style>` tags from working without further
 configuration. Use `<%%= javascript_tag nonce: true %>` for inline javascript.
-<% if @adrs %>
+
 See the [CSP compliant script tag helpers](./doc/adr/0004-rails-csp-compliant-script-tag-helpers.md) ADR for
 more information on setting these up successfully.
-<% end %>
 
 ## Internationalization
 
@@ -101,10 +100,9 @@ Run everything: `bundle exec rake`
 
 When new pages are added to the application, ensure they are added to `./.pa11yci` so that they can be scanned.
 
-### Automatic linting <% if @terraform %>and terraform formatting<% end %>
+### Automatic linting
 
-To enable automatic ruby linting<% if @terraform %> and terraform formatting<% end %> on every `git commit`
-follow the instructions at the top of `.githooks/pre-commit`
+To enable automatic ruby linting on every `git commit` follow the instructions at the top of `.githooks/pre-commit`
 
 ## CI/CD
 
@@ -114,24 +112,16 @@ Each environment has dependencies on a PostgreSQL RDS instance managed by cloud.
 See [cloud.gov docs](https://cloud.gov/docs/services/relational-database/) for information on RDS.
 
 #### Staging
-
 <% if !@github_actions && !@circleci_pipeline %>
-<% if @terraform %>
-Follow the instructions in `terraform/README.md` to create the supporting services.
-<% else %>
 Before the first deploy only, create DB service with `cf create-service aws-rds micro-psql <%= app_name %>-rds-staging`
-<% end %>
+
 `cf push --strategy rolling --vars-file config/deployment/staging.yml --var rails_master_key=$(cat config/master.key)`
 <% end %>
 
 #### Production
-
 <% if !@github_actions && !@circleci_pipeline %>
-<% if @terraform %>
-Follow the instructions in `terraform/README.md` to create the supporting services.
-<% else %>
 Before the first deploy only, create DB service with `cf create-service aws-rds <<SERVICE_PLAN_NAME>> <%= app_name %>-rds-production`
-<% end %>
+
 `cf push --strategy rolling --vars-file config/deployment/production.yml --var rails_master_key=$(cat config/credentials/production.key)`
 <% end %>
 
@@ -150,34 +140,8 @@ Otherwise, they are set as a `((variable))` within `manifest.yml` and the variab
 
 Configuration that changes from staging to production, but is public, should be added to `config/deployment/staging.yml` and `config/deployment/production.yml`
 
-<% if @newrelic %>
-## Monitoring with New Relic
-
-The [New Relic Ruby agent](https://docs.newrelic.com/docs/apm/agents/ruby-agent/getting-started/introduction-new-relic-ruby) has been installed for monitoring this application.
-
-The config lives at `config/newrelic.yml`, and points to a [FEDRAMP version of the New Relic service as its host](https://docs.newrelic.com/docs/security/security-privacy/compliance/fedramp-compliant-endpoints/). To access the metrics dashboard, you will need to be connected to VPN.
-
-### Getting started
-
-To get started sending metrics via New Relic APM:
-1. Replace `<APPNAME>` in `config/newrelic.yml` with what is registered for your application in New Relic
-1. Add your New Relic license key to the Rails credentials with key `new_relic_key`.
-1. Comment out the `agent_enabled: false` line in `config/newrelic.yml`
-1. Add the [Javascript snippet provided by New Relic](https://docs.newrelic.com/docs/browser/browser-monitoring/installation/install-browser-monitoring-agent) into `application.html.erb`. It is recommended to vary this based on environment (i.e. include one snippet for staging and another for production).
-<% end %>
-
-<% if @dap %>
-## Analytics
-
-Digital Analytics Program (DAP) code has been included for the Production environment, associated with GSA.
-
-If <%= app_name.titleize %> is for another agency, update the agency line in `app/views/layouts/application.html.erb`
-<% end %>
-
 ## Documentation
 
-<% if @adrs %>
-
 Architectural Decision Records (ADR) are stored in `doc/adr`
 To create a new ADR, first install [ADR-tools](https://github.com/npryce/adr-tools) if you don't
 already have it installed.
@@ -187,7 +151,6 @@ Then create the ADR:
 *  `adr new Title Of Architectural Decision`
 
 This will create a new, numbered ADR in the `doc/adr` directory.
-<% end %>
 
 Compliance diagrams are stored in `doc/compliance`. See the README there for more information on
 generating diagram updates.
@@ -197,8 +160,8 @@ generating diagram updates.
 *This will continue to evolve as the project moves forward.*
 
 * Pull down the most recent main before checking out a branch
-* Write your code<% if @adrs %>
-* If a big architectural decision was made, add an ADR<% end %>
+* Write your code
+* If a big architectural decision was made, add an ADR
 * Submit a PR
   * If you added functionality, please add tests.
   * All tests must pass!

data/templates/doc/compliance/apps/application.boundary.md.tt

@@ -11,6 +11,7 @@ LAYOUT_WITH_LEGEND()
 title application boundary view
 
 Person_Ext(public, "Public", "A member of the public")
+Person(developer, "Developer", "Application developers")
 
 Boundary(device, "Computing Device", "Windows, OS X, Linux, iOS, Android"){
     System_Ext(browser, "Web Browser", "any modern version")
@@ -39,20 +40,10 @@ Boundary(aws, "AWS GovCloud") {
 
 
 Boundary(gsa_saas, "GSA-authorized SaaS") {
-    <% if @dap %>
-    System_Ext(dap, "DAP", "Analytics collection")
-    <% end %>
-    <% if @newrelic %>
-    System_Ext(newrelic, "New Relic", "Monitoring SaaS")
-    <% end %>
 }
-<% if @dap %>
-Rel(browser, dap, "reports usage", "https (443)")
-<% end %>
-<% if @newrelic %>
-Rel(app, newrelic, "reports telemetry (ruby agent)", "tcp (443)")
-Rel(browser, newrelic, "reports ux metrics (javascript agent)", "https (443)")
-<% end %>
+
+Boundary(cicd, "CI/CD Pipeline") {
+}
 
 Rel(browser, aws_alb, "request info, submit requests", "https GET/POST (443)")
 Rel(aws_alb, cloudgov_router, "proxies requests", "https GET/POST (443)")
@@ -61,17 +52,6 @@ Rel(app, app_db, "reads/writes primary data", "psql (5432)")
 <% if !skip_active_storage? %>
 Rel(app, app_s3, "reads/writes file data", "https (443)")
 <% end %>
-
-Person(developer, "Developer", "Application developers")
-Boundary(cicd, "CI/CD Pipeline") {
-}
-
-<% if @dap %>
-Rel(developer, dap, "View traffic statistics", "https GET (443)")
-<% end %>
-<% if @newrelic %>
-Rel(developer, newrelic, "Manage performance", "https (443)")
-<% end %>
 @enduml
 ```
 

data/templates/githooks/{pre-commit.tt → pre-commit}

@@ -18,18 +18,3 @@ if [ $linter_status -ne 0 ]; then
     echo "Fix above before committing. Run 'git commit -n' to bypass linter."
     exit 1
 fi
-
-<% if @terraform %>
-echo "Running Terraform formatter"
-# imitates https://github.com/HHS/Head-Start-TTADP/blob/3b72ff05d94fab4cda877c63d8cd6970f0eeffc7/.githooks/pre-commit
-
-files=$(git diff --cached --name-only terraform)
-for f in $files
-do
-  # Format any *.tf files that were cached/staged
-  if [ -e "$f" ] && [[ $f == *.tf ]]; then
-    terraform fmt "$f"
-    git add "$f"
-  fi
-done
-<% end %>

data/templates/manifest.yml.tt

@@ -8,8 +8,7 @@ applications:
     RAILS_MASTER_KEY: ((rails_master_key))
     RAILS_ENV: ((env))
     RAILS_LOG_TO_STDOUT: true
-    RAILS_SERVE_STATIC_FILES: true<% if @newrelic %>
-    NEW_RELIC_LOG: stdout<% end %>
+    RAILS_SERVE_STATIC_FILES: true
   processes:
   - type: web
     instances: ((web_instances))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_template_18f
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -103,6 +103,7 @@ files:
 - lib/generators/rails_template18f/circleci/templates/bin/ci-server-start
 - lib/generators/rails_template18f/circleci/templates/circleci/config.yml.tt
 - lib/generators/rails_template18f/circleci/templates/docker-compose.ci.yml
+- lib/generators/rails_template18f/dap/dap_generator.rb
 - lib/generators/rails_template18f/github_actions/github_actions_generator.rb
 - lib/generators/rails_template18f/github_actions/templates/github/actions/run-server/action.yml
 - lib/generators/rails_template18f/github_actions/templates/github/actions/setup-languages/action.yml.tt
@@ -117,7 +118,37 @@ files:
 - lib/generators/rails_template18f/github_actions/templates/github/workflows/rspec.yml.tt
 - lib/generators/rails_template18f/github_actions/templates/github/workflows/terraform-production.yml
 - lib/generators/rails_template18f/github_actions/templates/github/workflows/terraform-staging.yml
-- lib/rails_template18f/terraform_options.rb
+- lib/generators/rails_template18f/newrelic/newrelic_generator.rb
+- lib/generators/rails_template18f/newrelic/templates/config/newrelic.yml.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/README.md.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/bootstrap/import.sh
+- lib/generators/rails_template18f/terraform/templates/terraform/bootstrap/main.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/bootstrap/providers.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/bootstrap/run.sh.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/bootstrap/teardown_creds.sh.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/bootstrap/variables.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/create_space_deployer.sh
+- lib/generators/rails_template18f/terraform/templates/terraform/destroy_space_deployer.sh
+- lib/generators/rails_template18f/terraform/templates/terraform/production/main.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/production/providers.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/production/variables.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/database/main.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/database/providers.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/database/variables.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/domain/main.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/domain/providers.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/domain/variables.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/s3/main.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/s3/providers.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/shared/s3/variables.tf
+- lib/generators/rails_template18f/terraform/templates/terraform/staging/main.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/staging/providers.tf.tt
+- lib/generators/rails_template18f/terraform/templates/terraform/staging/variables.tf
+- lib/generators/rails_template18f/terraform/terraform_generator.rb
+- lib/rails_template18f/generators.rb
+- lib/rails_template18f/generators/base.rb
+- lib/rails_template18f/generators/cloud_gov_options.rb
+- lib/rails_template18f/generators/pipeline_options.rb
 - lib/rails_template18f/version.rb
 - lib/rails_template_18f.rb
 - rails-template-18f.gemspec
@@ -143,7 +174,6 @@ files:
 - templates/config/locales/es.yml
 - templates/config/locales/fr.yml
 - templates/config/locales/zh.yml
-- templates/config/newrelic.yml
 - templates/doc/adr/0001-record-architecture-decisions.md.tt
 - templates/doc/adr/0002-initial-architecture-decisions.md.tt
 - templates/doc/adr/0003-security-scans.md.tt
@@ -154,35 +184,11 @@ files:
 - templates/doc/compliance/rendered/apps/.keep
 - templates/editorconfig
 - templates/env
-- templates/githooks/pre-commit.tt
+- templates/githooks/pre-commit
 - templates/lib/tasks/cf.rake
 - templates/lib/tasks/scanning.rake
 - templates/manifest.yml.tt
 - templates/pa11yci
-- templates/terraform/README.md.tt
-- templates/terraform/bootstrap/import.sh
-- templates/terraform/bootstrap/main.tf.tt
-- templates/terraform/bootstrap/providers.tf
-- templates/terraform/bootstrap/run.sh.tt
-- templates/terraform/bootstrap/teardown_creds.sh.tt
-- templates/terraform/bootstrap/variables.tf
-- templates/terraform/create_space_deployer.sh
-- templates/terraform/destroy_space_deployer.sh
-- templates/terraform/production/main.tf.tt
-- templates/terraform/production/providers.tf.tt
-- templates/terraform/production/variables.tf
-- templates/terraform/shared/database/main.tf.tt
-- templates/terraform/shared/database/providers.tf
-- templates/terraform/shared/database/variables.tf
-- templates/terraform/shared/domain/main.tf.tt
-- templates/terraform/shared/domain/providers.tf
-- templates/terraform/shared/domain/variables.tf
-- templates/terraform/shared/s3/main.tf
-- templates/terraform/shared/s3/providers.tf
-- templates/terraform/shared/s3/variables.tf
-- templates/terraform/staging/main.tf.tt
-- templates/terraform/staging/providers.tf.tt
-- templates/terraform/staging/variables.tf
 - templates/zap.conf
 homepage: https://github.com/18f/rails-template
 licenses: []

data/lib/rails_template18f/terraform_options.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module RailsTemplate18f
-  module TerraformOptions
-    extend ActiveSupport::Concern
-
-    included do
-      class_option :cg_org, desc: "cloud.gov organization name"
-      class_option :cg_staging, desc: "cloud.gov space name for staging"
-      class_option :cg_prod, desc: "cloud.gov space name for production"
-      class_option :terraform, type: :boolean, desc: "Generate actions for planning and applying terraform"
-    end
-
-    private
-
-    def ruby_version
-      RUBY_VERSION
-    end
-
-    def terraform?
-      options[:terraform].nil? ? terraform_dir_exists? : options[:terraform]
-    end
-
-    def cloud_gov_organization
-      if options[:cg_org].present?
-        return options[:cg_org]
-      elsif terraform_dir_exists?
-        staging_main = File.read(terraform_path.join("staging", "main.tf"))
-        if (matches = staging_main.match(/cf_org_name\s+= "(?<org_name>.*)"/))
-          return matches[:org_name]
-        end
-      end
-      "TKTK-cloud.gov-org-name"
-    end
-
-    def cloud_gov_staging_space
-      if options[:cg_staging].present?
-        return options[:cg_staging]
-      elsif terraform_dir_exists?
-        staging_main = File.read(terraform_path.join("staging", "main.tf"))
-        if (matches = staging_main.match(/cf_space_name\s+= "(?<space_name>.*)"/))
-          return matches[:space_name]
-        end
-      end
-      "staging"
-    end
-
-    def cloud_gov_production_space
-      if options[:cg_prod].present?
-        return options[:cg_prod]
-      elsif terraform_dir_exists?
-        prod_main = File.read(terraform_path.join("production", "main.tf"))
-        if (matches = prod_main.match(/cf_space_name\s+= "(?<space_name>.*)"/))
-          return matches[:space_name]
-        end
-      end
-      "prod"
-    end
-
-    def terraform_path
-      Pathname.new File.expand_path("terraform", destination_root)
-    end
-
-    def terraform_dir_exists?
-      Dir.exist? terraform_path
-    end
-  end
-end

data/templates/terraform/bootstrap/teardown_creds.sh.tt

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-../destroy_space_deployer.sh <%= @cloud_gov_production_space %> config-bootstrap-deployer
-
-rm secrets.auto.tfvars