et_full_system 3.0.4 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7b5ae580ea3dbb157a0aded367556bb230e23d37ce7ba9e42fe431ea12ec2e
-  data.tar.gz: c14be6676241b0ca864d7c0922f1c667506def90306c9825603e17e6c3a34fcf
+  metadata.gz: 904b2a0ef49ec4eaffe39dbbd3bc36a734f97e733047e5023a4123e7db756752
+  data.tar.gz: b4c2ee4a81dd944b1c30fb4d94a1a21abf48b94c180c90122656b33756ade71f
 SHA512:
-  metadata.gz: 1030962f5502636f0c9461f8c0bcb4e2effd691fbb60bc7ae6725459e41635fe6e3b4113691bfdc77f139b303d539bf6df598e9c8ffc0100aaa8bd2242848327
-  data.tar.gz: 54783edee4aeeb704adbd45370dc0c5c41099cf7619b5589b315b6250f8508108b0a7fa82463ee3485b2f6807af58f64bf87e125bbebfacfbf90d45290d1245e
+  metadata.gz: 65da2ee12b7b57b1287929a48eecb2b7dd9cd0eea772ecdbc96b31713b78f315358ed09d24f3ea476811a116090ceb0bc119e88f1e0c4fa5efbd51433e85e3a3
+  data.tar.gz: b336ee8f466eaeddbbe6150f62926c8fadafde07fb9ae01d495d41206a36ad424a30d323da3523601d7313533e8051fdfa262b65c5efe4367575edff4925a069

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (3.0.4)
+    et_full_system (3.0.8)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -23,16 +23,16 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.1)
-    aws-partitions (1.489.0)
+    aws-partitions (1.492.0)
     aws-sdk-core (3.119.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.46.0)
+    aws-sdk-kms (1.47.0)
       aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.99.0)
+    aws-sdk-s3 (1.100.0)
       aws-sdk-core (~> 3, >= 3.119.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -73,12 +73,10 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0704)
-    mini_portile2 (2.6.1)
     minitest (5.14.4)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.3)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.4-arm64-darwin)
       racc (~> 1.4)
     public_suffix (4.0.6)
     racc (1.5.2)

data/docker/docker-compose.yml

@@ -47,7 +47,6 @@ services:
       - ./.empty:/home/app/full_system/systems/admin/.env.local
       - ./.empty:/home/app/full_system/systems/et_ccd_export/.env.local
     environment:
-      DISABLE_CLOUDWATCH: 'true'
       DB_HOST: 'db'
       DB_USERNAME: 'postgres'
       RAILS_ENV:
@@ -55,7 +54,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:-amazon}
+      CLOUD_PROVIDER: ${CLOUD_PROVIDER:-azure}
       AZURITE_STORAGE_PATH: /home/app/azure_storage_data
       MINIO_STORAGE_PATH: /home/app/minio_data
       SHOW_DOWNTIME_BANNER:
@@ -64,14 +63,10 @@ services:
       CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/data_store}
       CCD_ECM_BASE_URL: ${CCD_ECM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/ecm}
       CCD_DOCUMENT_STORE_BASE_URL: ${CCD_DOCUMENT_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/document_store}
-      CCD_DOCUMENT_STORE_URL_REWRITE: ${CCD_DOCUMENT_STORE_URL_REWRITE:-'false'}
-      CCD_USE_SIDAM: ${CCD_USE_SIDAM:-'true'}
       CCD_MICROSERVICE_ID: ${CCD_MICROSERVICE_ID:-ccd_gw}
       CCD_MICROSERVICE_SECRET: ${CCD_MICROSERVICE_SECRET:-AAAAAAAAAAAAAAAC}
       CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
       CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
-      CCD_GENERATE_ETHOS_CASE_REFERENCE: ${CCD_GENERATE_ETHOS_CASE_REFERENCE:-'false'}
-      AZURE_APP_INSIGHTS_KEY: ${AZURE_APP_INSIGHTS_KEY:-2ac37587-9187-4ec1-97a4-d12ba26bc0fc}
     command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --azurite-storage-path=/home/app/azure_storage_data --minio-storage-path=/home/app/minio_data ${SERVER_ARGS}"
     links:
       - "db"
@@ -142,46 +137,6 @@ services:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP:-127.255.255.255}"
     networks:
       - et_full_system
-  zalenium:
-    image: "dosel/zalenium"
-    container_name: zalenium
-    hostname: zalenium
-    tty: 'true'
-    volumes:
-      - zalenium_videos:/home/seluser/videos
-      - /var/run/docker.sock:/var/run/docker.sock
-    ports:
-      - 4444:4444
-    extra_hosts:
-      - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
-    networks:
-      - et_full_system
-    command: >
-      start --desiredContainers 2
-            --maxDockerSeleniumContainers 8
-            --screenWidth 1024 --screenHeight 768
-            --timeZone "Europe/Berlin"
-            --videoRecordingEnabled ${RECORD_VIDEO:-'false'}
-            --sauceLabsEnabled 'false'
-            --browserStackEnabled 'false'
-            --testingBotEnabled 'false'
-            --cbtEnabled 'false'
-            --lambdaTestEnabled 'false'
-            --startTunnel 'false'
-    environment:
-      - HOST_UID
-      - HOST_GID
-      - SAUCE_USERNAME
-      - SAUCE_ACCESS_KEY
-      - BROWSER_STACK_USER
-      - BROWSER_STACK_KEY
-      - TESTINGBOT_KEY
-      - TESTINGBOT_SECRET
-      - CBT_USERNAME
-      - CBT_AUTHKEY
-      - LT_USERNAME
-      - LT_ACCESS_KEY
-      - PULL_SELENIUM_IMAGE='true'
 volumes:
   rvm:
   global_node_modules:
@@ -202,7 +157,6 @@ volumes:
   atos_bundle:
   db_data:
   redis_data:
-  zalenium_videos:
 
 networks:
   et_full_system:

data/foreman/et_ccd_export.env

@@ -7,9 +7,10 @@ CCD_IDAM_BASE_URL=${CCD_IDAM_BASE_URL}
 CCD_DATA_STORE_BASE_URL=${CCD_DATA_STORE_BASE_URL}
 CCD_ECM_BASE_URL=${CCD_ECM_BASE_URL}
 CCD_DOCUMENT_STORE_BASE_URL=${CCD_DOCUMENT_STORE_BASE_URL}
-CCD_USE_SIDAM=${CCD_USE_SIDAM}
+CCD_USE_SIDAM=true
 CCD_MICROSERVICE_ID=${CCD_MICROSERVICE_ID}
 CCD_MICROSERVICE_SECRET=${CCD_MICROSERVICE_SECRET}
 DISABLE_SIDEKIQ_ALIVE=true
-CCD_GENERATE_ETHOS_CASE_REFERENCE=${CCD_GENERATE_ETHOS_CASE_REFERENCE}
-AZURE_APP_INSIGHTS_ROLE_NAME=et-ccd-export-fs
+CCD_GENERATE_ETHOS_CASE_REFERENCE=false
+AZURE_APP_INSIGHTS_ROLE_NAME=et-ccd-export-fs
+CCD_DOCUMENT_STORE_URL_REWRITE=false

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

@@ -14,7 +14,6 @@ module EtFullSystem
         method_option :use_selenium, type: :boolean, default: false, aliases: 'use-selenium', desc: 'Only used if with_test is true - says to use selenium in preference to zalenium'
         method_option :chrome_instances, type: :numeric, default: 1, aliases: 'chrome-instances', desc: 'Specify the number of chrome instances for selenium'
         method_option :firefox_instances, type: :numeric, default: 1, aliases: 'firefox-instances', desc: 'Specify the number of firefox instances for selenium'
-        method_option :record_video, type: :boolean, default: false, aliases: 'record-video', desc: 'When using zalenium, enable video recording'
         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)'
         def up(*args)
           unbundled do
@@ -35,16 +34,13 @@ module EtFullSystem
               env_vars << "CCD_SIDAM_PASSWORD=Pa55word11"
               env_vars << "CCD_GENERATE_ETHOS_CASE_REFERENCE=true"
             end
-            extra_args = []
+            extra_args = ['--no-recreate']
             if options.with_test? && options.use_selenium?
               extra_args.concat(["--scale chrome=#{options.chrome_instances}"])
               extra_args.concat(["--scale firefox=#{options.firefox_instances}"])
             else
               extra_args.concat(['--scale selenium-hub=0', '--scale chrome=0', '--scale firefox=0'])
             end
-            unless options.with_test? && !options.use_selenium?
-              extra_args.concat(['--scale zalenium=0'])
-            end
             env_vars << "DB_PORT=#{ENV.fetch('DB_PORT', EtFullSystem.is_port_open?(5432) ? 0 : 5432)}"
             env_vars << "REDIS_PORT=#{ENV.fetch('REDIS_PORT', EtFullSystem.is_port_open?(6379) ? 0 : 6379)}"
             gem_root = File.absolute_path('../../../..', __dir__)

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "3.0.4"
+  VERSION = "3.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.8
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs