prima-twig 0.45.10 → 0.45.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 90beac11f37b84147422f494bafaa448f6a53d8bda7953404d3afa87f1087a5f
-  data.tar.gz: '08fc4713c4d2a63aaa35de86b4c784d3a515859105f0669aabafa5badf312182'
+SHA1:
+  metadata.gz: 5d3296dc9bf035c53000f131e42189a3c5c32232
+  data.tar.gz: 39667f908648b02e02d264dbd2ec3e59d9480b6e
 SHA512:
-  metadata.gz: 3d1547584d1f6997cc49fcb3f570d5fba6c43725e3345a2ec5d7c6e7fdd6497557620accc21baf7fd34c98beeb41e4bde3bad5a44f559e34cc975a1e2288ebc1
-  data.tar.gz: db8d75cf0b732d56d1286d41efd2c15cd672f56609df70f1536c97f0c788c1e49f848c75a242b8e29780d0183e64abdf8d4311c19cb6220f1a029ed78b386c24
+  metadata.gz: 257e7d51729008eb0d7d6e6f61df1cca5cbd592b45d64e069f40ae59de430113fb40954484985c8b1973214e4a62538aa7d99ed99a759824879db5e21ba66ca9
+  data.tar.gz: 26fde59a70e08b8d2f02100cbb75a20125db0cdcc584032b16c192459f39f48225d66014a8c73d1e52eb906988196a62c4ffdfcb4c6a0c88f008eceace9b44f3

data/bin/twig-feature

@@ -724,7 +724,7 @@ class Release
 
     case project
     when 'prima'
-      create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name], true) unless artifact_exists?('prima-artifacts-encrypted', "prima/#{@projects["prima"][:revision]}.tar.gz")
+      create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name], deploy_id, true) unless artifact_exists?('prima-artifacts-encrypted', "prima/#{@projects["prima"][:revision]}-#{deploy_id}.tar.gz")
     when 'crash'
       create_crash_artifact(@projects['crash'][:revision], deploy_id, true) unless artifact_exists?('prima-artifacts-encrypted', "microservices/crash/#{@projects['crash'][:revision]}-#{deploy_id}-qa.tar.gz")
     end
@@ -1015,7 +1015,7 @@ class Release
     create_peano_artifact(@projects["peano"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/peano/#{@projects["peano"][:revision]}-qa.tar.gz")
     create_rogoreport_artifact(@projects["rogoreport"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/rogoreport/rogoreport_qa-#{@projects["rogoreport"][:revision]}-qa.tar.gz")
     create_assange_artifact(@projects["assange"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/assange/#{@projects["assange"][:revision]}-qa.tar.gz")
-    create_borat_artifact(@projects["borat"][:revision], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "microservices/borat/#{@projects["borat"][:revision]}-#{deploy_id}-qa.tar.gz")
+    create_borat_artifact(@projects["borat"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/borat/#{@projects["borat"][:revision]}-qa.tar.gz")
     create_activia_artifact(@projects["activia"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/activia/#{@projects["activia"][:revision]}-qa.tar.gz")
     create_skynet_artifact(@projects["skynet"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/skynet/#{@projects["skynet"][:revision]}-qa.tar.gz")
 
@@ -1457,7 +1457,7 @@ class Release
       },
       {
         parameter_key: "ReleaseVersion",
-        parameter_value: "#{@projects["borat"][:revision]}-#{deploy_id}"
+        parameter_value: "#{@projects["borat"][:revision]}"
       },
       {
         parameter_key: "ECSClusterName",
@@ -1482,6 +1482,22 @@ class Release
       {
         parameter_key: "EnvHash",
         parameter_value: deploy_id
+      },
+      {
+        parameter_key: "WsEndpoint",
+        parameter_value: "wss://backoffice-#{@dns_record_identifier}.qa.colaster.com/socket/websocket?vsn=1.0.0"
+      },
+      {
+        parameter_key: "GraphqlEndpoint",
+        parameter_value: "https://backoffice-#{@dns_record_identifier}.qa.colaster.com/graphiql"
+      },
+      {
+        parameter_key: "AuthEndpoint",
+        parameter_value: "https://backoffice-#{@dns_record_identifier}.qa.colaster.com/auth"
+      },
+      {
+        parameter_key: "FrontendEndpoint",
+        parameter_value: "https://www-#{@dns_record_identifier}.qa.colaster.com/"
       }
     ]
     if stack_exists?(stack_name_borat)
@@ -2518,23 +2534,13 @@ class Release
     Dir.chdir '../../'
   end
 
-  def create_borat_artifact(revision, deploy_id)
+  def create_borat_artifact(revision)
     output "Preparo l'artifact borat .zip\n".yellow
 
     git_checkout_version('borat', revision)
 
     Dir.chdir 'projects/borat'
 
-    web_qa_host = "www-#{@dns_record_identifier}.qa.colaster.com"
-    assange_qa_host = "assange-#{@dns_record_identifier}.qa.colaster.com"
-    peano_qa_host = "peano-#{@dns_record_identifier}.qa.colaster.com"
-    borat_qa_host = "backoffice-#{@dns_record_identifier}.qa.colaster.com"
-
-    ws_endpoint = "wss://#{borat_qa_host}/socket/websocket?vsn=1.0.0"
-    frontend_endpoint = "https://#{web_qa_host}/"
-    graphiql_endpoint = "https://#{borat_qa_host}/graphiql"
-    auth_endpoint = "https://#{borat_qa_host}/auth"
-
     stop_unless is_branch_compatible_with_current_twig_version?("borat"), "Il tuo branch del progetto borat non e' compatibile con questa versione di twig, devi REBASARE DA MASTER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!".red
 
     decrypt_secrets()
@@ -2545,12 +2551,8 @@ class Release
       [
         "docker network create borat_network || true",
         "docker-compose build web",
-        "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e GRAPHQL_ENDPOINT=#{graphiql_endpoint} -e AUTH_ENDPOINT=#{auth_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh web \
-        '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
-        sed -i \"s/assange-qa-host/#{assange_qa_host}/g\" config/qa.exs && \
-        sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
-        sed -i \"s/borat-qa-host/#{borat_qa_host}/g\" config/qa.exs && \
-        mix local.hex --force && mix hex.info && \
+        "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
+        '-c' 'mix local.hex --force && mix hex.info && \
         mix deps.get && \
         cd assets && \
         yarn --cache-folder ~/.cache/yarn && \
@@ -2570,12 +2572,8 @@ class Release
       [
         "docker network create borat_network || true",
         "docker-compose build web",
-        "docker run -v $PWD:/code -w /code -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e GRAPHQL_ENDPOINT=#{graphiql_endpoint} -e AUTH_ENDPOINT=#{auth_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh web \
-        '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
-        sed -i \"s/assange-qa-host/#{assange_qa_host}/g\" config/qa.exs && \
-        sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
-        sed -i \"s/borat-qa-host/#{borat_qa_host}/g\" config/qa.exs && \
-        mix local.hex --force && mix hex.info && \
+        "docker run -v $PWD:/code -w /code -e MIX_ENV=qa --entrypoint /bin/sh web \
+        '-c' 'mix local.hex --force && mix hex.info && \
         mix deps.get && \
         cd assets && \
         yarn --cache-folder ~/.cache/yarn && \
@@ -2592,7 +2590,7 @@ class Release
     end
 
     artifact_path = Dir.glob("_build/qa/rel/borat/releases/*/borat.tar.gz").first
-    upload_artifact(artifact_path, "microservices/borat/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
+    upload_artifact(artifact_path, "microservices/borat/#{revision}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
   end
@@ -2872,7 +2870,7 @@ class Release
     when project == 'assange'
       File.readlines("deploy/deploy").grep(/HOSTNAME_PATTERN/).size > 0
     when project == 'borat'
-      File.readlines("deploy/deploy").grep(/HOSTNAME_PATTERN/).size > 0
+      File.readlines("deploy/task.yml").grep(/WsEndpoint/).size > 0
     when project == 'crash'
       File.readlines("deploy/deploy").grep(/HOSTNAME_PATTERN/).size > 0
     when project == 'ermes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.45.10
+  version: 0.45.11
 platform: ruby
 authors:
 - Matteo Giachino
@@ -213,7 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt