prima-twig 0.50.54 → 0.50.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2279c9d6f9f6abe9ec3f065b979ce2ff5a7c7ab3012e10de846a9be887a3c7c0
-  data.tar.gz: d86f653178260b80338668e40292b2cc3c5fc2169358ef40af965784638049ff
+  metadata.gz: 6a317427d8667b23ef578a60440e92061269248f6db0c3cc71610784c84da2d3
+  data.tar.gz: 6b0a03b49143df96645a30bf2ad28ee6fea7f9d88cfcea6c8f0c5221f10f0c90
 SHA512:
-  metadata.gz: 508ad908f77db08988c1fb5df340c02ed8f999bce16b968e0cc6784f7e65899346f83fff9cb796bc232c779f275ac747c6c8cd2fcf871c80bfbaf3fcf2648947
-  data.tar.gz: 779ac1745991c9a2919f627b07f8d5a61859e069c1c70369c2377d1a346f23ba77026b6bb64778ca87228bdd6066f081708ed8ae15cfdf5a04443ce2602d7c97
+  metadata.gz: d1ec12fe9b1110eafc3c9700263e001ded09bd33bd564830f60cff9e5b71e28aba17fe1c43f26149e92b3717b9c314ced9b49f9825170e6178e6783f3bdd47f4
+  data.tar.gz: ddc5df36197055005a13626dc398742f03806d978a56a687e94900f8b66bf53ff666d0f8625de0146a91e4099543876e952e45b6ab7fc7f735332abfb8a8c5c6

data/bin/twig-deploy

@@ -142,23 +142,9 @@ class Review
     mail.delivery_method(:smtp, opts)
     mail.deliver
 
-    invalidate_prismic_cache
-
     exec_step "terminal-notifier -message 'Deploy terminato'" if which 'terminal-notifier'
   end
 
-  def invalidate_prismic_cache
-    [
-      "guarantee",
-      "glossary",
-      "guide",
-      "faq"
-    ].each do |page|
-
-      exec_step "curl -X POST -H \"Content-Type: application/json\" https://www.prima.it/api/cms/update/#{page}?apikey=#{@prima.config['prima_apikey']}"
-    end
-  end
-
   def reload_parameters!
     artifact_rev = ''
     resp = @cf.describe_stacks({

data/bin/twig-feature

@@ -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]
@@ -719,7 +718,7 @@ class Release
 
   def qainit_drone_minimal_deploy!
     # tenere solo il project da deployare (l'unico project è prima)
-    @ami_id = "ami-00884fac276f27392"
+    @ami_id = get_ami_id("ecs-fleet-allinone-staging")
     project = ''
     @projects.each_key do |project_key|
       if @projects[project_key][:revision]
@@ -878,7 +877,7 @@ class Release
 
   def deploy_feature!
     `git pull && git submodule init && git submodule update`
-    @ami_id = "ami-00884fac276f27392"
+    @ami_id = get_ami_id("ecs-fleet-allinone-staging")
     deploy_id = get_deploy_id
     stack_name_alb = 'ecs-alb-http-public-qa-' + deploy_id[0..5]
     stack_name_alb_ws = 'ecs-alb-ws-public-qa-' + deploy_id[0..5]
@@ -903,11 +902,8 @@ class Release
       }
     ]
     @projects.each do |key, value|
-      case key.to_s
-      when 'crash'
+      if key.to_s == 'crash'
         tags << { key: 'crash', value: @projects['crash'][:name] } if deploy_crash?
-      when 'starsky', 'hutch'
-        tags << { key: key.to_s, value: @projects[key.to_s][:name] } if deploy_starsky_hutch?
       else
         tags << { key: key, value: value[:name] }
       end
@@ -972,8 +968,7 @@ class Release
     create_activia_artifact(@projects["activia"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/activia/#{@projects["activia"][:revision]}-qa.tar.gz")
     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")
+    create_starsky_artifact(@projects["starsky"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/starsky/#{@projects["starsky"][:revision]}-qa.tar.gz")
 
     wait_for_db_import(db_task) unless stack_exists?("ecs-route53-qa-#{deploy_id}") # dovrebbe essere istantaneo
 
@@ -1052,14 +1047,6 @@ class Release
       {
         parameter_key: 'CrashElbHostname',
         parameter_value: get_alb_host(stack_name_alb_ws)
-      },
-      {
-        parameter_key: 'StarskyElbHostname',
-        parameter_value: get_alb_host(stack_name_alb)
-      },
-      {
-        parameter_key: 'HutchElbHostname',
-        parameter_value: get_alb_host(stack_name_alb)
       }
     ]
 
@@ -1612,50 +1599,40 @@ class Release
       end
     end
 
-    if deploy_starsky_hutch?
-      stack_name_starsky = "ecs-task-starsky-qa-#{deploy_id}"
-      git_checkout_version('starsky', @projects["starsky"][:revision])
-      stack_body = IO.read('projects/starsky/deploy/task.yml')
-      parameters = [
-        {
-          parameter_key: "Environment",
-          parameter_value: "qa"
-        },
-        {
-          parameter_key: "ReleaseVersion",
-          parameter_value: "#{@projects["starsky"][:revision]}"
-        },
-        {
-          parameter_key: "TaskDesiredCount",
-          parameter_value: "1"
-        },
-        {
-          parameter_key: "ECSClusterName",
-          parameter_value: @ecs_cluster_name
-        },
-        {
-          parameter_key: "ALBShortName",
-          parameter_value: "starsky-qa-#{deploy_id}"[0..27]
-        },
-        {
-          parameter_key: "EnvHash",
-          parameter_value: deploy_id
-        },
-        {
-          parameter_key: "HostnamePattern",
-          parameter_value: "starsky-#{@dns_record_identifier}.qa.colaster.com"
-        },
-        {
-          parameter_key: "HostnamePatternPriority",
-          parameter_value: (hostname_pattern_priority.to_i + 74).to_s
-        }
-      ]
-      if stack_exists?(stack_name_starsky)
-        cur_version = get_currently_deployed_version(stack_name_starsky)
-        update_stack(stack_name_starsky, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["starsky"][:revision])
-      else
-        create_stack(stack_name_starsky, stack_body, parameters, tags, @cf_role)
-      end
+    stack_name_starsky = "ecs-task-starsky-qa-#{deploy_id}"
+    git_checkout_version('starsky', @projects["starsky"][:revision])
+    stack_body = IO.read('projects/starsky/deploy/task.yml')
+    parameters = [
+      {
+        parameter_key: "Environment",
+        parameter_value: "qa"
+      },
+      {
+        parameter_key: "ReleaseVersion",
+        parameter_value: "#{@projects["rogoreport"][:revision]}"
+      },
+      {
+        parameter_key: "TaskDesiredCount",
+        parameter_value: "1"
+      },
+      {
+        parameter_key: "ECSClusterName",
+        parameter_value: @ecs_cluster_name
+      },
+      {
+        parameter_key: "HostnamePattern",
+        parameter_value: "starsky-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "HostnamePatternPriority",
+        parameter_value: hostname_pattern_priority
+      }
+    ]
+    if stack_exists?(stack_name_starsky)
+      cur_version = get_currently_deployed_version(stack_name_starsky)
+      update_stack(stack_name_starsky, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["starsky"][:revision])
+    else
+      create_stack(stack_name_starsky, stack_body, parameters, tags, @cf_role)
     end
 
     stack_name_activia = "ecs-task-activia-qa-#{deploy_id}"
@@ -1852,55 +1829,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)
@@ -1910,7 +1838,6 @@ 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?
 
     update_service_defaults(stack_name_web)
     update_service_defaults(stack_name_consumer)
@@ -1927,8 +1854,6 @@ class Release
     update_service_defaults(stack_name_skynet)
     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)
@@ -1946,8 +1871,6 @@ class Release
     leftorium_hostname = get_route53_hostname(stack_name_leftorium)
     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
 
@@ -1969,9 +1892,6 @@ 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?
-    projects_text.concat "
 > RabbitMQ url: http://#{ec2_ip_address(asg_stack_name)}:15672
 > Supervisor url: http://#{ec2_ip_address(asg_stack_name)}:9001
 > Elasticsearch url: http://#{ec2_ip_address(asg_stack_name)}:9200
@@ -2014,10 +1934,6 @@ class Release
       host = "leftorium-#{@dns_record_identifier}.qa.colaster.com"
     when stack_name.include?('rachele')
       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
@@ -2072,10 +1988,6 @@ class Release
       logical_resource_id = 'EcsApplicationLoadBalancerPublic'
     when stack_name.include?('rachele')
       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,
@@ -2125,10 +2037,6 @@ class Release
       logical_resource_id = 'ECSServiceRacheleQA'
     when stack_name.include?('crash')
       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
@@ -2342,9 +2250,6 @@ class Release
       '-c' 'mix local.hex --force && mix hex.info && \
       mix deps.get && mix compile && mix deps.compile && \
       mix phx.digest && \
-      MIX_ENV=dev mix compile.sms && \
-      MIX_ENV=dev mix compile.html && \
-      MIX_ENV=dev mix compile.heml && \
       rm -rf _build/qa/rel/ && \
       mix release --env=qa'"
     ].each do |cmd|
@@ -2421,40 +2326,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 '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
 
@@ -2708,15 +2579,14 @@ class Release
     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",
       "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 . \
@@ -2782,12 +2652,6 @@ class Release
     crash_present || leftorium_present
   end
 
-  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
-  end
-
   def get_pyxis_version(deploy_id)
     (deploy_id.delete '[a-z0]')[0..9]
   end

data/lib/prima_twig.rb

@@ -13,7 +13,7 @@ class Prima
   LABEL_HOTFIX='hotfix'
   LABEL_NEXT_RELEASE='next release'
   LABEL_IN_STAGING='in staging'
-  CONFIG_KEYS=['github', 'mandrill', 'sparkpost', 'cloudflare_email', 'cloudflare_apikey', 'aws_username', 'aws_password', 'prima_apikey']
+  CONFIG_KEYS=['github', 'mandrill', 'sparkpost', 'cloudflare_email', 'cloudflare_apikey', 'aws_username', 'aws_password']
   attr_reader :gh, :twig, :config, :rugged, :aws
 
   def initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.50.54
+  version: 0.50.80
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-09-13 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