Merge pull request #374 from alphagov/auth-1389-remove-paas-terraform

AUTH-1389: Remove Cloudfoundry provider from Terraform

Author: chrisclayson

ci/tasks/deploy-account-management.yml

@@ -13,9 +13,6 @@ params:
   DNS_STATE_KEY: ((dns-state-key))
   STATE_BUCKET: digital-identity-dev-tfstate
   DEPLOY_ENVIRONMENT: build
-  CF_USERNAME: ((cf-username))
-  CF_PASSWORD: ((cf-password))
-  CF_ORG_NAME: ((cf-org-name))
   GTM_ID: ((build-gtm-id))
   PUBLISHING_API_URL: ((build-gov-accounts-api-url))
   PUBLISHING_API_URL_TOKEN: ((build-gov-accounts-api-token))
@@ -49,9 +46,6 @@ run:
 
       terraform apply -auto-approve \
         -var "deployer_role_arn=${DEPLOYER_ROLE_ARN}" \
-        -var "cf_username=${CF_USERNAME}" \
-        -var "cf_password=${CF_PASSWORD}" \
-        -var "cf_org_name=${CF_ORG_NAME}" \
         -var "dns_state_bucket=${DNS_STATE_BUCKET}" \
         -var "dns_state_key=${DNS_STATE_KEY}" \
         -var "dns_state_role=${DNS_DEPLOYER_ROLE_ARN}" \

ci/terraform/.terraform.lock.hcl

@@ -1,4 +1,3 @@
-cf_org_name                         = "gds-digital-identity-authentication"
 account_management_fqdn             = "sandpit.auth.ida.digital.cabinet-office.gov.uk"
 oidc_api_fqdn                       = "api.sandpit.auth.ida.digital.cabinet-office.gov.uk"
 frontend_fqdn                       = "signin.sandpit.auth.ida.digital.cabinet-office.gov.uk"

ci/terraform/sandpit.tfvars

@@ -10,10 +10,6 @@ terraform {
       source  = "hashicorp/random"
       version = ">= 3.1.0"
     }
-    cloudfoundry = {
-      source  = "cloudfoundry-community/cloudfoundry"
-      version = "0.14.2"
-    }
   }
 
   backend "s3" {
@@ -28,13 +24,6 @@ provider "aws" {
   }
 }
 
-provider "cloudfoundry" {
-  api_url      = "https://api.london.cloud.service.gov.uk"
-  user         = var.cf_username
-  password     = var.cf_password
-  app_logs_max = 250
-}
-
 provider "random" {}
 
 data "aws_availability_zones" "available" {}

ci/terraform/site.tf

@@ -6,18 +6,6 @@ variable "deployer_role_arn" {
   default = null
 }
 
-variable "cf_username" {
-  description = "deployer username"
-}
-
-variable "cf_password" {
-  description = "deployer password org"
-}
-
-variable "cf_org_name" {
-  description = "target org"
-}
-
 variable "dns_state_bucket" {
   default = ""
 }