prima-twig 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf0530a6a9e2c48322ea3ae20939178c3e35cbfcc5f179ecff80947d256eb31
-  data.tar.gz: b5f3e843846dca8365e43340ee1f970d1e08e41bc594f903e0c54e5d198357b6
+  metadata.gz: 2447f9de100d318946c1241da1855fa097f096ace60ce7a86bb1fa88c9deace9
+  data.tar.gz: 76c7edff41bf97a51402002283d75a4e3c54450de367fc0fc0679584187b4996
 SHA512:
-  metadata.gz: 47b86a2ce12a6250b32c81f342460039d739d42ae3fe8b3118b3b71bd4a1992cd5810225ec90667d0710a963d01b319bb81d76d346059324ccfec5008cdc6880
-  data.tar.gz: efdeaf108651ea7bfabcfd010423fdb03baa65ee343763a4ab0f6b2105956902dbadfc8d98784a3d8f59589a0eb42662f76e6db06fe3b558b34ca560c505952c
+  metadata.gz: fdddea3d1f0d717a188b30be4d6751832e7a7419af80677839a251172bf91a85fa910f85a57d062525fef0d0cdb9295f309bec5591a8cfee8c99262fa150f524
+  data.tar.gz: 17547c511ae1d3eb66ab23ac6ede81883362f29b37a7a8f5cbabd2cb70e1ff3c23fe3facdf1cf86dca3d78ba8d2c501ca39d7b1125987923a640c52927af0d96

data/bin/twig-build

@@ -50,7 +50,7 @@ class Build
     }
     @base_stack_name_alb = 'ecs-alb-http-public-qa-'
     @base_stack_name_alb_ws = 'ecs-alb-ws-public-qa-'
-    @git_branch = ''
+    @git_branch = ENV['DRONE_BRANCH']
     @cloudflare = Rubyflare.connect_with(ENV['CLOUDFLARE_EMAIL'], ENV['CLOUDFLARE_APIKEY'])
   end
 
@@ -61,6 +61,7 @@ class Build
     when 'infrastructure'
       create_infrastructure_stacks! unless is_shutdown?
     when 'project'
+      set_tags()
       proj_method = "create_#{args[1]}_stack"
       self.send(proj_method.to_sym) unless is_shutdown?
     when 'complete'
@@ -194,21 +195,7 @@ class Build
     "ecs-task-#{service}-qa-#{get_deploy_id}"
   end
 
-  def create_infrastructure_stacks!
-    `git pull && git submodule init && git submodule update`
-    @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]
-    unless @qainit
-      @projects.each_key do |project_key|
-        if @projects[project_key]['revision']
-          git_checkout_version(project_key, @projects[project_key]['revision'])
-        end
-      end
-    end
-    @git_branch = ENV['DRONE_BRANCH']
-    hostname_pattern_priority = hostname_pattern_priority()
+  def set_tags()
     @tags = [
       {
         key: "qainit",
@@ -222,6 +209,24 @@ class Build
     @projects.each do |key, value|
       @tags << { key: key, value: value['name'] }
     end
+  end
+
+  def create_infrastructure_stacks!
+    `git pull && git submodule init && git submodule update`
+    @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]
+    unless @qainit
+      @projects.each_key do |project_key|
+        if @projects[project_key]['revision']
+          git_checkout_version(project_key, @projects[project_key]['revision'])
+        end
+      end
+    end 
+    hostname_pattern_priority = hostname_pattern_priority()
+
+    set_tags()
 
     cluster_stack_name = "ecs-cluster-qa-#{deploy_id}"
 
@@ -1486,6 +1491,7 @@ class Build
 > RabbitMQ url: http://#{get_ec2_ip_address}:15672
 > Supervisor url: http://#{get_ec2_ip_address}:9001
 > Elasticsearch url: http://#{get_ec2_ip_address}:9200
+> Git branch: #{@git_branch}
 > SSH connection: ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no githubUsername@#{get_ec2_ip_address}\n"
     output projects_text.cyan
     output "Deploy effettuato, everything is awesome!\n".green

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling