RubyGems - et_full_system - Versions diffs - 7.0.2 → 7.0.3 - Mend

et_full_system 7.0.2 → 7.0.3

Files changed (7) hide show

checksums.yaml +4 -4
data/Gemfile.lock +1 -1
data/foreman/Procfile +2 -4
data/foreman/traefik.json +144 -204
data/lib/et_full_system/cli/local.rb +24 -12
data/lib/et_full_system/version.rb +1 -1
metadata +5 -5

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28e02d28fadafbdfe820ea506eadfd0ddb8268d7ae7b2b9215dfc7face19d6a
-  data.tar.gz: 67e919b9b84c70345b158afae12cee377152efea6aab0df343add4cd08a2223d
+  metadata.gz: 547c2cae46678baf0823bd64996d3210cffccc6004f7b51d3c7a47c8f2ad9714
+  data.tar.gz: 06eb0eb61df6573e0356277b344bfd06fb620dd7805ea3223ab6bb6dbef920c0
 SHA512:
-  metadata.gz: cc8b3bda5550c5999883898b46bad1a7c85acb8a8de47203173c4eb29947f51c2e20351cba804cd84706eca83ab49221fd7c03c20338124f610d732d8c05af2c
-  data.tar.gz: 4a60462396489b9252454914cf5a89f8a24e2ec35fec139d3db004b3c29a7b239c59f918b207f8d07178b35604bd57a030866da50f65a8d37886bfaf666700eb
+  metadata.gz: 55d4f7379e5a2f533e09e54a4b53cace8be18f11ec477428ab3780633ad4ca310005ed95ee11569cea3a17d1ac94b343d77d4ea3cfd5dfffecd73d63617eac3e
+  data.tar.gz: 16ae911879d8917b07afd1c04cfb3c325a2d696f6c46acce41c4b2ad873135b61ce5562b4972e0488f9f90f19e7ed3a083b03722c0d4ed93299222bdcd137069

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (7.0.2)
+    et_full_system (7.0.3)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
       et_fake_ccd (~> 1.0)

data/foreman/Procfile CHANGED Viewed

@@ -1,4 +1,5 @@
-traefik: bash --login -c "traefik --configfile=${FOREMAN_PATH}/traefik.toml"
+traefik: bash --login -c "traefik --providers.rest=true --providers.rest.insecure=true --api.insecure=true --api.insecure=true --entryPoints.http.address=:3100 --entryPoints.traefik.address=:3200"
+fake_services: bash --login -c "cd ${FS_ROOT_PATH}/support/fake_services && ./bin/foreman start --port 9000"
 et1_web:  export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et1 http://localhost:$FREEPORT && cd systems/et1 && PORT=$FREEPORT ./run.sh"
 et1_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et1  && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env ./run_sidekiq.sh"
 et3_web:  export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et3 http://localhost:$FREEPORT && cd systems/et3 && PORT=$FREEPORT ./run.sh"
@@ -8,7 +9,4 @@ api_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_fo
 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"
 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"
-fake_notify_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/fake_notify.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_notify http://localhost:$FREEPORT && rvm use && gov_fake_notify start --port=$FREEPORT --config=${FOREMAN_PATH}/gov_fake_notify.yaml"
 et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et_ccd_export && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run_sidekiq.sh"

data/foreman/traefik.json CHANGED Viewed

@@ -1,208 +1,148 @@
 {
-  "backends": {
-    "et1": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:5101",
-          "weight": 1
-        }
-      }
-    },
-    "et3": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:5601",
-          "weight": 1
-        }
-      }
-    },
-    "admin": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:7801",
-          "weight": 1
-        }
-      }
-    },
-    "api": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:6501",
-          "weight": 1
-        }
-      }
-    },
-    "atos_api": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:8601",
-          "weight": 1
-        }
-      }
-    },
-    "mail": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:8025",
-          "weight": 1
-        }
-      }
-    },
-    "azure_blob": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:10000",
-          "weight": 1
-        }
-      }
-    },
-    "fake_acas": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:11601",
-          "weight": 1
-        }
-      }
-    },
-    "fake_ccd": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:11602",
-          "weight": 1
-        }
-      }
-    },
-    "fake_notify": {
-      "servers": {
-        "web": {
-          "url": "http://localhost:11603",
-          "weight": 1
-        }
-      }
-    }
-  },
-  "frontends": {
-    "et1": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "et1",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:et1.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "et3": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "et3",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:et3.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "admin": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "admin",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:admin.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "api": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "api",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:api.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "atos_api": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "atos_api",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:atos.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "mail": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "mail",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:mail.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "azure_blob": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "azure_blob",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:azure_blob_storage.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "fake_acas": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "fake_acas",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:acas.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "fake_ccd": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "fake_ccd",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:ccd.et.127.0.0.1.nip.io"
-        }
-      }
-    },
-    "fake_notify": {
-      "entryPoints": [
-        "http"
-      ],
-      "backend": "fake_notify",
-      "passHostHeader": true,
-      "routes": {
-        "test_1": {
-          "rule": "Host:notify.et.127.0.0.1.nip.io"
-        }
+  "http": {
+    "services": {
+      "et1": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:5101"
+          }]
+        }
+      },
+      "et3": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:5601"
+          }]
+        }
+      },
+      "admin": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:7801"
+          }]
+        }
+      },
+      "api": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:6501"
+          }]
+        }
+      },
+      "atos_api": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:8601"
+          }]
+        }
+      },
+      "mail": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:8025"
+          }]
+        }
+      },
+      "azure_blob": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:10000"
+          }]
+        }
+      },
+      "fake_acas": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:9000"
+          }]
+        }
+      },
+      "fake_ccd": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:9100"
+          }]
+        }
+      },
+      "fake_notify": {
+        "loadBalancer": {
+          "servers": [{
+            "url": "http://localhost:9200"
+          }]
+        }
+      }
+    },
+    "routers": {
+      "et1": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "et1",
+        "rule": "Host(`et1.et.127.0.0.1.nip.io`)"
+      },
+      "et3": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "et3",
+        "rule": "Host(`et3.et.127.0.0.1.nip.io`)"
+      },
+      "admin": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "admin",
+        "rule": "Host(`admin.et.127.0.0.1.nip.io`)"
+      },
+      "api": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "api",
+        "rule": "Host(`api.et.127.0.0.1.nip.io`)"
+      },
+      "atos_api": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "atos_api",
+        "rule": "Host(`atos.et.127.0.0.1.nip.io`)"
+      },
+      "mail": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "mail",
+        "rule": "Host(`mail.et.127.0.0.1.nip.io`)"
+      },
+      "azure_blob": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "azure_blob",
+        "rule": "Host(`azure_blob_storage.et.127.0.0.1.nip.io`)"
+      },
+      "fake_acas": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "fake_acas",
+        "rule": "Host(`acas.et.127.0.0.1.nip.io`)"
+      },
+      "fake_ccd": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "fake_ccd",
+        "rule": "Host(`ccd.et.127.0.0.1.nip.io`)"
+      },
+      "fake_notify": {
+        "entryPoints": [
+          "http"
+        ],
+        "service": "fake_notify",
+        "rule": "Host(`notify.et.127.0.0.1.nip.io`)"
       }
     }
-  }
+  }
 }

data/lib/et_full_system/cli/local.rb CHANGED Viewed

@@ -16,6 +16,7 @@ module EtFullSystem
     class RestProviderNotConfigured < RuntimeError; end
     class ServiceUrlIncorrect < RuntimeError; end
+    class ServicesNotConfigured < RuntimeError; end
     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
@@ -54,8 +55,9 @@ module EtFullSystem
       setup_retry_countdown = 10
       begin
-        resp = HTTParty.get "#{options[:base_url]}/api/providers/rest", headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}
-        raise RestProviderNotConfigured if resp.code == 404
+        resp = HTTParty.get "#{options[:base_url]}/api/rawdata", headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}
+        raise RestProviderNotConfigured if resp.code == 404 || resp.parsed_response.dig('routers', 'rest@internal').nil?
+        raise ServicesNotConfigured if resp.parsed_response.dig('routers', 'et1@rest').nil?
       rescue Errno::EADDRNOTAVAIL, Errno::ECONNREFUSED
         connect_retry_countdown -= 1
         if connect_retry_countdown.zero?
@@ -74,6 +76,15 @@ module EtFullSystem
           sleep 5
           retry
         end
+      rescue ServicesNotConfigured
+        setup_retry_countdown -= 1
+        if setup_retry_countdown.zero?
+          raise "Could not find the ET1 router in traefik after 10 retries"
+        else
+          STDERR.puts "Re checking for the ET1 router in traefik in 5 seconds"
+          sleep 5
+          retry
+        end
       end
       STDERR.puts "Support services now ready"
     end
@@ -415,8 +426,8 @@ module EtFullSystem
       connect_retry_countdown = 10
       setup_retry_countdown = 10
       begin
-        resp = HTTParty.get "#{options[:base_url]}/api/providers/rest", headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
-        raise RestProviderNotConfigured if resp.code == 404
+        resp = HTTParty.get "#{options[:base_url]}/api/rawdata", headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
+        raise RestProviderNotConfigured if resp.code == 404 || resp.parsed_response.dig('routers', 'rest@internal').nil?
       rescue Errno::EADDRNOTAVAIL, Errno::ECONNREFUSED
         connect_retry_countdown -= 1
         if !options[:wait]
@@ -442,15 +453,16 @@ module EtFullSystem
       end
       json = resp.parsed_response.dup
-      backend = json['backends'][service]
-      raise "Unknown service called #{service} - valid options are #{json['backends'].keys.join(', ')}" if backend.nil?
+      backend = json.dig('services', "#{service}@rest")
+      raise "Unknown service called #{service} - valid options are #{json['services'].keys.join(', ')}" if backend.nil?
-      container = backend.dig('servers', 'web')
-      raise "The service '#{service}' has no server called 'web' - it must have for this command to work" if container.nil?
+      container = backend.dig('loadBalancer', 'servers')&.first
+      raise "The service '#{service}' has no load balancer with a list of servers - it must have for this command to work" if container.nil?
       if container['url'] != url
         container['url'] = url
-        put_resp = HTTParty.put "#{options[:base_url]}/api/providers/rest", body: json.to_json, headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
+        new_json = { http: json }.to_json.gsub(/@rest/, '')
+        put_resp = HTTParty.put "#{options[:base_url]}/api/providers/rest", body: new_json, headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
         raise "Error from traefik says: #{put_resp.body}" unless (200..299).include? put_resp.code
         validate_rest_backend_url(service, url)
@@ -463,14 +475,14 @@ module EtFullSystem
     def validate_rest_backend_url(service, url)
       retry_countdown = 10
       begin
-        resp = HTTParty.get "#{options[:base_url]}/api/providers/rest", headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
-        raise ServiceUrlIncorrect unless (200..299).include?(resp.code) && resp.parsed_response.dig('backends', service, 'servers', 'web', 'url') == url
+        resp = HTTParty.get "#{options[:base_url]}/api/rawdata", headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
+        raise ServiceUrlIncorrect unless (200..299).include?(resp.code) && resp.parsed_response.dig('services', "#{service}@rest", 'loadBalancer', 'servers')&.first&.fetch('url', nil) == url
         return
       rescue ServiceUrlIncorrect
         retry_countdown -= 1
         raise if retry_countdown.zero?
-        STDERR.puts "Retrying request to validate the url of '#{service}' is '#{url}' in 1 second"
+        STDERR.puts "Retrying request to validate the url of '#{service}' is '#{url}' in 1 second (it was #{resp.parsed_response.dig('services', "#{service}@rest", 'loadBalancer', 'servers')&.first&.fetch('url', nil)})"
         sleep 1
         retry
       end

data/lib/et_full_system/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "7.0.2"
+  VERSION = "7.0.3"
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Gary Taylor
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -173,7 +173,7 @@ homepage: https://github.com/ministryofjustice/et-full-system
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key:
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs
 test_files: []