prima-twig 0.34.123 → 0.34.128
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/twig-build +9 -5
- data/lib/prima_aws_client.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 77707af168f6eb6ce56bbe66f8967cab59b2a6a5203d8498f07bf7f9c4463041
|
4
|
+
data.tar.gz: 10698a01404e5761be687636185ae5df11eb8c89e1d151b98fcaa3b23063a517
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 88efe35a9025f216da56f7788d7881b1239d8757905d01c0f865d47fd4bcb42ea1f39df1d713fe64c0d612de8433bd9ffe16c62093b88d408c84d43ff8799ae2
|
7
|
+
data.tar.gz: 5e5a36fd022a3073ce4d370be16c6a3ee99897499dea2ccb293aae4d22a3b2999cf80592fd96bb29fdbf4962af111762fea2249878760f94f3dd0ccb8e448484
|
data/bin/twig-build
CHANGED
@@ -1560,7 +1560,7 @@ class Build
|
|
1560
1560
|
wait_for_artifact('prima-artifacts-encrypted', "microservices/toretto/#{@projects["toretto"]['revision']}-qa.tar.gz")
|
1561
1561
|
|
1562
1562
|
git_checkout_version('toretto', @projects["toretto"]['revision'])
|
1563
|
-
|
1563
|
+
stack_name_toretto = get_stack_name("toretto")
|
1564
1564
|
stack_body = IO.read('projects/toretto/deploy/task.yml')
|
1565
1565
|
parameters = [
|
1566
1566
|
{
|
@@ -1594,6 +1594,10 @@ class Build
|
|
1594
1594
|
{
|
1595
1595
|
parameter_key: "HostnamePatternPriority",
|
1596
1596
|
parameter_value: (hostname_pattern_priority.to_i + 79).to_s
|
1597
|
+
},
|
1598
|
+
{
|
1599
|
+
parameter_key: "AllowedOrigin",
|
1600
|
+
parameter_value: "https://#{get_route53_hostname('toretto_fe')}"
|
1597
1601
|
}
|
1598
1602
|
]
|
1599
1603
|
if stack_exists?(stack_name_toretto)
|
@@ -1609,7 +1613,7 @@ class Build
|
|
1609
1613
|
|
1610
1614
|
wait_for_artifact('prima-artifacts-encrypted', "microservices/toretto/fe-#{@projects["toretto"]['revision']}-#{get_deploy_id[0..7]}-qa.tar.gz")
|
1611
1615
|
|
1612
|
-
stack_name_toretto_fe = get_stack_name("
|
1616
|
+
stack_name_toretto_fe = get_stack_name("toretto-fe")
|
1613
1617
|
git_checkout_version('toretto', @projects["toretto"]['revision'])
|
1614
1618
|
stack_body = File.read('projects/toretto/deploy/task-fe.yml')
|
1615
1619
|
parameters = [
|
@@ -1643,7 +1647,7 @@ class Build
|
|
1643
1647
|
},
|
1644
1648
|
{
|
1645
1649
|
parameter_key: "ApiUrl",
|
1646
|
-
parameter_value: "https://#{get_route53_hostname('
|
1650
|
+
parameter_value: "https://#{get_route53_hostname('toretto')}"
|
1647
1651
|
}
|
1648
1652
|
]
|
1649
1653
|
if stack_exists?(stack_name_toretto_fe)
|
@@ -1679,7 +1683,7 @@ class Build
|
|
1679
1683
|
end
|
1680
1684
|
if deploy_toretto?
|
1681
1685
|
wait_for_stack_ready(get_stack_name("toretto")) unless stack_ready?(get_stack_name("toretto"))
|
1682
|
-
wait_for_stack_ready(get_stack_name("
|
1686
|
+
wait_for_stack_ready(get_stack_name("toretto-fe")) unless stack_ready?(get_stack_name("toretto-fe"))
|
1683
1687
|
end
|
1684
1688
|
|
1685
1689
|
update_service_defaults(get_stack_name("web"))
|
@@ -1708,7 +1712,7 @@ class Build
|
|
1708
1712
|
end
|
1709
1713
|
if deploy_toretto?
|
1710
1714
|
update_service_defaults(get_stack_name("toretto"))
|
1711
|
-
update_service_defaults(get_stack_name("
|
1715
|
+
update_service_defaults(get_stack_name("toretto-fe"))
|
1712
1716
|
end
|
1713
1717
|
|
1714
1718
|
activia_hostname = get_route53_hostname("activia")
|
data/lib/prima_aws_client.rb
CHANGED
@@ -416,7 +416,7 @@ module PrimaAwsClient
|
|
416
416
|
def describe_load_balancers(load_balancer_arns)
|
417
417
|
begin
|
418
418
|
resp = alb_client.describe_load_balancers({load_balancer_arns: load_balancer_arns})
|
419
|
-
rescue Aws::
|
419
|
+
rescue Aws::ElasticLoadBalancingV2::Errors::Throttling => e
|
420
420
|
output 'Throttling, retrying in 15 seconds'.red
|
421
421
|
sleep 15
|
422
422
|
resp = describe_load_balancers(load_balancer_arns)
|