prima-twig 0.53.54 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b894019b11979ad1b9331a53550d10686bcdee7fa995d5e736eeff2e27be1d
-  data.tar.gz: a8315fd4c39f178b45316a2a7b260a8f40e911cff333169ac48aed1b591d00d2
+  metadata.gz: 61807be7809c528567d30d500107fdbeb05a322bbc808b8d77b1a95d9cc12c12
+  data.tar.gz: 5b6eb7942aa9dbf7e871ba9dd6d3f129f582175a69239427b19a0854a6da10dd
 SHA512:
-  metadata.gz: 5570d5fa710be5e757733535ba8152af03c8ea8bdfd552197722f49da3a34cf67cdf5406b13108fc1a201e8ce8a651cf67df027d54e03e51ed3de7a777135ec0
-  data.tar.gz: 3c8ecbf268e77d21429e52145bbea9e56dc28add489278587ff877bc47781c32a5b1e92f76b9c94daf7b1781bbde904a0c59700d97e317ed6d99ab25c8eee882
+  metadata.gz: 36cdb80b9d23d59c882967e8c1fe41effadb7ae9ade1a609754294f6032e8c20a00119cacde152d99b516ebee07c0150936380cf14955deb8ca7371053a210aa
+  data.tar.gz: 4894bf1d737275cd45a094b528f01817a5aa20f83747acd2f1510c1ded4fa4747f4a831b376faa5a6403755fc25cacbc0c4a815091c92ca38f26c789023ad363

data/bin/twig-feature

@@ -31,7 +31,7 @@ class Release
     @s3 = Aws::S3::Client.new
     @s3_bucket = 'prima-artifacts'
     @artifact_path = '/tmp/prima-artifact.zip'
-    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-1BXH13XEVLPP0:1'
+    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-1ELQ2B0YCR1U:1'
     @cf_role = 'arn:aws:iam::001575623345:role/qainit-service-role-cloudformat-CloudformationRole-18KBZQIS148R9'
     @dns_record_identifier = nil
     @ecs_cluster_name = nil
@@ -57,8 +57,7 @@ class Release
       'rachele' => {},
       'leftorium' => {},
       'pyxis-npm' => {},
-      'starsky' => {},
-      'hutch' => {}
+      'starsky' => {}
     }
     @base_stack_name_alb = 'ecs-alb-http-public-qa-'
     @base_stack_name_alb_ws = 'ecs-alb-ws-public-qa-'
@@ -72,7 +71,7 @@ class Release
     when 'finish'
       finish_feature!
     when 'qainit'
-      abort('Non sei nella cartella di qainit') unless Dir.pwd.match 'qainit$' or Dir.pwd.match '/drone/src'
+      abort('Non sei nella cartella di qainit') unless Dir.pwd.match 'qainit$'
       if ['terminate', 'stop', 'shutdown', 'halt', 'destroy'].include? args[1]
         qainit_deploy_shutdown!
       elsif 'update' == args[1]
@@ -471,7 +470,7 @@ class Release
   end
 
   def qainit_deploy!(quiet = false)
-    `git checkout master && git pull && git submodule update --init --recursive && git remote prune origin`
+    `git checkout master && git pull && git remote prune origin`
 
     default_name = get_default_branch_name @projects
     feature_number = ''
@@ -664,8 +663,9 @@ class Release
   end
 
   def qainit_write_output(file_message, output_message)
-    `mkdir -p /etc/qainit-output`
-    qa_file_name = "/etc/qainit-output/url_qa"
+    `mkdir -p /drone/src/github.com/project/primait/qainit/#{ENV["DRONE_BRANCH"]}`
+    qa_file_name = "/drone/src/github.com/project/primait/qainit/#{ENV["DRONE_BRANCH"]}/output"
+    File.open(qa_file_name, 'w') { |file| file.write(file_message) }
     File.open(qa_file_name + '.txt', 'w') { |file| file.write(file_message) }
     output "#{output_message} #{qa_file_name}".green
   end
@@ -852,14 +852,6 @@ class Release
       {
         parameter_key: "WebHostname",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
-      },
-      {
-        parameter_key: "FePrimaDomain",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
-      },
-      {
-        parameter_key: "HostnamePattern",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -980,7 +972,6 @@ class Release
     create_leftorium_artifact(@projects["leftorium"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/leftorium/#{@projects["leftorium"][:revision]}-qa.tar.gz")
     create_skynet_artifact(@projects["skynet"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/skynet/#{@projects["skynet"][:revision]}-qa.tar.gz")
     create_starsky_artifact(@projects["starsky"][:revision]) unless !deploy_starsky_hutch? || artifact_exists?('prima-artifacts-encrypted', "microservices/starsky/#{@projects["starsky"][:revision]}-qa.tar.gz")
-    create_hutch_artifact(@projects["hutch"][:revision]) unless !deploy_starsky_hutch? || artifact_exists?('prima-artifacts-encrypted', "microservices/hutch/#{@projects["hutch"][:revision]}-qa.tar.gz")
 
     wait_for_db_import(db_task) unless stack_exists?("ecs-route53-qa-#{deploy_id}") # dovrebbe essere istantaneo
 
@@ -1063,10 +1054,6 @@ class Release
       {
         parameter_key: 'StarskyElbHostname',
         parameter_value: get_alb_host(stack_name_alb)
-      },
-      {
-        parameter_key: 'HutchElbHostname',
-        parameter_value: get_alb_host(stack_name_alb)
       }
     ]
 
@@ -1774,14 +1761,6 @@ class Release
       {
         parameter_key: "WebHostname",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
-      },
-      {
-        parameter_key: "FePrimaDomain",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
-      },
-      {
-        parameter_key: "HostnamePattern",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1822,14 +1801,6 @@ class Release
       {
         parameter_key: "WebHostname",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
-      },
-      {
-        parameter_key: "FePrimaDomain",
-        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
-      },
-      {
-        parameter_key: "HostnamePattern",
-        parameter_value: "consumer-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_consumer)
@@ -1875,55 +1846,6 @@ class Release
       create_stack(stack_name_roger, stack_body, parameters, tags, @cf_role)
     end
 
-
-    if deploy_starsky_hutch?
-      wait_for_stack_ready(stack_name_starsky) unless stack_ready?(stack_name_starsky) unless !deploy_starsky_hutch?
-
-      stack_name_hutch = "ecs-task-hutch-qa-#{deploy_id}"
-      git_checkout_version('hutch', @projects["hutch"][:revision])
-      stack_body = File.read('projects/hutch/deploy/task.yml')
-      parameters = [
-        {
-          parameter_key: "Environment",
-          parameter_value: "qa"
-        },
-        {
-          parameter_key: "ReleaseVersion",
-          parameter_value: "#{@projects["hutch"][:revision]}"
-        },
-        {
-          parameter_key: "ALBShortName",
-          parameter_value: "hutch-qa-#{deploy_id}"[0..27]
-        },
-        {
-          parameter_key: "ECSClusterName",
-          parameter_value: @ecs_cluster_name
-        },
-        {
-          parameter_key: "EnvHash",
-          parameter_value: deploy_id
-        },
-        {
-          parameter_key: "HostnamePattern",
-          parameter_value: "hutch-#{@dns_record_identifier}.qa.colaster.com"
-        },
-        {
-          parameter_key: "HostnamePatternPriority",
-          parameter_value: (hostname_pattern_priority.to_i + 254).to_s
-        },
-        {
-          parameter_key: "StarskyUrl",
-          parameter_value: "https://#{get_route53_hostname('ecs-task-starsky-qa-notneeded')}"
-        }
-      ]
-      if stack_exists?(stack_name_hutch)
-        cur_version = get_currently_deployed_version(stack_name_hutch)
-        update_stack(stack_name_hutch, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["hutch"][:revision])
-      else
-        create_stack(stack_name_hutch, stack_body, parameters, tags, @cf_role)
-      end
-    end
-
     wait_for_stack_ready(stack_name_web) unless stack_ready?(stack_name_web)
     wait_for_stack_ready(stack_name_consumer) unless stack_ready?(stack_name_consumer)
     wait_for_stack_ready(stack_name_ermes) unless stack_ready?(stack_name_ermes)
@@ -1933,7 +1855,7 @@ class Release
     wait_for_stack_ready(stack_name_borat) unless stack_ready?(stack_name_borat)
     wait_for_stack_ready(stack_name_activia) unless stack_ready?(stack_name_activia)
     wait_for_stack_ready(stack_name_crash) unless stack_ready?(stack_name_crash) unless !deploy_crash?
-    wait_for_stack_ready(stack_name_hutch) unless stack_ready?(stack_name_hutch) unless !deploy_starsky_hutch?
+    wait_for_stack_ready(stack_name_starsky) unless stack_ready?(stack_name_starsky) unless !deploy_starsky_hutch?
 
     update_service_defaults(stack_name_web)
     update_service_defaults(stack_name_consumer)
@@ -1951,7 +1873,6 @@ class Release
     update_service_defaults(stack_name_leftorium)
     update_service_defaults(stack_name_rachele)
     update_service_defaults(stack_name_starsky) unless !deploy_starsky_hutch?
-    update_service_defaults(stack_name_hutch) unless !deploy_starsky_hutch?
     update_service_defaults(stack_name_crash) unless !deploy_crash?
 
     activia_hostname = get_route53_hostname(stack_name_activia)
@@ -1970,7 +1891,6 @@ class Release
     rachele_hostname = get_route53_hostname(stack_name_rachele)
     crash_hostname = get_route53_hostname(stack_name_crash) unless !deploy_crash?
     starsky_hostname = get_route53_hostname(stack_name_starsky) unless !deploy_starsky_hutch?
-    hutch_hostname = get_route53_hostname(stack_name_hutch) unless !deploy_starsky_hutch?
 
     # launch_marley ec2_ip_address(asg_stack_name), prima_hostname, borat_hostname
 
@@ -1992,8 +1912,7 @@ class Release
     projects_text.concat "
 > Crash url: https://#{crash_hostname}" if deploy_crash?
     projects_text.concat "
-> Starsky url: https://#{starsky_hostname}
-> Hutch url: https://#{hutch_hostname}" if deploy_starsky_hutch?
+> Starsky url: https://#{starsky_hostname}" if deploy_starsky_hutch?
     projects_text.concat "
 > RabbitMQ url: http://#{ec2_ip_address(asg_stack_name)}:15672
 > Supervisor url: http://#{ec2_ip_address(asg_stack_name)}:9001
@@ -2039,8 +1958,6 @@ class Release
       host = "rachele-#{@dns_record_identifier}.qa.colaster.com"
     when stack_name.include?('starsky')
       host = "starsky-#{@dns_record_identifier}.qa.colaster.com"
-    when stack_name.include?('hutch')
-      host = "hutch-#{@dns_record_identifier}.qa.colaster.com"
     end
     host
   end
@@ -2097,8 +2014,6 @@ class Release
       logical_resource_id = 'EcsApplicationLoadBalancerInternal'
     when stack_name.include?('starsky')
       logical_resource_id = 'EcsApplicationLoadBalancerPublic'
-    when stack_name.include?('hutch')
-      logical_resource_id = 'EcsApplicationLoadBalancerPublic'
     end
     resp = @cf.describe_stack_resource({
       stack_name: stack_name,
@@ -2115,7 +2030,7 @@ class Release
     when stack_name.include?('web')
       logical_resource_id = 'ECSServiceWebQA'
     when stack_name.include?('consumer')
-      logical_resource_id = 'ECSServiceConsumerQa'
+      logical_resource_id = 'ECSServiceConsumer'
     when stack_name.include?('urania')
       logical_resource_id = 'ECSServiceUraniaQA'
     when stack_name.include?('backoffice')
@@ -2150,8 +2065,6 @@ class Release
       logical_resource_id = 'ECSServiceCrashQA'
     when stack_name.include?('starsky')
       logical_resource_id = 'ECSServiceStarskyQA'
-    when stack_name.include?('hutch')
-      logical_resource_id = 'ECSServiceHutch'
     else
       raise "Service name non gestito per lo stack #{stack_name}"
     end
@@ -2313,28 +2226,23 @@ class Release
 
     `mv docker-compose-ci.yml docker-compose.yml`
     exec_step 'prepare-docker-compose --directory crash && cp docker-compose-qainit.yml docker-compose.yml'
-
-    if File.exists? 'deploy/build_qa_artifact'
-      `deploy/build_qa_artifact #{deploy_id}`
-    else # TODO remove when deploy/build_qa_artifact is merged
-      [
-        'docker-compose build web',
-        "docker-compose run -w $PWD -u root -e MIX_ENV=qa -e ENV_HASH=#{deploy_id} web \
-        '-c' 'mix local.hex --force && mix hex.info && \
-        mix deps.get && \
-        cd assets && \
-        yarn --cache-folder ~/.cache/yarn && \
-        NODE_ENV=production sysconfcpus -n 1 yarn run build && \
-        cd ../ && \
-        mix release.clean --implode --no-confirm && \
-        mix phx.digest && \
-        mix deps.clean --all && \
-        mix deps.get && \
-        mix compile && mix release --env=qa'",
-        'docker-compose down'
-      ].each do |cmd|
-        execute_command cmd
-      end
+    [
+      'docker-compose build web',
+      "docker-compose run -w $PWD -u root -e MIX_ENV=qa -e ENV_HASH=#{deploy_id} web \
+      '-c' 'mix local.hex --force && mix hex.info && \
+      mix deps.get && \
+      cd assets && \
+      yarn --cache-folder ~/.cache/yarn && \
+      NODE_ENV=production sysconfcpus -n 1 yarn run build && \
+      cd ../ && \
+      mix release.clean --implode --no-confirm && \
+      mix phx.digest && \
+      mix deps.clean --all && \
+      mix deps.get && \
+      mix compile && mix release --env=qa'",
+      'docker-compose down'
+    ].each do |cmd|
+      execute_command cmd
     end
 
     cleanup_containers
@@ -2373,7 +2281,6 @@ class Release
       MIX_ENV=dev mix compile.sms && \
       MIX_ENV=dev mix compile.html && \
       MIX_ENV=dev mix compile.heml && \
-      MIX_ENV=dev mix compile.app_notification && \
       rm -rf _build/qa/rel/ && \
       mix release --env=qa'"
     ].each do |cmd|
@@ -2450,41 +2357,6 @@ class Release
     Dir.chdir '../../'
   end
 
-  def create_hutch_artifact(revision)
-    output "Preparo l'artifact hutch\n".yellow
-
-    git_checkout_version('hutch', revision)
-
-    Dir.chdir 'projects/hutch'
-
-    version = `git rev-parse HEAD`
-
-    decrypt_secrets() unless File.exist?('config/secrets.yml')
-
-    exec_step 'git submodule update'
-    exec_step 'cp docker-compose-ci.yml docker-compose.yml'
-    exec_step 'prepare-docker-compose --directory hutch && cp docker-compose-qainit.yml docker-compose.yml'
-    exec_step "sed s/qa_deploy_id/#{get_deploy_id}/ .env.dist.qa"
-    exec_step "cp .env.dist.qa .env"
-    exec_step "rm -fr peano"
-
-    [
-      "sed -i 's/USER app/USER root/g' Dockerfile",
-      "docker-compose build web",
-      "docker-compose run -w $PWD -u root -e ELM_APP_STARSKY_URL=https://#{get_route53_hostname("starsky")} --entrypoint /bin/sh web \
-      '-c' 'yarn && yarn run build \
-      && tar cfz #{revision}-qa.tar.gz *'"
-    ].each do |cmd|
-      execute_command cmd
-    end
-
-    artifact_path = "./#{revision}-qa.tar.gz"
-
-    upload_artifact(artifact_path, "microservices/hutch/#{revision}-qa.tar.gz", "#{@s3_bucket}-encrypted")
-
-    Dir.chdir '../../'
-  end
-
   def create_leftorium_artifact(revision)
     output "Preparo l'artifact leftorium .zip\n".yellow
 
@@ -2526,20 +2398,15 @@ class Release
 
     exec_step 'cp docker-compose.yml docker-compose-ci.yml'
     exec_step 'prepare-docker-compose --directory peano && cp docker-compose-qainit.yml docker-compose.yml'
-
-    if File.exists? 'deploy/build_qa_artifact'
-      `deploy/build_qa_artifact`
-    else # TODO remove when deploy/build_qa_artifact is merged
-      [
-        "docker-compose build web",
-        "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 && mix compile && mix deps.compile && \
-        rm -rf _build/qa/rel/ && \
-        mix release --env=qa'"
-      ].each do |cmd|
-        execute_command cmd
-      end
+    [
+      "docker-compose build web",
+      "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 && mix compile && mix deps.compile && \
+      rm -rf _build/qa/rel/ && \
+      mix release --env=qa'"
+    ].each do |cmd|
+      execute_command cmd
     end
 
     cleanup_containers
@@ -2666,7 +2533,7 @@ class Release
       mix deps.get && mix compile && mix deps.compile && \
       mix phx.digest && \
       rm -rf _build/qa/rel/ && \
-      mix distillery.release --env=qa'"
+      mix release --env=qa'"
     ].each do |cmd|
       execute_command cmd
     end
@@ -2740,21 +2607,18 @@ class Release
 
     decrypt_secrets() unless File.exist?('config/secrets.yml')
 
-    `mv docker-compose-ci.yml docker-compose.yml`
+    exec_step 'cp docker-compose.yml docker-compose-ci.yml'
     exec_step 'prepare-docker-compose --directory starsky && cp docker-compose-qainit.yml docker-compose.yml'
     exec_step "sed s/qa_deploy_id/#{get_deploy_id}/ .env.dist.qa"
     exec_step "cp .env.dist.qa .env"
 
     [
       "sed -i 's/USER app/USER root/g' Dockerfile",
-      "if echo `docker network ls` | grep peano_default; \
-         then echo 'peano_default network already existing'; \
-          else docker network create peano_default; fi",
       "docker-compose build web",
-      "docker-compose run -w $PWD -e BUILD_ENV=qa -u root --entrypoint /bin/sh web \
-      '-c' 'cargo build --release -vv --features=qa \
-      && cargo build --bin migrate --release --features=qa \
-      && cargo build --bin rabbit_worker --release --features=qa \
+      "docker-compose run -w $PWD -u root --entrypoint /bin/sh web \
+      '-c' 'cargo build --release -vv \
+      && cargo build --bin migrate --release \
+      && cargo build --bin rabbit_worker --release \
       && cp -p target/release/starsky . \
       && cp -p target/release/migrate . \
       && cp -p target/release/rabbit_worker . \
@@ -2822,8 +2686,8 @@ class Release
 
   def deploy_starsky_hutch?
     starsky_present = !@projects['starsky'].nil? && !@projects['starsky'].empty? && @projects['starsky'][:name] != 'master' && !@projects['starsky'][:default_branch]
-    hutch_present = !@projects['hutch'].nil? && !@projects['hutch'].empty? && @projects['hutch'][:name] != 'master' && !@projects['hutch'][:default_branch]
-    starsky_present || hutch_present
+    #hutch_present = !@projects['hutch'].empty? && @projects['hutch'][:name] != 'master' && !@projects['hutch'][:default_branch]
+    starsky_present #|| hutch_present TODO REMOVE
   end
 
   def get_pyxis_version(deploy_id)
@@ -2960,7 +2824,7 @@ class Release
   end
 
   def choose_branch_to_deploy(project_name, select_master = false)
-    return {name: 'master', revision: '399653d555b8864', committer: 'crash@prima.it', default_branch: true} if project_name == 'crash' && select_master
+    return {} if project_name == 'crash' && select_master
     Dir.chdir "projects/#{project_name}"
     output "Recupero la lista dei branch del progetto #{project_name}..."
     `git remote prune origin`

data/bin/twig-update-ami

@@ -150,7 +150,7 @@ class TwigUpdateAmi
   end
 
   def update_packer(json_filename)
-    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -var drone_key=\"`biscuit get -f ../configs/secrets/common.yml drone_license_key`\" -machine-readable ./#{json_filename} | tee build.log"
+    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -machine-readable ./#{json_filename} | tee build.log"
     `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.53.54
+  version: 0.54.0
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -214,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt