From 556a1165c18e65240339e379db731b95ecaaf09f Mon Sep 17 00:00:00 2001 From: Sorah Fukumori Date: Thu, 5 Dec 2024 05:23:05 +0900 Subject: [PATCH 1/3] test against ruby 3.3 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81b22d2..34aee9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2'] + ruby-version: ['3.1', '3.2', '3.3'] container: image: public.ecr.aws/sorah/ruby:${{ matrix.ruby-version }}-dev steps: @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2'] + ruby-version: ['3.1', '3.2', '3.3'] # FIXME: once GitHub Actions gains support of adding command line arguments to container # services: From f17c896abbf3c51bf91045062b17b2455e4b5edb Mon Sep 17 00:00:00 2001 From: Sorah Fukumori Date: Thu, 5 Dec 2024 05:18:53 +0900 Subject: [PATCH 2/3] avoid querying route53 with empty leading labels FATAL problem: DomainLabelEmpty (Domain label is empty) encountered with 'example.org..' (Aws::Route53::Errors::InvalidInput) Formerly we had no problem, but Route53 may changed its behaviour to reject queries including such invalid names (empty labels). --- lib/acmesmith/challenge_responders/route53.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/acmesmith/challenge_responders/route53.rb b/lib/acmesmith/challenge_responders/route53.rb index 1c782c4..3284bc3 100644 --- a/lib/acmesmith/challenge_responders/route53.rb +++ b/lib/acmesmith/challenge_responders/route53.rb @@ -89,7 +89,7 @@ def save_original_records(*domain_and_challenges) domain_and_challenges.each do |domain, challenge| hosted_zone_id = find_hosted_zone(domain) - name = "#{challenge.record_name}.#{domain}." + name = "#{challenge.record_name}.#{canonical_fqdn(domain)}." rrsets = list_existing_rrsets(hosted_zone_id, name) next if rrsets.empty? From e787001453c840282719b5b054b6ecdad546eefb Mon Sep 17 00:00:00 2001 From: Sorah Fukumori Date: Thu, 5 Dec 2024 05:20:42 +0900 Subject: [PATCH 3/3] bundle update --- Gemfile.lock | 94 ++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 806dd88..2ad0601 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,62 +11,68 @@ PATH GEM remote: https://rubygems.org/ specs: - acme-client (2.0.15) + acme-client (2.0.19) + base64 (~> 0.2.0) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - aws-eventstream (1.2.0) - aws-partitions (1.855.0) - aws-sdk-acm (1.62.0) - aws-sdk-core (~> 3, >= 3.184.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.187.1) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) + aws-eventstream (1.3.0) + aws-partitions (1.1018.0) + aws-sdk-acm (1.81.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) + aws-sdk-core (3.214.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) - aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.81.0) - aws-sdk-core (~> 3, >= 3.184.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.138.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-route53 (1.105.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.176.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - diff-lcs (1.5.0) - faraday (2.7.12) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - faraday-retry (2.2.0) + diff-lcs (1.5.1) + faraday (2.12.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + faraday-retry (2.2.1) faraday (~> 2.0) jmespath (1.6.2) - mini_portile2 (2.8.6) - nokogiri (1.16.5) + json (2.9.0) + logger (1.6.2) + mini_portile2 (2.8.8) + net-http (0.6.0) + uri + nokogiri (1.16.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) - racc (1.8.0) - rake (13.1.0) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + racc (1.8.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - ruby2_keywords (0.0.5) - thor (1.3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) + thor (1.3.2) + uri (1.0.2) PLATFORMS ruby @@ -79,4 +85,4 @@ DEPENDENCIES rspec BUNDLED WITH - 2.4.12 + 2.5.23