Merge pull request #188 from GSA/nmb/5396-remove-smtp

Remove SMTP broker

Author: neilmb

.github/workflows/apply.yml

@@ -33,7 +33,6 @@ jobs:
       - name: prep applications
         run: |
           ./app-setup-solr.sh
-          ./app-setup-smtp.sh
       - name: OpenTofu apply (production)
         uses: dflook/tofu-apply@v1
         with:

.github/workflows/commit.yml

@@ -47,7 +47,6 @@ jobs:
       - name: prep applications
         run: |
           ./app-setup-solr.sh
-          ./app-setup-smtp.sh
 
       - name: OpenTofu apply (development)
         uses: dflook/tofu-apply@v1

.github/workflows/disable-egress.yml

@@ -9,15 +9,13 @@ on:   # yamllint disable-line rule:truthy
         required: true
         type: choice
         options:
-          - "ssb-smtp"
           - "ssb-solrcloud"
       appSpace:
         description: 'Cloud Foundry Space'
         required: true
         type: choice
         options:
           - "development-ssb"
-          - "management-staging"
           - "management"
 
 jobs:

.github/workflows/enable-egress.yml

@@ -9,15 +9,13 @@ on:   # yamllint disable-line rule:truthy
         required: true
         type: choice
         options:
-          - "ssb-smtp"
           - "ssb-solrcloud"
       appSpace:
         description: 'Cloud Foundry Space'
         required: true
         type: choice
         options:
           - "development-ssb"
-          - "management-staging"
           - "management"
 
 env:

.github/workflows/plan.yml

@@ -32,7 +32,6 @@ jobs:
       - name: prep applications
         run: |
           ./app-setup-solr.sh
-          ./app-setup-smtp.sh
       - name: OpenTofu plan (production)
         uses: dflook/tofu-plan@v1
         with:

.github/workflows/restart-egress.yml

@@ -11,7 +11,7 @@ jobs:
   restart-egress:
     strategy:
       matrix:
-        environ: [development-ssb, management-staging, management]
+        environ: [development-ssb, management]
     name: restart egress (${{matrix.environ}})
     concurrency: ${{matrix.environ}}
     environment: ${{matrix.environ}}

.gitignore

@@ -38,18 +38,12 @@ override.tf.json
 terraform.tfvars
 backend.tfvars
 .env.secrets
-app-smtp
-app-eks
-app-solr
 app-solrcloud
 app-ssb-*.zip
 .backend.secrets
 .env.*.secrets
 
 linux-amd64/
 bin/
-kubeconfig*
-vars-solr-template.yml
 vars-solrcloud-template.yml
-manifest-solr.yml
 manifest-solrcloud.yml

README.md

@@ -6,7 +6,7 @@ What a service instance represents can vary by service, for example a single dat
 
 The SSB can also be used from the command-line with [`eden`](https://github.com/starkandwayne/eden), or integrated into other platforms that make use of the [OSBAPI](https://www.openservicebrokerapi.org).
 
-The SSB currently provides [SMTP](https://github.com/GSA/datagov-brokerpak-smtp) and [Solr](https://github.com/GSA/datagov-brokerpak) services.
+The SSB currently provides [Solr](https://github.com/GSA/datagov-brokerpak-solr) services.
 
 Services are defined in a
 [brokerpaks](https://github.com/pivotal/cloud-service-broker/blob/master/docs/brokerpak-intro.md),
@@ -63,7 +63,6 @@ github_release and github_actions_secret in the github_provider!) -->
    into the respective `/app` directories.
 
     ```bash
-    ./app-setup-smtp.sh
     ./app-setup-solrcloud.sh
     ```
 

app-setup-smtp.sh

@@ -4,20 +4,6 @@ data "cloudfoundry_space" "broker-space" {
   org_name = var.broker_space.org
 }
 
-module "broker_smtp" {
-  source = "./broker"
-
-  name                  = "ssb-smtp"
-  path                  = "./app-smtp"
-  broker_space          = var.broker_space
-  client_spaces         = var.client_spaces
-  enable_ssh            = var.enable_ssh
-  memory                = 1024
-  aws_access_key_id     = module.ssb-smtp-broker-user.iam_access_key_id
-  aws_secret_access_key = module.ssb-smtp-broker-user.iam_access_key_secret
-  aws_zone              = var.broker_zone
-}
-
 module "broker_solrcloud" {
   source = "./broker"