prima-twig 0.45.3 → 0.45.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ee98bc0c8966ac0ce80c6e0dcbf785c07db3dfffbe5137eff1b5c129d0810e
-  data.tar.gz: a65a4b6360595a5eeea62c34d9ad5e1e00db34a1c8cedd9e194264dacf68132d
+  metadata.gz: 3e1813b58f299f2ac4b6ba60a8b45be80a10123248e92305ac055c5417922087
+  data.tar.gz: 4b592c1ee16c7c2aaf3d0150eb7b4f3a6ee7aefc97df34987f14c597cd7acce1
 SHA512:
-  metadata.gz: 5a5ea16b0b15cda0164c4ae6b0fa0d9b17bda885e87557e367edd57dc7d692d7fdccbf435bbafdfd2bb567186754c2a1ad2c6ee49a581aee33671c078f77fd57
-  data.tar.gz: c7535fc596e79ead6aec40a20af929ae2c98868307c483e7cf77dbc9df2f5c658b32c8fed8833cb891bcc869a49ea0f4d88894a1dec6d7c5588754260114bee9
+  metadata.gz: 680238e9d6d22a63ed6ec0b34a8414d005abe5700624bbe5310ab298841d7b45363974b1121f4b4e8511df55861e5707dae326be1c5a5a931d237f0ac3bb2753
+  data.tar.gz: 5ec7a0ebc08ae73d1b588655de284cdfb31ee2bfd07a8e5c04528c3d585d5eb9275359ffc23f946e52f2e5131865842fbca5a606fc2a88efa3afd6c62b3742b3

data/bin/twig-deploy

@@ -188,13 +188,12 @@ class Review
     artifacts = []
     resp = @s3.list_objects(bucket: @s3_bucket, prefix: 'prima')
     resp.contents.each do |l|
-      # aggiungiamo solo gli artefatti prodotti a partire dal branch master, riconosciuti tramite i metadata
       rev = l.key.match(/^prima\/(\w{15}).tar.gz$/).captures.first if l.key.match(/^prima\/(\w{15}).tar.gz$/)
       if rev
         object = @s3.head_object(bucket: @s3_bucket, key: l.key)
         commit_msg = ''
         commit_msg = Base64.decode64(object.metadata['commit_msg']).strip if object.metadata.has_key? 'commit_msg'
-        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch'], commit_msg: commit_msg } if (object.metadata.has_key? 'branch') && (object.metadata['branch'] == 'master')
+        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch'], commit_msg: commit_msg } if object.metadata.has_key? 'branch'
       end
     end
     artifacts.sort_by { |v| v[:created_at] }.reverse

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
@@ -800,19 +800,19 @@ class Release
         },
         {
           parameter_key: "AssangeHostname",
-          parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+          parameter_value: get_route53_hostname("ecs-task-assange-qa-notneeded")
         },
         {
           parameter_key: "BackofficeHostname",
-          parameter_value: "backoffice-#{@dns_record_identifier}.qa.colaster.com"
+          parameter_value: get_route53_hostname("ecs-task-borat-qa-notneeded")
         },
         {
           parameter_key: "WebHostname",
-          parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+          parameter_value: get_route53_hostname("ecs-task-web-qa-notneeded")
         },
         {
           parameter_key: "WebRiHostname",
-          parameter_value: "wwwri-#{@dns_record_identifier}.qa.colaster.com"
+          parameter_value: "#{get_route53_hostname("webri")}"
         }
       ]
       if stack_exists?(stack_name_web)
@@ -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")
 
@@ -1353,11 +1353,11 @@ class Release
       },
       {
         parameter_key: "WebHost",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-web-qa-notneeded")
       },
       {
         parameter_key: "AssangeHost",
-        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-assange-qa-notneeded")
       }
     ]
     if stack_exists?(stack_name_peano)
@@ -1433,11 +1433,11 @@ class Release
       },
       {
         parameter_key: "WebHost",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname('ecs-task-web-qa-notneeded')
       },
       {
         parameter_key: "AssangeHost",
-        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname('ecs-task-assange-qa-notneeded')
       }
     ]
     if stack_exists?(stack_name_assange)
@@ -1449,6 +1449,12 @@ class Release
 
     stack_name_borat = "ecs-task-borat-qa-#{deploy_id}"
     git_checkout_version('borat', @projects["borat"][:revision])
+    web_qa_host = get_route53_hostname("ecs-task-web-qa-notneeded")
+    borat_qa_host = get_route53_hostname("ecs-task-borat-qa-notneeded")
+    ws_endpoint = "wss://#{borat_qa_host}/socket/websocket?vsn=1.0.0"
+    frontend_endpoint = "https://#{web_qa_host}/"
+    graphql_endpoint = "https://#{borat_qa_host}/graphiql"
+    auth_endpoint = "https://#{borat_qa_host}/auth"
     stack_body = IO.read('projects/borat/deploy/task.yml')
     parameters = [
       {
@@ -1482,6 +1488,22 @@ class Release
       {
         parameter_key: "EnvHash",
         parameter_value: deploy_id
+      },
+      {
+        parameter_key: "WsEndpoint",
+        parameter_value: ws_endpoint
+      },
+      {
+        parameter_key: "GraphqlEndpoint",
+        parameter_value: graphql_endpoint
+      },
+      {
+        parameter_key: "AuthEndpoint",
+        parameter_value: auth_endpoint
+      },
+      {
+        parameter_key: "Frontend",
+        parameter_value: frontend_endpoint
       }
     ]
     if stack_exists?(stack_name_borat)
@@ -1635,19 +1657,19 @@ class Release
       },
       {
         parameter_key: "AssangeHostname",
-        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-assange-qa-notneeded")
       },
       {
         parameter_key: "BackofficeHostname",
-        parameter_value: "backoffice-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-borat-qa-notneeded")
       },
       {
         parameter_key: "WebHostname",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-web-qa-notneeded")
       },
       {
         parameter_key: "WebRiHostname",
-        parameter_value: "wwwri-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: "#{get_route53_hostname("webri")}"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1679,19 +1701,19 @@ class Release
       },
       {
         parameter_key: "AssangeHostname",
-        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-assange-qa-notneeded")
       },
       {
         parameter_key: "BackofficeHostname",
-        parameter_value: "backoffice-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-borat-qa-notneeded")
       },
       {
         parameter_key: "WebHostname",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: get_route53_hostname("ecs-task-web-qa-notneeded")
       },
       {
         parameter_key: "WebRiHostname",
-        parameter_value: "wwwri-#{@dns_record_identifier}.qa.colaster.com"
+        parameter_value: "#{get_route53_hostname("webri")}"
       }
     ]
     if stack_exists?(stack_name_consumer)
@@ -2518,17 +2540,21 @@ 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"
+    stack_name_web = "ecs-task-web-qa-notneeded"
+    web_qa_host = get_route53_hostname(stack_name_web)
+    stack_name_assange = "ecs-task-assange-qa-notneeded"
+    assange_qa_host = get_route53_hostname(stack_name_assange)
+    stack_name_peano = "ecs-task-peano-qa-notneeded"
+    peano_qa_host = "#{get_route53_hostname(stack_name_peano)}:10039"
+    stack_name_borat = "ecs-task-borat-qa-notneeded"
+    borat_qa_host = get_route53_hostname(stack_name_borat)
 
     ws_endpoint = "wss://#{borat_qa_host}/socket/websocket?vsn=1.0.0"
     frontend_endpoint = "https://#{web_qa_host}/"
@@ -2545,7 +2571,7 @@ 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 \
+        "docker-compose run -w $PWD -u root -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 && \
@@ -2570,7 +2596,7 @@ 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 \
+        "docker run -v $PWD:/code -w /code -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 && \
@@ -2592,7 +2618,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
@@ -2631,16 +2657,16 @@ class Release
       end
     end
 
-    # backoffice_qa_host = get_route53_hostname("ecs-task-borat-qa-notneeded")
-    # # backoffice-staging.prima.it
-    # web_qa_host = get_route53_hostname("ecs-task-web-qa-notneeded")
-    # # staging.prima.it
-    # assange_qa_host = get_route53_hostname("ecs-task-assange-qa-notneeded")
-    # # assange-staging.prima.it
-    # if minimal
-    #   backoffice_qa_host = 'backoffice-staging.prima.it'
-    #   assange_qa_host = 'assange-staging.prima.it'
-    # end
+    backoffice_qa_host = get_route53_hostname("ecs-task-borat-qa-notneeded")
+    # backoffice-staging.prima.it
+    web_qa_host = get_route53_hostname("ecs-task-web-qa-notneeded")
+    # staging.prima.it
+    assange_qa_host = get_route53_hostname("ecs-task-assange-qa-notneeded")
+    # assange-staging.prima.it
+    if minimal
+      backoffice_qa_host = 'backoffice-staging.prima.it'
+      assange_qa_host = 'assange-staging.prima.it'
+    end
 
     if @qainit
       exec_step 'mv docker-compose-ci.yml docker-compose.yml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.45.3
+  version: 0.45.04
 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.7.6
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt