cfn-vpn 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0b8948f3c75911a7850125d4c528e1f305dd53015c8ef7335cd9a1c3b971248
-  data.tar.gz: 92b27425c4640c6aa73962b752997f135e24fe9184953e04504a27dfc3197be3
+  metadata.gz: 54a7ba46c0bd16d5e70bf048aa90e4ea079e8dd5be0e6245afafb4730f804017
+  data.tar.gz: 0e9b6ed2c904b6debf40777232f780d15fc12904abc3014fccf7c8b5c65049ae
 SHA512:
-  metadata.gz: 7130274b2ae5f8b88411e2fad7d1137f716044f4059fa4f04b6b3acfb2c2362caf749e7c0d14235e7cce06a1ea3a5468406d52e6670a5cf428c0d8316e8c007c
-  data.tar.gz: 671e011bec61bf99f27eb51caeab238c8f8b7f03046d8adbdf2c8d8ad8d1b7e1a465c9d2453f05c294947fe907f4ad12a529ec525791b1f11baa0f414a819840
+  metadata.gz: 402f81e5c8976cca51b685220219370a056875c9885a86f989e06d021d5848f5e18f09f1022df6bf64d4e9b72e8546fa206a5fff3be3501b5db7c401d72175a0
+  data.tar.gz: 19b44819f370cbdada8e747764c93d1366e2974cfe56436a96f087805ff898094bd3f63f082ca09f1410565a86c2b35129c2d1f64c29325f325995c654ca4cc4

data/lib/cfnvpn/templates/lambdas/auto_route_populator/quotas.py

@@ -19,7 +19,7 @@ def quota_request_open(quota_code) -> bool:
     QuotaCode=quota_code
   )
   # Status='PENDING'|'CASE_OPENED'|'APPROVED'|'DENIED'|'CASE_CLOSED'
-  return any(req['status'] in IN_PROGRESS for req in response['RequestedQuotas'])
+  return any(req['Status'] in IN_PROGRESS for req in response['RequestedQuotas'])
 
 def increase_quota(increase_value, quota_code, endpoint) -> str:
   if quota_request_open(quota_code):
@@ -34,4 +34,4 @@ def increase_quota(increase_value, quota_code, endpoint) -> str:
     QuotaCode=quota_code,
     DesiredValue=desired_value
   )
-  return response['CaseId']
+  return response['RequestedQuota']['CaseId']

data/lib/cfnvpn/templates/vpn.rb

@@ -163,7 +163,7 @@ module CfnVpn
               Targets([
                 { 
                   Arn: FnGetAtt(:CfnVpnAutoRoutePopulator, :Arn),
-                  Id: "cfnvpnautoroutepopulator#{route[:dns].event_id_safe}",
+                  Id: "auto-route-populator",
                   Input: FnSub(input.to_json)
                 }
               ])
@@ -297,6 +297,31 @@ module CfnVpn
                   Resource: '*'
                 }]
               }
+            },
+            {
+              PolicyName: 'vpn-quotas',
+              PolicyDocument: {
+                Version: '2012-10-17',
+                Statement: [
+                  {
+                    Effect: 'Allow',
+                    Action: [
+                      'servicequotas:ListRequestedServiceQuotaChangeHistoryByQuota',
+                    ],
+                    Resource: '*'
+                  },
+                  {
+                    Effect: 'Allow',
+                    Action: [
+                      'servicequotas:RequestServiceQuotaIncrease'
+                    ],
+                    Resource: [
+                      FnSub('arn:aws:servicequotas:${AWS::Region}:${AWS::AccountId}:ec2/L-401D78F7'),
+                      FnSub('arn:aws:servicequotas:${AWS::Region}:${AWS::AccountId}:ec2/L-9A1BC94B')
+                    ]
+                  }
+                ]
+              }
             }
           ])
           Tags([

data/lib/cfnvpn/version.rb

@@ -1,4 +1,4 @@
 module CfnVpn
-  VERSION = "1.4.2".freeze
+  VERSION = "1.4.3".freeze
   CHANGE_SET_VERSION = VERSION.gsub('.', '-').freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-vpn
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Guslington
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor