prima-twig 0.60.560 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b76836a74bf69072c2ba470a55e8da80964c13a888df81f318b52d67bc9170
-  data.tar.gz: a3546bc0b536ecbf63e902e8639a75983924c6d588ce4c10e95929c930606695
+  metadata.gz: 1b7fe6e793d7918dae758d6a790bdd77c00443c88f935aef69cdcbd6fbc59e38
+  data.tar.gz: c554ac218300687b47366785c270df602783f04c1003363d471597abbca10ac6
 SHA512:
-  metadata.gz: 722adb0be551ac294cdf5fe68a03522a75d4fc129a0861a928ef60d68f3940f338c67180fefc2a9a67926c48b2157b686de3794b8ef38d27fd284fa2c978bc51
-  data.tar.gz: 941bada5a21bccddc54126d47fb6079dddc41bcfe7992b77b5e98d4b252755c15759c6378f3661338fd72563549004562e12c8b1228294bd00c66cc0bb945fb1
+  metadata.gz: d463ea20979d3e7d8832a1ba536257ea3e4e0457ef047221c9862f41a7f74bd03d405270922d893f7d89f9aac13a2f4057c395bd6408f0eb86cc68d34c56e87d
+  data.tar.gz: aea5c6b038bb65da4ef094ce1c5dc5fc2347d4e2dd83b179047cd56b516d2f5b5d85d5095c3783a87586f4b184945b252fc00a8098903e1c4aa074a7bf728ca7

data/bin/twig-deploy

@@ -5,10 +5,7 @@ require_relative '../lib/prima_twig.rb'
 require_relative '../lib/prima_aws_client.rb'
 require 'colorize'
 require 'highline/import'
-require 'aws-sdk-batch'
-require 'aws-sdk-cloudformation'
-require 'aws-sdk-ecs'
-require 'aws-sdk-s3'
+require 'aws-sdk'
 require 'redcarpet'
 require 'mail'
 require 'erb'

data/bin/twig-feature

@@ -26,7 +26,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-P358L3UYOC6F:1'
+    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-1BXH13XEVLPP0:1'
     @cf_role = 'arn:aws:iam::001575623345:role/qainit-service-role-cloudformat-CloudformationRole-18KBZQIS148R9'
     @dns_record_identifier = nil
     @ecs_cluster_name = nil
@@ -59,7 +59,6 @@ class Release
     @base_stack_name_alb = 'ecs-alb-http-public-qa-'
     @base_stack_name_alb_ws = 'ecs-alb-ws-public-qa-'
     @git_branch = ''
-    @cloudflare = Rubyflare.connect_with(ENV['CLOUDFLARE_EMAIL'], ENV['CLOUDFLARE_APIKEY'])
   end
 
   def execute!(args)
@@ -140,6 +139,7 @@ class Release
     output 'Disable aggregator'
 
     output "Recupero le informazioni relative al puntamento dei record DNS..."
+    cloudflare = Rubyflare.connect_with(@prima.config['cloudflare_email'], @prima.config['cloudflare_apikey'])
     output "Recupero le informazioni sui QA attivi..."
     stack_list, envs = get_stacks()
 
@@ -151,7 +151,7 @@ class Release
         end.is_a?(Aws::CloudFormation::Types::Tag)
         aggregator_enabled
       end[0]
-      dns_records = @cloudflare.get("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records", {per_page: 100, type: 'CNAME', content: get_alb_host(@base_stack_name_alb + env_hash[3..8])})
+      dns_records = cloudflare.get("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records", {per_page: 100, type: 'CNAME', content: get_alb_host(@base_stack_name_alb + env_hash[3..8])})
       stop_if dns_records.body[:result].empty?, "I record DNS degli aggregatori non stanno puntando ad un QA".red
       change_hostname_priority(env_hash, hostname_pattern_priority())
       dns_to_staging(env_hash)
@@ -167,7 +167,8 @@ class Release
     output 'Enable aggregator'
 
     output 'Recupero le informazioni relative al puntamento dei record DNS...'
-    dns_records = @cloudflare.get('zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records', { per_page: 100, type: 'CNAME', content: 'staging.prima.it' })
+    cloudflare = Rubyflare.connect_with(@prima.config['cloudflare_email'], @prima.config['cloudflare_apikey'])
+    dns_records = cloudflare.get('zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records', { per_page: 100, type: 'CNAME', content: 'staging.prima.it' })
     stop_if dns_records.body[:result].empty?, "I record DNS degli aggregatori stanno gia' puntando ad un QA".red
 
     output "Recupero le informazioni sui QA attivi..."
@@ -197,7 +198,7 @@ class Release
     dns_records.body[:result].each do |dns|
       if dns[:name] =~ /^\w+\-\w+\-staging\.prima\.it$/
         output "Changing #{dns[:name]} DNS record"
-        @cloudflare.put("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records/#{dns[:id]}", {type: 'CNAME', name: dns[:name], content: get_alb_host(@base_stack_name_alb + env_hash[3..8]), proxied: true, ttl: 1})
+        cloudflare.put("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records/#{dns[:id]}", {type: 'CNAME', name: dns[:name], content: get_alb_host(@base_stack_name_alb + env_hash[3..8]), proxied: true, ttl: 1})
       end
     end
 
@@ -256,11 +257,12 @@ class Release
 
   def dns_to_staging(env_hash)
     output "Recupero le informazioni relative al puntamento dei record DNS..."
-    dns_records = @cloudflare.get("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records", {per_page: 100, type: 'CNAME', content: get_alb_host(@base_stack_name_alb + env_hash[3..8])})
+    cloudflare = Rubyflare.connect_with(@prima.config['cloudflare_email'], @prima.config['cloudflare_apikey'])
+    dns_records = cloudflare.get("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records", {per_page: 100, type: 'CNAME', content: get_alb_host(@base_stack_name_alb + env_hash[3..8])})
     dns_records.body[:result].each do |dns|
       if dns[:name] =~ /^\w+\-\w+\-staging\.prima\.it$/
         output "Changing #{dns[:name]} DNS record"
-        @cloudflare.put("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records/#{dns[:id]}", {type: 'CNAME', name: dns[:name], content: 'staging.prima.it', proxied: true, ttl: 1})
+        cloudflare.put("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records/#{dns[:id]}", {type: 'CNAME', name: dns[:name], content: 'staging.prima.it', proxied: true, ttl: 1})
       end
     end
   end
@@ -594,8 +596,6 @@ class Release
     delete_stack(@base_stack_name_alb + env_hash[3..8]) if stack_exists?(@base_stack_name_alb + env_hash[3..8])
     delete_stack(@base_stack_name_alb_ws + env_hash[3..8]) if stack_exists?(@base_stack_name_alb_ws + env_hash[3..8])
     `git checkout master && git push origin --delete ${DRONE_BRANCH}`
-    output "Cancello il record DNS utilizzato da Lighthouse"
-    delete_lighthouse_dns()
     output "Finito!".green
 
     if @qainit
@@ -1532,6 +1532,10 @@ class Release
         parameter_key: "WebQaBaseHostname",
         parameter_value: "#{@dns_record_identifier}.qa.colaster.com"
       },
+      {
+        parameter_key: "HostnamePattern",
+        parameter_value: "ww*-#{@dns_record_identifier}.qa.colaster.com"
+      },
       {
         parameter_key: "HostnamePatternPriority",
         parameter_value: hostname_pattern_priority
@@ -1562,7 +1566,7 @@ class Release
       },
       {
         parameter_key: "HostnamePattern",
-        parameter_value: "www-#{@dns_record_identifier}.*"
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1670,7 +1674,7 @@ class Release
         },
         {
           parameter_key: "ReleaseVersion",
-          parameter_value: "#{@projects["hutch"]['revision']}-#{@dns_record_identifier[0..7]}"
+          parameter_value: "#{@projects["hutch"]['revision']}"
         },
         {
           parameter_key: "ALBShortName",
@@ -1841,13 +1845,33 @@ class Release
 
     if @projects['prima']['name'] != 'master' then
       output "Lancio il batch job per la visual regression..."
-      launch_bocelli_test(prima_hostname)
-      output "Visual regression lanciata con successo!"
+      @batch.submit_job({
+        job_name: "bocelli-test-#{@dns_record_identifier}",
+        job_queue: "tools-production",
+        job_definition: describe_stack_resource('batch-job-bocelli-production', 'JobDefinition').stack_resource_detail.physical_resource_id,
+        container_overrides: {
+          environment: [
+            {
+              name: "BATCH_COMMAND",
+              value: "test"
+            },
+            {
+              name: "QA_HOSTNAME",
+              value: prima_hostname
+            },
+            {
+              name: "BRANCH_NAME",
+              value: @projects['prima']['name']
+            },
+            {
+              name: "COMMITTER_EMAIL",
+              value: @projects['prima']['committer']
+            }
+          ]
+        }
+      })
 
-      output "Lancio i test con Lighthouse..."
-      launch_lighthouse_test(prima_hostname, "mobile")
-      launch_lighthouse_test(prima_hostname, "desktop")
-      output "Test con Lighthouse lanciati con successo..."
+      output "Visual regression lanciata con successo!"
     end
 
     qainit_write_output(projects_text, 'Indirizzi scritti su ')
@@ -2004,69 +2028,6 @@ class Release
     update_ecs_service(@ecs_cluster_name, resp.stack_resource_detail.physical_resource_id, {minimum_healthy_percent: 0, maximum_percent: 100})
   end
 
-  def launch_lighthouse_test(url, device)
-    @cloudflare.post("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records", {type: 'CNAME', name: "www-#{@dns_record_identifier}", content: url, proxied: true, ttl: 1}) unless get_lighthouse_dns()
-
-    @batch.submit_job({
-        job_name: "lighthouse-#{device}-#{@dns_record_identifier}",
-        job_queue: "tools-production",
-        job_definition: describe_stack_resource('batch-job-lighthouse-production', 'JobDefinition').stack_resource_detail.physical_resource_id,
-        container_overrides: {
-          environment: [
-            {
-              name: "URL_TO_TEST",
-              value: "https://www-#{@dns_record_identifier}.prima.it/?superprima"
-            },
-            {
-              name: "DEVICE",
-              value: device
-            }
-          ]
-        }
-      })
-  end
-
-  def get_lighthouse_dns()
-    dns_records = @cloudflare.get("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records", {per_page: 100, type: 'CNAME', name: "www-#{@dns_record_identifier}.prima.it"})
-    if dns_records.body[:result_info][:count] > 0
-      return dns_records.body[:result][0][:id]
-    end
-    false
-  end
-
-  def delete_lighthouse_dns()
-    dns_id = get_lighthouse_dns()
-    @cloudflare.delete("zones/1fb634f19c43dfb0162cc4cb91915da2/dns_records/#{dns_id}") if dns_id
-  end
-
-  def launch_bocelli_test(url)
-    @batch.submit_job({
-        job_name: "bocelli-test-#{@dns_record_identifier}",
-        job_queue: "tools-production",
-        job_definition: describe_stack_resource('batch-job-bocelli-production', 'JobDefinition').stack_resource_detail.physical_resource_id,
-        container_overrides: {
-          environment: [
-            {
-              name: "BATCH_COMMAND",
-              value: "test"
-            },
-            {
-              name: "QA_HOSTNAME",
-              value: url
-            },
-            {
-              name: "BRANCH_NAME",
-              value: @projects['prima']['name']
-            },
-            {
-              name: "COMMITTER_EMAIL",
-              value: @projects['prima']['committer']
-            }
-          ]
-        }
-      })
-  end
-
   def create_activia_artifact(revision)
     output "Preparo l'artifact activia .zip\n".yellow
 

data/bin/twig-update-ami

@@ -5,7 +5,7 @@ require_relative '../lib/prima_twig.rb'
 require_relative '../lib/prima_aws_client.rb'
 require 'launchy'
 require 'json'
-require 'aws-sdk-s3'
+require 'aws-sdk'
 
 class TwigUpdateAmi
   include Command

data/lib/prima_aws_client.rb

@@ -1,11 +1,4 @@
-require 'aws-sdk-autoscaling'
-require 'aws-sdk-batch'
-require 'aws-sdk-cloudformation'
-require 'aws-sdk-cloudfront'
-require 'aws-sdk-ec2'
-require 'aws-sdk-ecs'
-require 'aws-sdk-elasticloadbalancingv2'
-require 'aws-sdk-s3'
+require 'aws-sdk'
 require 'colorize'
 #
 module PrimaAwsClient

data/lib/prima_twig.rb

@@ -4,7 +4,7 @@ require 'octokit'
 require 'yaml'
 require 'rugged'
 require 'highline/import'
-require 'aws-sdk-core'
+require 'aws-sdk'
 require 'rubyflare'
 
 class Prima

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.60.560
+  version: 0.61.0
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,122 +14,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-autoscaling
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-batch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-cloudformation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-cloudfront
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-ec2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-ecs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-elasticloadbalancingv2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"