prima-twig 1.0.28 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ebbe34f5930e6a4ce8734c25a861b3e2a0d5975663978673b629a4520c6a262
-  data.tar.gz: 0fc017cd93fa1b7b450f7df4e1542cb40b952eb0b691983ecc69a7904e25203b
+  metadata.gz: 962a543074985813837b099c00085a1bf28437169d051782743652cf815b7421
+  data.tar.gz: 2a98f83653a973d61c5bd790f9aab65d9981d7792d19754cc18a0f8922d0ae1a
 SHA512:
-  metadata.gz: bf7be18099db0176d241d126a37c71e32dd392cff8f305bd3eb6d0d13634e94b56f1693c966d704001a39f9a76a9c249ec01181b434132dc9d36fee8d1fb4155
-  data.tar.gz: d0b40a6184d0cfc4da29aaf42bec5830ecbd4138fc8689591911c3bb60a5b2d22aeac763e332fb31f9ed9d53bc0f6ca0f390733e4c4b7281143d65388c9a0eac
+  metadata.gz: 471c6be8f236212e706a41572beec06e768ea712b10a860d9a2598e3ea743a1441956485ac89a0d073c3f96adebc0503d4aff3b13ad8ed7ce361559892bfdb3c
+  data.tar.gz: de461dad6d2b8ba3f641d18bcb25e9bfccd4b6f7e9b1783196463ad09e3afdebb6194706ab6f81c85c1e4dbb148cd267b3fba61c3e9db6702933a9e60d3bb36e

data/bin/twig-build

@@ -19,7 +19,7 @@ class Build
     @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-4UBHMCZBE5WM:1'
+    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-XYF2QX2UJRXZ:1'
     @cf_role = 'arn:aws:iam::001575623345:role/qainit-service-role-cloudformat-CloudformationRole-18KBZQIS148R9'
     @ecs_cluster_name = nil
     @deploy_update = false
@@ -46,7 +46,10 @@ class Build
       'starsky' => {},
       'hutch' => {},
       'maia' => {},
-      'legion' => {}
+      'legion' => {},
+      'vianello' => {},
+      'domus' => {}
+      # 'toretto' => {}
     }
     @base_stack_name_alb = 'ecs-alb-http-public-qa-'
     @base_stack_name_alb_ws = 'ecs-alb-ws-public-qa-'
@@ -200,7 +203,7 @@ class Build
     @tags = [
       {
         key: "qainit",
-        value: @git_branch
+        value: @git_branch.gsub(/[^a-zA-Z0-9\-]/,"-")
       },
       {
         key: "hostname_pattern_priority",
@@ -208,7 +211,9 @@ class Build
       }
     ]
     @projects.each do |key, value|
-      @tags << { key: key, value: value['name'] }
+      unless value['name'].to_s.strip.empty?
+        @tags << { key: key, value: value['name'] }
+      end
     end
   end
 
@@ -359,6 +364,14 @@ class Build
       {
         parameter_key: 'MaiaElbHostname',
         parameter_value: get_alb_host(stack_name_alb)
+      },
+      {
+        parameter_key: 'VianelloElbHostname',
+        parameter_value: get_alb_host(stack_name_alb)
+      },
+      {
+        parameter_key: 'DomusElbHostname',
+        parameter_value: get_alb_host(stack_name_alb)
       }
     ]
 
@@ -424,43 +437,42 @@ class Build
   end
 
   def create_legion_stack()
-    return true
-    # wait_for_artifact('prima-artifacts-encrypted', "microservices/legion/#{@projects["legion"]['revision']}-qa.tar.gz")
-    # stack_name_legion = get_stack_name("legion")
-    # git_checkout_version('legion', @projects["legion"]['revision'])
-    # stack_body = File.read('projects/legion/deploy/task.yml')
-    # parameters = [
-    #   {
-    #     parameter_key: "Environment",
-    #     parameter_value: "qa"
-    #   },
-    #   {
-    #     parameter_key: "ReleaseVersion",
-    #     parameter_value: @projects["legion"]['revision']
-    #   },
-    #   {
-    #     parameter_key: "TaskDesiredCount",
-    #     parameter_value: "1"
-    #   },
-    #   {
-    #     parameter_key: "ECSClusterName",
-    #     parameter_value: get_ecs_cluster_name
-    #   },
-    #   {
-    #     parameter_key: "HostnamePattern",
-    #     parameter_value: "legion-#{get_deploy_id}.qa.colaster.com"
-    #   },
-    #   {
-    #     parameter_key: "HostnamePatternPriority",
-    #     parameter_value: hostname_pattern_priority
-    #   }
-    # ]
-    # if stack_exists?(stack_name_legion)
-    #   cur_version = get_currently_deployed_version(stack_name_legion)
-    #   update_stack(stack_name_legion, stack_body, parameters, @tags, @cf_role) unless cur_version.include?(@projects["legion"]['revision'])
-    # else
-    #   create_stack(stack_name_legion, stack_body, parameters, @tags, @cf_role)
-    # end
+    wait_for_artifact('prima-artifacts-encrypted', "microservices/legion/#{@projects["legion"]['revision']}-qa.tar.gz")
+    stack_name_legion = get_stack_name("legion")
+    git_checkout_version('legion', @projects["legion"]['revision'])
+    stack_body = File.read('projects/legion/deploy/task.yml')
+    parameters = [
+      {
+        parameter_key: "Environment",
+        parameter_value: "qa"
+      },
+      {
+        parameter_key: "ReleaseVersion",
+        parameter_value: @projects["legion"]['revision']
+      },
+      {
+        parameter_key: "TaskDesiredCount",
+        parameter_value: "1"
+      },
+      {
+        parameter_key: "ECSClusterName",
+        parameter_value: get_ecs_cluster_name
+      },
+      {
+        parameter_key: "HostnamePattern",
+        parameter_value: "legion-#{get_deploy_id}.qa.colaster.com"
+      },
+      {
+        parameter_key: "HostnamePatternPriority",
+        parameter_value: hostname_pattern_priority
+      }
+    ]
+    if stack_exists?(stack_name_legion)
+      cur_version = get_currently_deployed_version(stack_name_legion)
+      update_stack(stack_name_legion, stack_body, parameters, @tags, @cf_role) unless cur_version.include?(@projects["legion"]['revision'])
+    else
+      create_stack(stack_name_legion, stack_body, parameters, @tags, @cf_role)
+    end
   end
 
   def create_urania_stack()
@@ -1427,6 +1439,114 @@ class Build
     end
   end
 
+  def create_vianello_stack()
+    if deploy_vianello_or_domus?
+      wait_for_artifact('prima-artifacts-encrypted', "microservices/vianello/#{@projects["vianello"]['revision']}-qa.tar.gz")
+      stack_name_vianello = "ecs-task-vianello-qa-#{get_deploy_id}"
+      git_checkout_version('vianello', @projects["vianello"]['revision'])
+      stack_body = File.read('projects/vianello/deploy/task.yml')
+      parameters = [
+        {
+          parameter_key: "Environment",
+          parameter_value: "qa"
+        },
+        {
+          parameter_key: "ReleaseVersion",
+          parameter_value: @projects["vianello"]['revision']
+        },
+        {
+          parameter_key: "ECSClusterName",
+          parameter_value: get_ecs_cluster_name
+        },
+        {
+          parameter_key: "TaskDesiredCount",
+          parameter_value: '1'
+        },
+        {
+          parameter_key: "HostnamePattern",
+          parameter_value: "vianello-#{get_deploy_id}.qa.colaster.com"
+        },
+        {
+          parameter_key: "HostnamePatternPriority",
+          parameter_value: (hostname_pattern_priority.to_i + 254).to_s
+        },
+        {
+          parameter_key: "ECSClusterName",
+          parameter_value: get_ecs_cluster_name
+        },
+        {
+          parameter_key: "ALBShortName",
+          parameter_value: "vianello-qa-#{get_deploy_id}"[0..27]
+        },
+        {
+          parameter_key: "EnvHash",
+          parameter_value: get_deploy_id
+        }
+      ]
+      if stack_exists?(stack_name_vianello)
+        cur_version = get_currently_deployed_version(stack_name_vianello)
+        update_stack(stack_name_vianello, stack_body, parameters, @tags, @cf_role) unless cur_version.include?(@projects["vianello"]['revision'])
+      else
+        create_stack(stack_name_vianello, stack_body, parameters, @tags, @cf_role)
+      end
+    else
+      true
+    end
+  end
+
+  def create_domus_stack()
+    if deploy_vianello_or_domus?
+      wait_for_artifact('prima-artifacts-encrypted', "microservices/domus/#{@projects["domus"]['revision']}-#{get_deploy_id[0..7]}-qa.tar.gz")
+      wait_for_stack_ready(get_stack_name("vianello")) unless stack_ready?(get_stack_name("vianello"))
+
+      stack_name_domus = get_stack_name("domus")
+      git_checkout_version('domus', @projects["domus"]['revision'])
+      stack_body = File.read('projects/domus/deploy/task.yml')
+      parameters = [
+        {
+          parameter_key: "Environment",
+          parameter_value: "qa"
+        },
+        {
+          parameter_key: "ReleaseVersion",
+          parameter_value: "#{@projects["domus"]['revision']}-#{get_deploy_id[0..7]}"
+        },
+        {
+          parameter_key: "ALBShortName",
+          parameter_value: "domus-qa-#{get_deploy_id}"[0..27]
+        },
+        {
+          parameter_key: "ECSClusterName",
+          parameter_value: get_ecs_cluster_name
+        },
+        {
+          parameter_key: "EnvHash",
+          parameter_value: get_deploy_id
+        },
+        {
+          parameter_key: "HostnamePattern",
+          parameter_value: "domus-#{get_deploy_id}.qa.colaster.com"
+        },
+        {
+          parameter_key: "HostnamePatternPriority",
+          parameter_value: (hostname_pattern_priority.to_i + 254).to_s
+        },
+        {
+          parameter_key: "ApiUrl",
+          parameter_value: "https://#{get_route53_hostname('vianello')}"
+        }
+      ]
+      if stack_exists?(stack_name_domus)
+        cur_version = get_currently_deployed_version(stack_name_domus)
+        update_stack(stack_name_domus, stack_body, parameters, @tags, @cf_role) unless cur_version.include?(@projects["domus"]['revision'])
+      else
+        create_stack(stack_name_domus, stack_body, parameters, @tags, @cf_role)
+      end
+    else
+      true
+    end
+  end
+
   def create_rogoreport_stack()
     true
   end
@@ -1437,12 +1557,16 @@ class Build
     wait_for_stack_ready(get_stack_name("worker-ermes")) unless stack_ready?(get_stack_name("worker-ermes"))
     wait_for_stack_ready(get_stack_name("ermes")) unless stack_ready?(get_stack_name("ermes"))
     wait_for_stack_ready(get_stack_name("peano")) unless stack_ready?(get_stack_name("peano"))
-    #wait_for_stack_ready(get_stack_name("legion")) unless stack_ready?(get_stack_name("legion"))
+    wait_for_stack_ready(get_stack_name("legion")) unless stack_ready?(get_stack_name("legion"))
     wait_for_stack_ready(get_stack_name("borat")) unless stack_ready?(get_stack_name("borat"))
     wait_for_stack_ready(get_stack_name("activia")) unless stack_ready?(get_stack_name("activia"))
     wait_for_stack_ready(get_stack_name("maia")) unless stack_ready?(get_stack_name("maia"))
     wait_for_stack_ready(get_stack_name("crash")) unless stack_ready?(get_stack_name("crash"))
     wait_for_stack_ready(get_stack_name("hutch")) unless stack_ready?(get_stack_name("hutch"))
+    if deploy_vianello_or_domus?
+      wait_for_stack_ready(get_stack_name("vianello")) unless stack_ready?(get_stack_name("vianello"))
+      wait_for_stack_ready(get_stack_name("domus")) unless stack_ready?(get_stack_name("domus"))
+    end
 
     update_service_defaults(get_stack_name("web"))
     update_service_defaults(get_stack_name("consumer-api"))
@@ -1453,7 +1577,7 @@ class Build
     update_service_defaults(get_stack_name("hal9000"))
     update_service_defaults(get_stack_name("fidaty"))
     update_service_defaults(get_stack_name("peano"))
-    # update_service_defaults(get_stack_name("legion"))
+    # update_service_defaults(get_stack_name("legion")) TODO UNCOMMENT
     update_service_defaults(get_stack_name("assange"))
     update_service_defaults(get_stack_name("borat"))
     update_service_defaults(get_stack_name("activia"))
@@ -1464,6 +1588,10 @@ class Build
     update_service_defaults(get_stack_name("starsky"))
     update_service_defaults(get_stack_name("hutch"))
     update_service_defaults(get_stack_name("crash"))
+    if deploy_vianello_or_domus?
+      update_service_defaults(get_stack_name("vianello"))
+      update_service_defaults(get_stack_name("domus"))
+    end
 
     activia_hostname = get_route53_hostname("activia")
     assange_hostname = get_route53_hostname("assange")
@@ -1484,7 +1612,9 @@ class Build
     crash_hostname = get_route53_hostname("crash")
     starsky_hostname = get_route53_hostname("starsky")
     hutch_hostname = get_route53_hostname("hutch")
-    # legion_hostname = get_route53_hostname("legion")
+    legion_hostname = get_route53_hostname("legion")
+    vianello_hostname = get_route53_hostname("vianello")
+    domus_hostname = get_route53_hostname("domus")
 
     #launch_mimo(get_deploy_id)
 
@@ -1505,10 +1635,14 @@ class Build
 > Rachele url: http://#{rachele_hostname}:10040
 > Maia App url: https://#{maia_app_hostname}
 > Maia Intermediari url: https://#{maia_intermediari_hostname}
-> Legion url: http://#{prima_hostname}:8051
+> Legion url: http://#{legion_hostname}:8051
 > Crash url: https://#{crash_hostname}
 > Starsky url: https://#{starsky_hostname}
-> Hutch url: https://#{hutch_hostname}
+> Hutch url: https://#{hutch_hostname}"
+projects_text.concat "
+> Vianello url: https://#{vianello_hostname}
+> Domus url: https://#{domus_hostname}" if deploy_vianello_or_domus?
+projects_text.concat "
 > RabbitMQ url: http://#{get_ec2_ip_address}:15672
 > Elasticsearch url: http://#{get_ec2_ip_address}:9200
 > Git branch: #{@git_branch}
@@ -1572,6 +1706,10 @@ class Build
       host = "legion-#{get_deploy_id}.qa.colaster.com"
     when project.include?('maia-intermediari')
       host = "api-intermediari-#{get_deploy_id}.qa.colaster.com"
+    when project.include?('vianello')
+      host = "vianello-#{get_deploy_id}.qa.colaster.com"
+    when project.include?('domus')
+      host = "domus-#{get_deploy_id}.qa.colaster.com"
     end
     host
   end
@@ -1633,6 +1771,10 @@ class Build
       logical_resource_id = 'EcsApplicationLoadBalancerPublic'
     when stack_name.include?('legion')
       logical_resource_id = 'EcsApplicationLoadBalancerInternal'
+    when stack_name.include?('vianello')
+      logical_resource_id = 'EcsApplicationLoadBalancerInternal'
+    when stack_name.include?('domus')
+      logical_resource_id = 'EcsApplicationLoadBalancerPublic'
     end
     resp = describe_stack_resource(stack_name, logical_resource_id)
     resp = describe_load_balancers([resp.stack_resource_detail.physical_resource_id])
@@ -1685,6 +1827,10 @@ class Build
       logical_resource_id = 'ECSServiceMaia'
     when stack_name.include?('legion')
       logical_resource_id = 'ECSServiceLegionQA'
+    when stack_name.include?('vianello')
+      logical_resource_id = 'ECSServiceVianelloQA'
+    when stack_name.include?('domus')
+      logical_resource_id = 'ECSServiceDomus'
     else
       raise "Service name non gestito per lo stack #{stack_name}"
     end
@@ -1763,6 +1909,12 @@ class Build
       })
   end
 
+  def deploy_vianello_or_domus?
+    vianello_present = !@projects['vianello'].empty? && @projects['vianello'][:name] != 'master' && !@projects['vianello'][:default_branch]
+    domus_present = !@projects['domus'].empty? && @projects['domus'][:name] != 'master' && !@projects['domus'][:default_branch]
+    vianello_present || domus_present
+  end
+
   def git_checkout_version(project, revision)
     Dir.chdir "projects/#{project}"
     exec_step "git checkout -- . && git checkout #{revision}"

data/bin/twig-feature

@@ -46,7 +46,10 @@ class Release
       'starsky' => {},
       'hutch' => {},
       'maia' => {},
-      'legion' => {}
+      'legion' => {},
+      'vianello' => {},
+      'domus' => {}
+      # 'toretto' => {}
     }
     @base_stack_name_alb = 'ecs-alb-http-public-qa-'
     @base_stack_name_alb_ws = 'ecs-alb-ws-public-qa-'
@@ -434,6 +437,8 @@ class Release
   def qainit_deploy!(quiet = false)
     `git checkout master && git pull && git submodule update --init --recursive && git remote prune origin`
 
+    `git branch -r | awk '{print $1}' | egrep -v -f /dev/fd/0 <(git branch -vv | grep origin) | awk '{print $1}' | xargs git branch -D`
+
     default_name = get_default_branch_name @projects
     feature_number = ''
     unless quiet

data/lib/prima_aws_client.rb

@@ -340,7 +340,7 @@ module PrimaAwsClient
   def wait_for_artifact(bucket, path)
     ready = artifact_exists?(bucket, path)
     sleep_seconds = 13
-    output "Attendo che lo sia pronto l'artefatto #{path}...\n".yellow
+    output "Attendo che sia pronto l'artefatto #{path}...\n".yellow
     retries = 0
     while !ready
       ready = true if artifact_exists?(bucket, path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.33
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling