prima-twig 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42064cf9ef05ee9d998cd6fe3d77421e4edb01b598c6250fe6a40bb0a50164f
-  data.tar.gz: 9b830b7e1c1fa78abe87f734ebd1312a0e9d6ecc283303b3b80dd38c74700249
+  metadata.gz: '091f08547af124e4424973a330e244cc89c0afda08731d8770ca6952ce857704'
+  data.tar.gz: 7d7ba09847a55b877e8718e6c72261ebe6601279992b803c82cbc985d1702b3d
 SHA512:
-  metadata.gz: a9310f55d095458a29e04134ad55b0c79b217a29eea3c13b255dcf7d3e9da88eb23bd1d36e47c68e1d0e158f90266304220d609c70572285dcaf1b038ae17b60
-  data.tar.gz: 7091bc2b23182b25d324b94e6d51f70cc522d09306ecc3134df825e3974adc7b564c6b98ff170b14cd3f2d10f59f80ac16b29a5c13ef5190c6e8c91d70618ae7
+  metadata.gz: 7a15bbff4f22afc78381578cb1d91415f46233228ba357049594c8315ab4594148dde25bf15e7431b65938f0c6a79f9823536cfc79ed88a111e324f5386b8c5b
+  data.tar.gz: af812efdde82ed5b2ddc06d12e97ac19f7d9a0bb150295640075ae7c93bd477964a0dc20008959eab6b0511f40625324a7713ce4f9c6809863c48e81824346c6

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,6 +195,22 @@ class Build
     "ecs-task-#{service}-qa-#{get_deploy_id}"
   end
 
+  def set_tags()
+    @tags = [
+      {
+        key: "qainit",
+        value: @git_branch
+      },
+      {
+        key: "hostname_pattern_priority",
+        value: hostname_pattern_priority
+      }
+    ]
+    @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")
@@ -207,21 +224,9 @@ class Build
         end
       end
     end
-    @git_branch = ENV['DRONE_BRANCH']
     hostname_pattern_priority = hostname_pattern_priority()
-    @tags = [
-      {
-        key: "qainit",
-        value: @git_branch
-      },
-      {
-        key: "hostname_pattern_priority",
-        value: hostname_pattern_priority
-      }
-    ]
-    @projects.each do |key, value|
-      @tags << { key: key, value: value['name'] }
-    end
+
+    set_tags()
 
     cluster_stack_name = "ecs-cluster-qa-#{deploy_id}"
 
@@ -1482,6 +1487,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.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Matteo Giachino
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt