From b6f65b887f656da093d4d396d88eeaf8da3a7f25 Mon Sep 17 00:00:00 2001 From: Guslington Date: Wed, 9 Nov 2022 11:11:46 +1100 Subject: [PATCH 1/4] account for larger than 4Kb configs by changing them to Advanced parameter tier --- lib/cfnvpn/templates/vpn.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cfnvpn/templates/vpn.rb b/lib/cfnvpn/templates/vpn.rb index 5c320ed..e467155 100644 --- a/lib/cfnvpn/templates/vpn.rb +++ b/lib/cfnvpn/templates/vpn.rb @@ -235,7 +235,7 @@ def render(name, config) SSM_Parameter(:CfnVpnConfig) { Description "#{name} cfnvpn config" Name "/cfnvpn/config/#{name}" - Tier 'Standard' + Tier 'Intelligent-Tiering' Type 'String' Value config.to_json Tags({ From d95f516e8c17fa37a0c434ab7cef648372eb61e2 Mon Sep 17 00:00:00 2001 From: Guslington Date: Wed, 9 Nov 2022 11:11:57 +1100 Subject: [PATCH 2/4] bump gem versions --- Gemfile.lock | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ebc2e36..6a809af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - cfn-vpn (1.3.4) + cfn-vpn (1.4.3) aws-sdk-acm (~> 1, < 2) aws-sdk-cloudformation (~> 1, < 2) aws-sdk-ec2 (~> 1.95, < 2) @@ -16,48 +16,48 @@ PATH GEM remote: https://rubygems.org/ specs: - aws-eventstream (1.1.1) - aws-partitions (1.432.0) - aws-sdk-acm (1.39.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-eventstream (1.2.0) + aws-partitions (1.658.0) + aws-sdk-acm (1.54.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.49.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudformation (1.72.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.119.0) + aws-sdk-core (3.166.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-ec2 (1.347.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-ec2 (1.220.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.43.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.91.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.117.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-ssm (1.144.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.104.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) - cfndsl (1.3.1) + cfndsl (1.4.0) hana (~> 1.3) hana (1.3.7) jmespath (1.6.1) netaddr (2.0.4) - rake (13.0.1) - rubyzip (2.3.0) + rake (13.0.6) + rubyzip (2.3.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (0.20.3) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) PLATFORMS - ruby + x86_64-darwin-20 DEPENDENCIES bundler (~> 2.0) @@ -65,4 +65,4 @@ DEPENDENCIES rake (~> 13.0) BUNDLED WITH - 2.1.4 + 2.3.13 From a3af662c105b7f61e76b2fef19716f34c4be6fe7 Mon Sep 17 00:00:00 2001 From: Guslington Date: Wed, 9 Nov 2022 11:12:17 +1100 Subject: [PATCH 3/4] remove travis build --- .travis.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 63e8a15..0000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -sudo: required -dist: trusty -language: ruby -rvm: - - 2.5 -script: - - bundle install - - gem build cfn-vpn.gemspec - - gem install cfn-vpn-*.gem - - cfn-vpn help -deploy: - provider: rubygems - api_key: "${RUBYGEMS_API_KEY}" - gem: cfn-vpn - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^develop|master && $TRAVIS_EVENT_TYPE =~ ^push|api$ && $TRAVIS_REPO_SLUG == "base2services/aws-client-vpn" From 47fbf745570d9e504233f50ea27b51397dfcc6a4 Mon Sep 17 00:00:00 2001 From: Guslington Date: Wed, 9 Nov 2022 11:12:34 +1100 Subject: [PATCH 4/4] update docker build action --- .github/workflows/release-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml index 882dd53..6f57743 100644 --- a/.github/workflows/release-image.yml +++ b/.github/workflows/release-image.yml @@ -24,7 +24,7 @@ jobs: password: ${{ secrets.GHCR_PUSH_TOKEN }} - name: Build and push Container Image to GitHub Container Repository - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./Dockerfile