et_full_system 6.0.0.pre.rc46 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149cf23b6584c7eabf2d71a7329ea33f1ffbda6a416b4508c21b3c04749bb911
-  data.tar.gz: db5b64ce61844cbb84d58091e4b072b06344dde3fa4a69a0c165255d084bb6f3
+  metadata.gz: bbfe3a02539b7acf289a8d885375ec10a931edb8e473e0c0a64d358b838315bd
+  data.tar.gz: c77cc0d1a2906f57f3707e6940223d1962c056d4482fdb6c636a5eec6d081b83
 SHA512:
-  metadata.gz: ea827a399ee0e3ba6eda954753c6590da39b57e13464b30a98bdab199cdd784be946143d0a46b036ada178dc94cd7dcac6fc2617178fa4a50fb5c57626d4bc0b
-  data.tar.gz: 9849f962c42dd42df8866cdebdd886b668af2f4d0c1efe5c63095a84a05a02b857dc4448884224f9bd4098ddb017c42fa7bf0a3e2a5c1f3dd6ed427d0b4d164b
+  metadata.gz: ad635e631aec27b5e2286724b6cb55592ddd4165723d04cfa18c90db2d6a52dcaaf963adf8056a00cf6bed89d5580d07631ef2aa2bd4632fa45c23c0db4d1b3f
+  data.tar.gz: 0e950ed0c1c129f717cc85e08684fb2b2195b3931473ba909e815037e55075632ddf8c5b952fa58e2e39f88ba7915e9c35dbc69062cc03d94ace0149a3118ce5

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc46)
-      aws-sdk-s3 (~> 1.9)
+    et_full_system (6.0.1)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
       et_fake_ccd (~> 1.0)
@@ -13,9 +12,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activesupport (6.1.4.4)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,22 +22,6 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.547.0)
-    aws-sdk-core (3.125.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.1)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
-      aws-eventstream (~> 1, >= 1.0.2)
     azure-core (0.1.15)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
@@ -48,7 +31,7 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6, >= 1.6.8)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     dotenv (2.7.6)
     et_fake_ccd (1.1.11)
       activemodel (~> 6.1)
@@ -59,7 +42,7 @@ GEM
       rotp (~> 6.2)
       thor (~> 1.0)
       tilt (~> 2.0, >= 2.0.9)
-    faraday (0.17.4)
+    faraday (0.17.5)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
@@ -74,10 +57,9 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     iodine (0.7.45)
-    jmespath (1.5.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
     jwt (2.3.0)
@@ -87,12 +69,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.0)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pastel (0.8.0)
       tty-color (~> 0.5)
@@ -100,7 +82,7 @@ GEM
     racc (1.6.0)
     rack (2.2.3)
     rake (13.0.1)
-    roda (3.51.0)
+    roda (3.54.0)
       rack
     roda-enhanced_logger (0.4.0)
       roda (>= 3.19.0)
@@ -113,7 +95,7 @@ GEM
       pastel (~> 0.8)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -29,7 +29,6 @@ There are other services as well that are run - which are there for testing - th
 
 * et-fake-acas-server (https://github.com/ministryofjustice/et_fake_acas_server) - Provides a fake ACAS server with predictable responses based on various special certificate numbers
 * mailhog (https://github.com/mailhog/MailHog) - Captures all emails sent to allow the test suite or the developer to view them and check them
-* minio (https://github.com/minio/minio) - A local amazon S3 server to avoid having S3 credentials for every environment
 * azurite (https://github.com/Azure/Azurite) - A local azure blob server to avoid having azure credentials for every environment
 
 
@@ -49,7 +48,6 @@ To run without docker, you need a few tools
 
 * Traefik (https://traefik.io)
 * Mailhog (https://github.com/mailhog/MailHog)
-* Minio (https://github.com/minio/minio)
 * Azurite (https://github.com/Azure/Azurite)
 * godotenv (https://github.com/joho/godotenv)
 * freeport (https://github.com/phayes/freeport)

data/docker/docker-compose.yml

@@ -15,7 +15,6 @@ services:
     networks:
       et_full_system:
         aliases:
-          - s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - azure_blob_storage.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - notify.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - api.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
@@ -30,7 +29,6 @@ services:
     links:
       - db
       - redis
-      - minio
       - azurite
       - mailhog
       - et
@@ -45,7 +43,6 @@ services:
     links:
       - db
       - redis
-      - minio
       - azurite
       - mailhog
     depends_on:
@@ -53,7 +50,6 @@ services:
       - redis
       - azurite
       - mailhog
-      - minio
     extra_hosts:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
     volumes:
@@ -67,7 +63,6 @@ services:
       - et1_assets:/home/app/full_system/systems/et1/public/apply/assets
       - et3_assets:/home/app/full_system/systems/et3/public/assets
       - admin_assets:/home/app/full_system/systems/admin/public/assets
-      - s3_data:/home/app/minio_data
       - et1_bundle:/home/app/full_system/systems/et1/.bundle
       - et3_bundle:/home/app/full_system/systems/et3/.bundle
       - api_bundle:/home/app/full_system/systems/api/.bundle
@@ -94,9 +89,7 @@ services:
       REDIS_HOST: redis
       SERVER_PORT: ${SERVER_PORT:-3100}
       SERVER_DOMAIN: ${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
-      CLOUD_PROVIDER: ${CLOUD_PROVIDER:-azure}
       AZURITE_STORAGE_PATH: /home/app/azure_storage_data
-      MINIO_STORAGE_PATH: /home/app/minio_data
       SHOW_DOWNTIME_BANNER:
       CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/auth}
       CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/idam}
@@ -107,6 +100,9 @@ services:
       CCD_MICROSERVICE_SECRET: ${CCD_MICROSERVICE_SECRET:-AAAAAAAAAAAAAAAC}
       CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
       CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
+      MAINTENANCE_ENABLED:
+      MAINTENANCE_END:
+      MAINTENANCE_ALLOWED_IPS:
     command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --in-docker-compose ${SERVER_ARGS}"
     networks:
       - et_full_system
@@ -155,20 +151,6 @@ services:
       - et_full_system
     volumes:
       - redis_data:/data
-  minio:
-    image: minio/minio
-    labels:
-      - traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.s3-router.service=s3-service
-      - traefik.http.services.s3-service.loadbalancer.server.port=9000
-    command:
-      - server
-      - /data
-    networks:
-      - et_full_system
-    environment:
-      MINIO_ACCESS_KEY: accessKey1
-      MINIO_SECRET_KEY: verySecretKey1
   mailhog:
     image: mailhog/mailhog:v1.0.1
     labels:
@@ -194,13 +176,11 @@ volumes:
   global_node_modules:
   et1_node_modules:
   et3_node_modules:
-  s3_node_modules:
   api_node_modules:
   admin_node_modules:
   et1_assets:
   et3_assets:
   admin_assets:
-  s3_data:
   azure_storage_data:
   et1_bundle:
   et3_bundle:

data/et_full_system.gemspec

@@ -24,11 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_dependency 'thor', '~> 1.0'
   spec.add_dependency 'httparty', '~> 0.16'
-  spec.add_dependency 'aws-sdk-s3', '~> 1.9'
   spec.add_dependency 'azure-storage', '~> 0.15.0.preview'
   spec.add_dependency 'dotenv', '~> 2.7', '>= 2.7.2'
   spec.add_dependency 'et_fake_ccd', '~> 1.0'
   spec.add_dependency 'gov_fake_notify', '~> 1.1'
-  
+
   spec.add_development_dependency "rake", "~> 13.0"
 end

data/foreman/.env

@@ -9,11 +9,6 @@ WEB_CONCURRENCY=1
 SECRET_KEY_BASE=sdlkjewfkjhfviuhduihenrjk435r89esfd7cv983qh2n4r3q27yh4u5rtfg
 SMTP_HOSTNAME='mail.et.127.0.0.1.nip.io'
 SMTP_PORT=1025
-AWS_ACCESS_KEY_ID=accessKey1
-AWS_SECRET_ACCESS_KEY=verySecretKey1
-AWS_REGION='us-east-1'
-AWS_ENDPOINT='http://s3.et.127.0.0.1.nip.io:3100'
-AWS_S3_FORCE_PATH_STYLE='true'
 RAILS_SERVE_STATIC_FILES='true'
 ATOS_API_URL="http://atos.et.127.0.0.1.nip.io:3100"
 ACAS_API_URL="http://api.et.127.0.0.1.nip.io:3100/et_acas_api"
@@ -21,7 +16,6 @@ ATOS_API_USERNAME='atos'
 ATOS_API_PASSWORD='password'
 RAILS_MAX_THREADS=5
 AZURITE_STORAGE_PATH=${AZURITE_STORAGE_PATH}
-MINIO_STORAGE_PATH=${MINIO_STORAGE_PATH}
 DISABLE_CLOUDWATCH='true'
 AZURE_STORAGE_BLOB_HOST='http://azure_blob_storage.et.127.0.0.1.nip.io:3100'
 AZURE_STORAGE_BLOB_FORCE_PATH_STYLE='true'

data/foreman/Procfile

@@ -7,7 +7,6 @@ api_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godoten
 api_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/api && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env ./run_sidekiq.sh"
 admin_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url admin http://localhost:$FREEPORT && cd systems/admin && PORT=$FREEPORT ./run.sh"
 atos_api_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url atos_api http://localhost:$FREEPORT && cd systems/atos && PORT=$FREEPORT ./run.sh"
-s3_web: bash --login -c "godotenv -f ${FOREMAN_PATH}/minio.env minio server ${MINIO_STORAGE_PATH}"
 azure_blob_web: bash --login -c "azurite -l ${AZURITE_STORAGE_PATH} -d ${AZURITE_STORAGE_PATH}/debug.log"
 fake_acas_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:$FREEPORT && rvm use && et_fake_acas_server -port $FREEPORT -threads=1 -workers=2"
 fake_ccd_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_ccd http://localhost:$FREEPORT && rvm use && et_fake_ccd start --port=$FREEPORT --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"

data/foreman/et1.env

@@ -2,14 +2,7 @@ HTTP_OPEN_TIMEOUT_S=15
 HTTP_READ_TIMEOUT_S=15
 REDIS_DATABASE=5
 DB_NAME=etdb
-S3_UPLOAD_BUCKET='et1bucket'
 RAVEN_DSN='https://1b78623c8bab4dfb9aeb6f5dbb31ae34:0f4a38359e7e47f99e7e69449b32ef2b@sentry.io/1355286'
-AWS_ACCESS_KEY_ID=accessKey1
-AWS_SECRET_ACCESS_KEY=verySecretKey1
-S3_UPLOAD_BUCKET=et1bucket
-AWS_REGION=us-east-1
-AWS_ENDPOINT=http://s3.et.127.0.0.1.nip.io:3100
-AWS_S3_FORCE_PATH_STYLE=true
 ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api/v2'
 SECURE_SESSION_COOKIE=false
 SENDING_HOST=et1.et.127.0.0.1.nip.io

data/foreman/et_admin.env

@@ -3,6 +3,5 @@ REDIS_DATABASE=2
 DB_NAME='et_api_production'
 RAILS_SERVE_STATIC_FILES='true'
 SEED_EXAMPLE_USERS='true'
-S3_UPLOAD_BUCKET='etapibucket'
 RAVEN_DSN='https://ff44444af15e43a287fa10eb4f3fd825:b5764132fc3a42e98d8a7f8ba3042a90@sentry.io/1389908'
 ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'

data/foreman/et_api.env

@@ -2,8 +2,6 @@ WEB_CONCURRENCY=1
 SECRET_KEY_BASE=sdlkjewfkjhfviuhduihenrjk435r89esfd7cv983qh2n4r3q27yh4u5rtfg
 REDIS_DATABASE=2
 DB_NAME='et_api_production'
-S3_UPLOAD_BUCKET='etapibucket'
-S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
 RAVEN_DSN='https://929365547a42468fb521248a96100646:139af8327fa340b88088efeae059fca8@sentry.io/1254109'
 ACAS_SERVICE_URL='http://acas.et.127.0.0.1.nip.io:3100/Lookup/ECService.svc'
 DISABLE_SIDEKIQ_ALIVE=true

data/foreman/et_atos.env

@@ -1,3 +1 @@
-S3_UPLOAD_BUCKET='etapibucket'
-S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
 DB_NAME='et_api_production'

data/foreman/ports.env

@@ -1,4 +1,3 @@
 ET1_PORT=3003
 ETAPI_PORT=3000
-S3_PORT=3002
-ET_ADMIN_PORT=3001
+ET_ADMIN_PORT=3001

data/foreman/traefik.json

@@ -40,14 +40,6 @@
         }
       }
     },
-    "s3": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:9000",
-          "weight": 1
-        }
-      }
-    },
     "mail": {
       "servers": {
         "web": {
@@ -152,18 +144,6 @@
         }
       }
     },
-    "s3": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "s3",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:s3.et.127.0.0.1.nip.io"
-        }
-      }
-    },
     "mail": {
       "entryPoints": [
         "http"

data/lib/et_full_system/cli/docker/server.rb

@@ -7,10 +7,10 @@ module EtFullSystem
       class ServerCommand < Thor
         BEFORE_BOOT_SCRIPT =
         desc "up", "Starts the full system server on docker"
-        method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, s3_web, azure_blob_web, fake_acas_web, fake_ccd_web"
+        method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, azure_blob_web, fake_acas_web, fake_ccd_web"
         method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker', desc: "If specified, instead of using the built in fake ccd server, the system will connect to your local machine (see ccd-docker-host option also)"
         method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host', desc: "Only used if ccd-docker=true.  This specifies the host name of your machine when viewed from inside the docker container.  This defaults to docker.for.mac.localhost which is suitable for mac OSX only.  Consult docker documentation for other systems"
-        method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
+        method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, azure blob, fake_acas, fake_ccd)'
         def up(*args)
           unbundled do
             server_args = []

data/lib/et_full_system/cli/local/file_storage.rb

@@ -3,7 +3,6 @@ module EtFullSystem
   # frozen_string_literal: true
   require "rubygems"
   require "thor"
-  require 'aws-sdk-s3'
   require 'azure/storage'
 
   module Cli
@@ -11,9 +10,8 @@ module EtFullSystem
       class FileStorageCommand < Thor
         GEM_PATH = File.absolute_path('../../../..', __dir__)
 
-        desc "setup", "Primes the storage account(s) for running locally - i.e. using local S3 or Azure Blob storage"
+        desc "setup", "Primes the storage account(s) for running locally - i.e. using local Azure Blob storage"
         def setup_storage
-          setup_s3_storage
           setup_azure_storage
         end
 
@@ -24,35 +22,6 @@ module EtFullSystem
           Bundler.send(method, &block)
         end
 
-        def setup_s3_storage
-          config = {
-            region: ENV.fetch('AWS_REGION', 'us-east-1'),
-            access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID', 'accessKey1'),
-            secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', 'verySecretKey1'),
-            endpoint: ENV.fetch('AWS_ENDPOINT', 'http://s3.et.127.0.0.1.nip.io:3100/'),
-            force_path_style: ENV.fetch('AWS_S3_FORCE_PATH_STYLE', 'true') == 'true'
-          }
-          s3 = Aws::S3::Client.new(config)
-          retry_countdown = 10
-          begin
-            Aws::S3::Bucket.new(client: s3, name: 'et1bucket').tap do |bucket|
-              bucket.create unless bucket.exists?
-            end
-            Aws::S3::Bucket.new(client: s3, name: 'etapibucket').tap do |bucket|
-              bucket.create unless bucket.exists?
-            end
-          rescue Seahorse::Client::NetworkingError, Aws::S3::Errors::NotFound, Aws::S3::Errors::Http502Error, Aws::Errors::ServiceError
-            retry_countdown -= 1
-            if retry_countdown.zero?
-              fail "Could not connect to the S3 server after 10 retries"
-            else
-              STDERR.puts "Retrying connection to S3 server in 30 seconds"
-              sleep 30
-              retry
-            end
-          end
-        end
-
         def setup_azure_storage
           unbundled do
             puts `bash --login -c "export RAILS_ENV=production && cd systems/api && godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`

data/lib/et_full_system/cli/local.rb

@@ -6,6 +6,7 @@ module EtFullSystem
   require 'httparty'
   require 'et_full_system/cli/local/file_storage'
   require 'dotenv'
+  require 'tmpdir'
 
   class LocalCommand < Thor
     DEFAULT_BASE_URL="http://localhost:3200"
@@ -15,7 +16,7 @@ module EtFullSystem
 
     class RestProviderNotConfigured < RuntimeError; end
     class ServiceUrlIncorrect < RuntimeError; end
-    desc "boot", "Sets up the server - traefik frontends and backends, along with initial data in local s3 and azure storage"
+    desc "boot", "Sets up the server - traefik frontends and backends, along with initial data in local azure storage"
     method_option :base_url, type: :string, default: DEFAULT_BASE_URL
     def boot
       STDERR.puts "boot - base_url is #{options[:base_url]}"
@@ -79,12 +80,10 @@ module EtFullSystem
 
 
     desc "server", "Starts the full system server"
-    method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, s3_web, azure_blob_web, fake_acas_web"
+    method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, azure_blob_web, fake_acas_web"
     method_option :azurite_storage_path, default: ENV.fetch('AZURITE_STORAGE_PATH', '/tmp/azurite_storage'), desc: "Where to store azurite data"
-    method_option :minio_storage_path, default: ENV.fetch('MINIO_STORAGE_PATH', '/tmp/minio_storage'), desc: "Where to store minio data"
     method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
-    method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
-    method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
+    method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, azure blob, fake_acas, fake_ccd)'
     method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
     def server
       puts "Scheduling traefik config and file storage config"
@@ -101,9 +100,9 @@ module EtFullSystem
           without = ['et1', 'et3', 'admin', 'api', 'ccd_export', 'atos_api']
         end
         if options.in_docker_compose?
-          cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/ComposeProcfile\" --port=4000"
+          cmd = "RAILS_ENV=#{options[:rails_env]} FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/ComposeProcfile\" --port=4000"
         else
-          cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
+          cmd = "RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
         end
         STDERR.puts cmd
         unless without.empty?
@@ -129,7 +128,6 @@ module EtFullSystem
 
     desc "setup", "Sets up everything ready for first run"
     method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
-    method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
     method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
     def setup
       setup_depencencies
@@ -351,7 +349,7 @@ module EtFullSystem
 
     def setup_et1_service
       puts "------------------------------------------------ SETTING UP ET1 SERVICE ---------------------------------------------------"
-      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'et1 setup'
 
@@ -359,56 +357,56 @@ module EtFullSystem
       puts cmd
       external_command cmd, 'et1 setup'
 
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" bundle exec rake db:create db:migrate assets:precompile\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et1 RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" bundle exec rake db:create db:migrate assets:precompile\""
       puts cmd
       external_command cmd, 'et1 setup'
     end
 
     def setup_et3_service
       puts "------------------------------------------------ SETTING UP ET3 SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'et3 setup'
 
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" bundle exec rake db:create db:migrate assets:precompile\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" bundle exec rake db:create db:migrate assets:precompile\""
       puts cmd
       external_command cmd, 'et3 setup'
     end
 
     def setup_admin_service
       puts "------------------------------------------------ SETTING UP ADMIN SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'admin setup'
 
       puts "|   Admin    | Running rake commands"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" bundle exec rake db:seed assets:precompile\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" bundle exec rake db:seed assets:precompile\""
       puts cmd
       external_command cmd, 'admin setup'
     end
 
     def setup_api_service
       puts "------------------------------------------------ SETTING UP API SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'api setup'
 
       puts "|   API      | Running rake commands"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rake db:create db:migrate db:seed\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rake db:create db:migrate db:seed\""
       puts cmd
       external_command cmd, 'api setup'
     end
 
     def setup_atos_service
       puts "------------------------------------------------ SETTING UP ATOS SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/atos && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_atos.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/atos RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_atos.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'atos setup'
     end
 
     def setup_ccd_service
       puts "------------------------------------------------ SETTING UP CCD EXPORT SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'ccd setup'
     end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc46"
+  VERSION = "6.0.1"
 end

data/shell_scripts/run_foreman

@@ -17,7 +17,6 @@ sudo chown app:app /home/app/full_system/systems/et3/.bundle
 sudo chown app:app /home/app/full_system/systems/api/.bundle
 sudo chown app:app /home/app/full_system/systems/admin/.bundle
 sudo chown app:app /home/app/full_system/systems/atos/.bundle
-sudo chown app:app /home/app/minio_data
 sudo chown app:app /home/app/azure_storage_data
 
 parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc46
+  version: 6.0.1
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: azure-storage
   requirement: !ruby/object:Gem::Requirement
@@ -169,9 +155,7 @@ files:
 - foreman/fake_notify.env
 - foreman/gov_fake_notify.yaml
 - foreman/mailhog.env
-- foreman/minio.env
 - foreman/ports.env
-- foreman/s3/.env
 - foreman/traefik.json
 - foreman/traefik.toml
 - lib/et_full_system.rb
@@ -200,9 +184,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 

data/foreman/minio.env

@@ -1,2 +0,0 @@
-MINIO_ACCESS_KEY=accessKey1
-MINIO_SECRET_KEY=verySecretKey1

data/foreman/s3/.env

@@ -1,5 +0,0 @@
-cd ../..
-mkdir -p tmp/S3DataPath
-mkdir -p tmp/S3MetadataPath
-export S3DATAPATH="$(pwd)/tmp/S3DataPath"
-export S3METADATAPATH="$(pwd)/tmp/S3MetadataPath"