MovableInkAWS 2.8.12 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f5666ed37293a2ea202e1bf1b567fd810a1fefb2ab2adc8860512be256dd48
-  data.tar.gz: f5520d3c179d4dfc9e411d349a709fc0db70b9d438b0ac50836ece2bf48ba56f
+  metadata.gz: 8602883b498821af28179a68ff1dee4413f0e636f802a7e07499046c6a1a5a7e
+  data.tar.gz: b180dd180d64be8d22ac3e275368197f45905759caae71c1fb232dac9f8b79f8
 SHA512:
-  metadata.gz: a949f51ca251131c088d27a2590f2ce0a44c371544d07667d5736a07ab191e6983b175f7cce594c1eaa0a7e1dad74ebd9f17029a5a599e12daea0fefbd8a3213
-  data.tar.gz: 98592b9447ce1c149901ab0c7aaa788b2ab7c79daaf4b701b0fe4ece330111fdb90d5eae7ac888b4b2d6dfac654ecf60b3c9b596ac1e6dc0a05d2e239c5e153a
+  metadata.gz: a1d87f6fec73e2bcd8084ee163b40ac6214485e404233f5b66b86ff2ba18bdefed421e289e7858fdc618a657f4098e645d07aa3313b22038c9b22ecf6a5cc059
+  data.tar.gz: 1572b32ad0f8219ba77bd90644026456e04a5fdba3deb007ec3d4f125c984b1dfc70263719feaa05b3c59d5bd9b3dd2eaa2f1ad28850034f669ee75b0e4c2d87

data/.github/workflows/test.yaml

@@ -10,15 +10,15 @@ on:
 jobs:
   test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.1
 
     - name: Install dependencies
       run: bundle install --retry=3

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.1.4

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'faraday', '< 2.9'
-gem 'httparty', '0.21.0'
+gem 'faraday', '~> 2.13'
+gem 'httparty', '~> 0.23.1'
 
 group :test do
   gem 'rspec',    '~> 3.6'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.8.12)
+    MovableInkAWS (2.9.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -16,88 +16,99 @@ PATH
       aws-sdk-s3 (~> 1)
       aws-sdk-sns (~> 1)
       aws-sdk-ssm (~> 1)
-      aws-sigv4 (~> 1.1)
+      aws-sigv4 (~> 1)
       diplomat (= 2.6.4)
-      faraday (< 2.9)
-      httparty (= 0.21.0)
+      faraday (~> 2.13)
+      httparty (= 0.23.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.921.0)
-    aws-sdk-athena (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.107.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.90.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.193.0)
+    aws-eventstream (1.3.2)
+    aws-partitions (1.1095.0)
+    aws-sdk-athena (1.101.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-autoscaling (1.133.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-cloudwatch (1.112.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-core (3.222.3)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ec2 (1.453.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.101.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.100.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.97.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.80.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.119.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.229.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.88.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.148.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+      logger
+    aws-sdk-ec2 (1.517.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-eks (1.135.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-elasticache (1.125.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-iam (1.120.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-lambda (1.149.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-rds (1.274.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-route53 (1.112.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.184.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sdk-sns (1.74.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.168.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-sns (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-ssm (1.193.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
+    bigdecimal (3.1.9)
     crack (0.4.5)
       rexml
+    csv (3.3.4)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
     diplomat (2.6.4)
       deep_merge (~> 1.2)
       faraday (>= 0.9, < 3.0, != 2.0.0)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     hashdiff (1.1.0)
-    httparty (0.21.0)
+    httparty (0.23.1)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     jmespath (1.6.2)
+    json (2.11.3)
+    logger (1.7.0)
     mini_mime (1.1.5)
-    multi_xml (0.6.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    net-http (0.6.0)
+      uri
     public_suffix (5.0.4)
     rexml (3.2.6)
     rspec (3.12.0)
@@ -113,7 +124,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    ruby2_keywords (0.0.5)
+    uri (1.0.3)
     webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -124,8 +135,8 @@ PLATFORMS
 
 DEPENDENCIES
   MovableInkAWS!
-  faraday (< 2.9)
-  httparty (= 0.21.0)
+  faraday (~> 2.13)
+  httparty (~> 0.23.1)
   rspec (~> 3.6)
   webmock
 

data/MovableInkAWS.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'aws-sdk-s3', '~> 1'
   s.add_runtime_dependency 'aws-sdk-sns', '~> 1'
   s.add_runtime_dependency 'aws-sdk-ssm', '~> 1'
-  s.add_runtime_dependency 'aws-sigv4', '~> 1.1'
-  s.add_runtime_dependency 'httparty',  '0.21.0'
+  s.add_runtime_dependency 'aws-sigv4', '~> 1'
+  s.add_runtime_dependency 'httparty',  '0.23.1'
   s.add_runtime_dependency 'diplomat',  '2.6.4'
-  s.add_runtime_dependency 'faraday',  '< 2.9'
+  s.add_runtime_dependency 'faraday',  '~> 2.13'
 
   all_files  = `git ls-files`.split("\n")
   test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/PULL_REQUEST_TEMPLATE.md

@@ -13,4 +13,4 @@
 #### Dependencies (if any)
 
 
-:house: [sc-XXXX](https://app.shortcut.com/movableink/story/XXXX)
+:card_index: [sc-XXXX]

data/lib/movable_ink/aws/ec2.rb

@@ -1,5 +1,6 @@
 require 'aws-sdk-ec2'
 require 'diplomat'
+require 'ostruct'
 
 module MovableInk
   class AWS

data/lib/movable_ink/aws/sns.rb

@@ -37,13 +37,13 @@ module MovableInk
         dedup_key:
       )
         run_with_backoff do
-          message_json = pd_message_json({
+          message_json = pd_message_json(
             source: source,
             summary: summary,
             links: links,
             custom_details: custom_details,
-            dedup_key: dedup_key,
-          })
+            dedup_key: dedup_key
+          )
 
           sns.publish({
             topic_arn: sns_pagerduty_topic_arn,

data/lib/movable_ink/consul/consul.rb

@@ -8,9 +8,10 @@ end
 module MovableInk
   module Consul
     module Kv
-      def self.get(*args)
+      def self.get(*args, **kwargs)
         begin
-          result = Diplomat::Kv.get(*args)
+          options = kwargs
+          result = Diplomat::Kv.get(*args, **options)
           JSON.parse(result) if !result.nil?
         rescue JSON::ParserError
           result

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.8.12'
+    VERSION = '2.9.0'
   end
 end

data/spec/ec2_spec.rb

@@ -441,12 +441,6 @@ describe MovableInk::AWS::EC2 do
 
         json = JSON.generate(consul_app_service_instances)
         stub_request(:get, "https://localhost:8501/v1/health/service/app?cached=true&dc=#{my_datacenter}&passing=true&stale=true").
-         with(
-            headers: {
-            'Accept'=>'*/*',
-            'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent'=>'Faraday v2.8.1'
-           }).
          to_return(status: 200, body: json, headers: {})
 
         app_instances = aws.instances(role: 'app', discovery_type: 'consul')
@@ -454,12 +448,6 @@ describe MovableInk::AWS::EC2 do
 
         json = JSON.generate(consul_ojos_service_instances)
         stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached=true&dc=#{my_datacenter}&passing=true&stale=true").
-         with(
-           headers: {
-          'Accept'=>'*/*',
-          'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-          'User-Agent'=>'Faraday v2.8.1'
-           }).
          to_return(status: 200, body: json, headers: {})
 
         ojos_instances = aws.instances(role: 'ojos', discovery_type: 'consul')
@@ -472,12 +460,6 @@ describe MovableInk::AWS::EC2 do
 
         json = JSON.generate(consul_ojos_service_instances)
         stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached=true&dc=#{my_datacenter}&node-meta=availability_zone:#{other_availability_zone}&passing=true&stale=true").
-         with(
-            headers: {
-            'Accept'=>'*/*',
-            'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent'=>'Faraday v2.8.1'
-           }).
          to_return(status: 200, body: json, headers: {})
 
         ojos_instances = aws.instances(role: 'ojos', availability_zone: other_availability_zone, discovery_type: 'consul')
@@ -491,13 +473,6 @@ describe MovableInk::AWS::EC2 do
 
         json = JSON.generate(consul_kubernetes_service_instances)
         stub_request(:get, "https://localhost:8501/v1/health/service/kubernetes-service-name?cached=true&dc=#{my_datacenter}&passing=true&stale=true")
-          .with({
-            headers: {
-              'Accept'=>'*/*',
-              'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-              'User-Agent'=>'Faraday v2.8.1'
-            }
-          })
           .to_return(status: 200, body: json, headers: {})
 
          resp_instances = aws.instances(role: 'kubernetes-service-name', discovery_type: 'consul')

data/spec/route53_spec.rb

@@ -9,7 +9,8 @@ describe MovableInk::AWS::Route53 do
     it "should list all hosted zones" do
       zones_data = route53.stub_data(:list_hosted_zones, is_truncated: false, hosted_zones: [{
         id: '123456789X',
-        name: 'domain.tld'
+        name: 'domain.tld',
+        caller_reference: '123'
       }])
       route53.stub_responses(:list_hosted_zones, zones_data)
       allow(aws).to receive(:route53).and_return(route53)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.8.12
+  version: 2.9.0
 platform: ruby
 authors:
 - MI SRE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2025-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -212,28 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -252,16 +252,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.13'
 description: AWS Utility methods for MovableInk
 email: devops@movableink.com
 executables: []
@@ -271,6 +271,7 @@ files:
 - ".github/workflows/pr-lint.yaml"
 - ".github/workflows/test.yaml"
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - MovableInkAWS.gemspec
@@ -323,20 +324,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: AWS Utility methods for MovableInk
-test_files:
-- spec/autoscaling_spec.rb
-- spec/aws_spec.rb
-- spec/consul_spec.rb
-- spec/ec2_spec.rb
-- spec/elasticache_spec.rb
-- spec/errors_spec.rb
-- spec/iam_spec.rb
-- spec/metadata_spec.rb
-- spec/route53_spec.rb
-- spec/s3_spec.rb
-- spec/sns_spec.rb
-- spec/ssm_spec.rb
+test_files: []