prima-twig 0.39.32 → 0.39.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cc4f5955bc07036b6cf1321080bb6b9fff361e
-  data.tar.gz: 735af7a073b0873e6091434c6303d58ff070fa4c
+  metadata.gz: 6898e761cb336fb47cdf3d6666186d67976f2905
+  data.tar.gz: dba0f04fa88ed348ffe669a3ce9c25c70e131437
 SHA512:
-  metadata.gz: af5eacc24f2ebad5356072ea0d668904f0f4b7c762b4802cd2987d7f8bc3b5fb4699d8d7c1ec3059cf3595608fd727db7e446398e81a45516aef2c95b9311cd5
-  data.tar.gz: 4109da0f5bdda6b70b2d719c889c544bf64ee6f04e5699a0c8fb736df28a081ec6a4671e81c1aeeda77fecdd1146c73e2b74a998275dc260791101d3b02bf160
+  metadata.gz: e309d106680286b8825e98e2687a1f619f17f80c2d1c5ba56027e2cd868e1bfa3459325f11ddb8d096c619dd565b9bcd26413cdc42f48532ff7f6310aba7c190
+  data.tar.gz: c6b324094f4d1e94aec5210fb5d2c1014f8530da12738b88f0e5c8660cd5e0cdbf4c0daeb4dcfe3956738580c1ffae6738180758f0a59a75f174846b561797fc

data/bin/twig-feature

@@ -27,7 +27,6 @@ class Release
     @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-QL7O8B9LPNAU:1'
-    @cf_role = 'arn:aws:iam::001575623345:role/qainit-service-role-cloudformat-CloudformationRole-18KBZQIS148R9'
     @dns_record_identifier = nil
     @ecs_cluster_name = nil
     @deploy_update = false
@@ -457,7 +456,7 @@ class Release
     `git add projects && \
      git add branch_names && \
      git commit -m '#{feature_number}' && \
-     git push --set-upstream origin #{feature_number} && \
+     git push -f --set-upstream origin #{feature_number} && \
      git checkout master`
   end
 
@@ -743,7 +742,7 @@ class Release
       }
     ]
 
-    create_stack(stack_name_route53, stack_body, parameters, tags, @cf_role) unless stack_exists?(stack_name_route53)
+    create_stack(stack_name_route53, stack_body, parameters, tags) unless stack_exists?(stack_name_route53)
     wait_for_stack_ready(stack_name_route53) unless stack_ready?(stack_name_route53)
 
     case project
@@ -795,9 +794,9 @@ class Release
       ]
       if stack_exists?(stack_name_web)
         cur_version = get_currently_deployed_version(stack_name_web)
-        update_stack(stack_name_web, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["prima"][:revision])
+        update_stack(stack_name_web, stack_body, parameters, tags) unless cur_version.include?(@projects["prima"][:revision])
       else
-        create_stack(stack_name_web, stack_body, parameters, tags, @cf_role)
+        create_stack(stack_name_web, stack_body, parameters, tags)
       end
       wait_for_stack_ready(stack_name_web) unless stack_ready?(stack_name_web)
       update_service_defaults(stack_name_web)
@@ -848,9 +847,9 @@ class Release
       ]
       if stack_exists?(stack_name_crash)
         cur_version = get_currently_deployed_version(stack_name_crash)
-        update_stack(stack_name_crash, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["crash"][:revision])
+        update_stack(stack_name_crash, stack_body, parameters, tags) unless cur_version.include?(@projects["crash"][:revision])
       else
-        create_stack(stack_name_crash, stack_body, parameters, tags, @cf_role)
+        create_stack(stack_name_crash, stack_body, parameters, tags)
       end
       wait_for_stack_ready(stack_name_crash) unless stack_ready?(stack_name_crash)
       update_service_defaults(stack_name_crash)
@@ -970,7 +969,7 @@ class Release
         parameter_value: @ecs_cluster_name
       }
     ]
-    create_stack(stack_name_db, stack_body, parameters, tags, @cf_role) unless stack_exists?(stack_name_db)
+    create_stack(stack_name_db, stack_body, parameters, tags) unless stack_exists?(stack_name_db)
 
     create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "prima/#{@projects["prima"][:revision]}-#{deploy_id}.tar.gz")
     create_crash_artifact(@projects['crash'][:revision], deploy_id) unless !deploy_crash? || artifact_exists?('prima-artifacts-encrypted', "microservices/crash/#{@projects['crash'][:revision]}-#{deploy_id}-qa.tar.gz")
@@ -1055,7 +1054,7 @@ class Release
       }
     ]
 
-    create_stack(stack_name_route53, stack_body, parameters, tags, @cf_role) unless stack_exists?(stack_name_route53)
+    create_stack(stack_name_route53, stack_body, parameters, tags) unless stack_exists?(stack_name_route53)
     wait_for_stack_ready(stack_name_route53) unless stack_ready?(stack_name_route53)
 
     stack_name_urania = "ecs-task-urania-qa-#{deploy_id}"
@@ -1089,9 +1088,9 @@ class Release
     ]
     if stack_exists?(stack_name_urania)
       cur_version = get_currently_deployed_version(stack_name_urania)
-      update_stack(stack_name_urania, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["urania"][:revision])
+      update_stack(stack_name_urania, stack_body, parameters, tags) unless cur_version.include?(@projects["urania"][:revision])
     else
-      create_stack(stack_name_urania, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_urania, stack_body, parameters, tags)
     end
 
     stack_name_ermes = "ecs-task-ermes-qa-#{deploy_id}"
@@ -1125,9 +1124,9 @@ class Release
     ]
     if stack_exists?(stack_name_ermes)
       cur_version = get_currently_deployed_version(stack_name_ermes)
-      update_stack(stack_name_ermes, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["ermes"][:revision])
+      update_stack(stack_name_ermes, stack_body, parameters, tags) unless cur_version.include?(@projects["ermes"][:revision])
     else
-      create_stack(stack_name_ermes, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_ermes, stack_body, parameters, tags)
     end
 
     stack_name_bburago = "ecs-task-bburago-qa-#{deploy_id}"
@@ -1161,9 +1160,9 @@ class Release
     ]
     if stack_exists?(stack_name_bburago)
       cur_version = get_currently_deployed_version(stack_name_bburago)
-      update_stack(stack_name_bburago, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["bburago"][:revision])
+      update_stack(stack_name_bburago, stack_body, parameters, tags) unless cur_version.include?(@projects["bburago"][:revision])
     else
-      create_stack(stack_name_bburago, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_bburago, stack_body, parameters, tags)
     end
 
     stack_name_hal9000 = "ecs-task-hal9000-qa-#{deploy_id}"
@@ -1197,9 +1196,9 @@ class Release
     ]
     if stack_exists?(stack_name_hal9000)
       cur_version = get_currently_deployed_version(stack_name_hal9000)
-      update_stack(stack_name_hal9000, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["hal9000"][:revision])
+      update_stack(stack_name_hal9000, stack_body, parameters, tags) unless cur_version.include?(@projects["hal9000"][:revision])
     else
-      create_stack(stack_name_hal9000, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_hal9000, stack_body, parameters, tags)
     end
 
     stack_name_fidaty = "ecs-task-fidaty-qa-#{deploy_id}"
@@ -1233,9 +1232,9 @@ class Release
     ]
     if stack_exists?(stack_name_fidaty)
       cur_version = get_currently_deployed_version(stack_name_fidaty)
-      update_stack(stack_name_fidaty, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["fidaty"][:revision])
+      update_stack(stack_name_fidaty, stack_body, parameters, tags) unless cur_version.include?(@projects["fidaty"][:revision])
     else
-      create_stack(stack_name_fidaty, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_fidaty, stack_body, parameters, tags)
     end
 
     stack_name_peano = "ecs-task-peano-qa-#{deploy_id}"
@@ -1269,9 +1268,9 @@ class Release
     ]
     if stack_exists?(stack_name_peano)
       cur_version = get_currently_deployed_version(stack_name_peano)
-      update_stack(stack_name_peano, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["peano"][:revision])
+      update_stack(stack_name_peano, stack_body, parameters, tags) unless cur_version.include?(@projects["peano"][:revision])
     else
-      create_stack(stack_name_peano, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_peano, stack_body, parameters, tags)
     end
 
     stack_name_rogoreport = "ecs-task-rogoreport-qa-#{deploy_id}"
@@ -1297,9 +1296,9 @@ class Release
     ]
     if stack_exists?(stack_name_rogoreport)
       cur_version = get_currently_deployed_version(stack_name_rogoreport)
-      update_stack(stack_name_rogoreport, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["rogoreport"][:revision])
+      update_stack(stack_name_rogoreport, stack_body, parameters, tags) unless cur_version.include?(@projects["rogoreport"][:revision])
     else
-      create_stack(stack_name_rogoreport, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_rogoreport, stack_body, parameters, tags)
     end
 
     stack_name_assange = "ecs-task-assange-qa-#{deploy_id}"
@@ -1341,9 +1340,9 @@ class Release
     ]
     if stack_exists?(stack_name_assange)
       cur_version = get_currently_deployed_version(stack_name_assange)
-      update_stack(stack_name_assange, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["assange"][:revision])
+      update_stack(stack_name_assange, stack_body, parameters, tags) unless cur_version.include?(@projects["assange"][:revision])
     else
-      create_stack(stack_name_assange, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_assange, stack_body, parameters, tags)
     end
 
     stack_name_borat = "ecs-task-borat-qa-#{deploy_id}"
@@ -1385,9 +1384,9 @@ class Release
     ]
     if stack_exists?(stack_name_borat)
       cur_version = get_currently_deployed_version(stack_name_borat)
-      update_stack(stack_name_borat, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["borat"][:revision])
+      update_stack(stack_name_borat, stack_body, parameters, tags) unless cur_version.include?(@projects["borat"][:revision])
     else
-      create_stack(stack_name_borat, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_borat, stack_body, parameters, tags)
     end
 
     git_checkout_version('backoffice', @projects["backoffice"][:revision])
@@ -1429,9 +1428,9 @@ class Release
     ]
     if stack_exists?(stack_name_backoffice)
       cur_version = get_currently_deployed_version(stack_name_backoffice)
-      update_stack(stack_name_backoffice, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["backoffice"][:revision])
+      update_stack(stack_name_backoffice, stack_body, parameters, tags) unless cur_version.include?(@projects["backoffice"][:revision])
     else
-      create_stack(stack_name_backoffice, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_backoffice, stack_body, parameters, tags)
     end
 
     if deploy_crash?
@@ -1474,9 +1473,9 @@ class Release
       ]
       if stack_exists?(stack_name_crash)
         cur_version = get_currently_deployed_version(stack_name_crash)
-        update_stack(stack_name_crash, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["crash"][:revision])
+        update_stack(stack_name_crash, stack_body, parameters, tags) unless cur_version.include?(@projects["crash"][:revision])
       else
-        create_stack(stack_name_crash, stack_body, parameters, tags, @cf_role)
+        create_stack(stack_name_crash, stack_body, parameters, tags)
       end
     end
 
@@ -1511,9 +1510,9 @@ class Release
     ]
     if stack_exists?(stack_name_activia)
       cur_version = get_currently_deployed_version(stack_name_activia)
-      update_stack(stack_name_activia, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["activia"][:revision])
+      update_stack(stack_name_activia, stack_body, parameters, tags) unless cur_version.include?(@projects["activia"][:revision])
     else
-      create_stack(stack_name_activia, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_activia, stack_body, parameters, tags)
     end
 
     # Waiting for prima healtcheck dependencies
@@ -1570,9 +1569,9 @@ class Release
     ]
     if stack_exists?(stack_name_web)
       cur_version = get_currently_deployed_version(stack_name_web)
-      update_stack(stack_name_web, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["prima"][:revision])
+      update_stack(stack_name_web, stack_body, parameters, tags) unless cur_version.include?(@projects["prima"][:revision])
     else
-      create_stack(stack_name_web, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_web, stack_body, parameters, tags)
     end
 
     stack_name_consumer = "ecs-task-consumer-qa-#{deploy_id}"
@@ -1594,9 +1593,9 @@ class Release
     ]
     if stack_exists?(stack_name_consumer)
       cur_version = get_currently_deployed_version(stack_name_consumer)
-      update_stack(stack_name_consumer, stack_body, parameters, tags, @cf_role) unless cur_version.include?(@projects["prima"][:revision])
+      update_stack(stack_name_consumer, stack_body, parameters, tags) unless cur_version.include?(@projects["prima"][:revision])
     else
-      create_stack(stack_name_consumer, stack_body, parameters, tags, @cf_role)
+      create_stack(stack_name_consumer, stack_body, parameters, tags)
     end
 
     wait_for_stack_ready(stack_name_web) unless stack_ready?(stack_name_web)
@@ -2604,7 +2603,7 @@ class Release
         parameter_value: @ecs_cluster_name
       }
     ]
-    create_stack(stack_name, stack_body, parameters, tags, @cf_role)
+    create_stack(stack_name, stack_body, parameters, tags)
   end
 
   def create_cluster_stack(stack_name, tags = [])
@@ -2633,7 +2632,7 @@ class Release
         parameter_value: hash
       }
     ]
-    create_stack(stack_name, stack_body, parameters, [], @cf_role)
+    create_stack(stack_name, stack_body, parameters)
   end
 
   def import_redis_crash(qa_ip_address)

data/lib/prima_aws_client.rb

@@ -40,22 +40,16 @@ module PrimaAwsClient
     stacks
   end
 
-  def create_stack(stack_name, stack_body, parameters = [], tags = [], role = nil)
-    cf_args = {
-      stack_name: stack_name,
-      template_body: stack_body,
-      parameters: parameters,
-      tags: tags,
-      capabilities: ['CAPABILITY_IAM'],
-      on_failure: 'ROLLBACK'
-    }
-
-    if role != nil then
-      cf_args.merge!(role_arn: role)
-    end
-
+  def create_stack(stack_name, stack_body, parameters = [], tags = [])
     begin
-      cf_client.create_stack(cf_args)
+      cf_client.create_stack(
+        stack_name: stack_name,
+        template_body: stack_body,
+        parameters: parameters,
+        tags: tags,
+        capabilities: ['CAPABILITY_IAM'],
+        on_failure: 'ROLLBACK'
+      )
     rescue Aws::CloudFormation::Errors::Throttling, Aws::CloudFormation::Errors::LimitExcedeedException => e
       output 'Throttling, retrying in 15 seconds'.red
       sleep 15
@@ -65,21 +59,15 @@ module PrimaAwsClient
     end
   end
 
-  def update_stack(stack_name, template_body, parameters = [], tags = [], role = nil)
-    cf_args = {
-      stack_name: stack_name,
-      template_body: template_body,
-      parameters: parameters,
-      tags: tags,
-      capabilities: ['CAPABILITY_IAM']
-    }
-
-    if role != nil then
-      cf_args.merge!(role_arn: role)
-    end
-
+  def update_stack(stack_name, template_body, parameters = [], tags = [])
     begin
-      cf_client.update_stack(cf_args)
+      cf_client.update_stack(
+        stack_name: stack_name,
+        template_body: template_body,
+        parameters: parameters,
+        tags: tags,
+        capabilities: ['CAPABILITY_IAM']
+      )
     rescue Aws::CloudFormation::Errors::Throttling => e
       output 'Throttling, retrying in 15 seconds'.red
       sleep 15
@@ -91,21 +79,15 @@ module PrimaAwsClient
     end
   end
 
-  def update_stack_url(stack_name, template_url, parameters = [], tags = [], role = nil)
-    cf_args = {
-      stack_name: stack_name,
-      template_url: template_url,
-      parameters: parameters,
-      tags: tags,
-      capabilities: ['CAPABILITY_IAM']
-    }
-
-    if role != nil then
-      cf_args.merge!(role_arn: role)
-    end
-
+  def update_stack_url(stack_name, template_url, parameters = [], tags = [])
     begin
-      cf_client.update_stack(cf_args)
+      cf_client.update_stack(
+        stack_name: stack_name,
+        template_url: template_url,
+        parameters: parameters,
+        tags: tags,
+        capabilities: ['CAPABILITY_IAM']
+      )
     rescue Aws::CloudFormation::Errors::Throttling => e
       output 'Throttling, retrying in 15 seconds'.red
       sleep 15

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.39.32
+  version: 0.39.33
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk