infopark-aws_utils 0.8.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 006b2100b6b073324eaca1778953e0145be0fd50
-  data.tar.gz: 81aef7b6cb4db98985357c06a27ac58309541b3a
+SHA256:
+  metadata.gz: e8d3e58deae1c3f55e18b551ebbfb40572e1e4ff815b53d82f88e3c864289efa
+  data.tar.gz: 353a64a595b54c01154ea956a68734de2bf3224dca43d7a4b6bf502e5031040e
 SHA512:
-  metadata.gz: 32e2faf37d95a697c58fa97cbe3460cf2024e42ab098c34127ad31703cc64ef4ce63176d038946d29972d6fdf2d6e69142abaefc97ccf7328c8972fc8cef0b3c
-  data.tar.gz: a185ecc2feabf5fb080c00f2b754720e857c10ef7dc2a9f071ddb26ce06d20c5d085bfeb24a66cb9bfae49c5ee2baa21cfc2667c8dd34f7dc5d4d8d8732ff87f
+  metadata.gz: 3e9fa7c93e45577e8773dba59565033f7c7612740adfbd2db6fecfc9de08f9ef87523891f7406ae847a78ded73d852db7484e47fa853e9afb3731e852f275cb0
+  data.tar.gz: 6a1fe70450d9c804a831add17ac1b8fb08b37f1af99186f6c13f758aa84bfdbcc6a7f9f823457f36001ccaeed2e5df3a0be8dc4eb87ad876e7d2e157dc6368a5

data/lib/infopark/aws_utils/env.rb

@@ -110,18 +110,22 @@ class Env
         else
           raise "invalid root_device_type: #{root_device_type}"
         end
-    available_images = AwsUtils.gather_all(ec2, :describe_images,
-        owners: [AWS_AMI_OWNER],
-        filters: [
-          {name: "root-device-type", values: root_device_filter_value},
-          {name: "ena-support", values: ["true"]},
-          {name: "image-type", values: ["machine"]},
-          {name: "virtualization-type", values: ["hvm"]},
-        ])
-        .reject {|image| image.name.include?(".rc-") }
-        .reject {|image| image.name.include?("-minimal-") }
-        .reject {|image| image.name.include?("-test") }
-        .reject {|image| image.name.include?("amzn-ami-vpc-nat-") }
+    available_images = AwsUtils.gather_all(
+      client: ec2,
+      method: :describe_images,
+      response_key: :image_details,
+      owners: [AWS_AMI_OWNER],
+      filters: [
+        {name: "root-device-type", values: root_device_filter_value},
+        {name: "ena-support", values: ["true"]},
+        {name: "image-type", values: ["machine"]},
+        {name: "virtualization-type", values: ["hvm"]},
+      ],
+    )
+      .reject {|image| image.name.include?(".rc-") }
+      .reject {|image| image.name.include?("-minimal-") }
+      .reject {|image| image.name.include?("-test") }
+      .reject {|image| image.name.include?("amzn-ami-vpc-nat-") }
     (reject_image_name_patterns || []).each do |pattern|
       available_images.reject! {|image| image.name =~ pattern }
     end
@@ -129,12 +133,22 @@ class Env
   end
 
   def find_image_by_id(id)
-    AwsUtils.gather_all(ec2, :describe_images, image_ids: [id]).first
+    AwsUtils.gather_all(
+      client: ec2,
+      method: :describe_images,
+      response_key: :image_details,
+      image_ids: [id],
+    ).first
   end
 
   def find_image_by_name(name)
-    AwsUtils.gather_all(ec2, :describe_images, owners: [DEV_ACCOUNT_ID],
-        filters: [{name: "name", values: [name]}]).first
+    AwsUtils.gather_all(
+      client: ec2,
+      method: :describe_images,
+      response_key: :image_details,
+      owners: [DEV_ACCOUNT_ID],
+      filters: [{name: "name", values: [name]}],
+    ).first
   end
 
   private

data/lib/infopark/aws_utils/version.rb

@@ -1,5 +1,5 @@
 module Infopark
   module AwsUtils
-    VERSION = "0.8.1"
+    VERSION = "1.0.1"
   end
 end

data/lib/infopark/aws_utils.rb

@@ -6,7 +6,7 @@ module Infopark
     AWS_AMI_OWNER = "137112412989"
 
     class << self
-      def gather_all(client, method, **options)
+      def gather_all(client:, method:, response_key:, **options)
         unless block_given?
           @gather_cache ||= {}
           cache_key = [client, method, options]
@@ -16,14 +16,13 @@ module Infopark
         result = []
         loop do
           response = retry_on_throttle { client.send(method, **options) }
-          key = (response.members - [:next_token, :failures]).first
           if response.members.include?(:failures) && !response.failures.empty?
             raise "Failed gathering all #{method}: #{response.failures}"
           end
           if block_given?
-            response[key].each {|entity| retry_on_throttle { yield entity } }
+            response[response_key].each {|entity| retry_on_throttle { yield entity } }
           else
-            result += response[key]
+            result += response[response_key]
           end
           unless options[:next_token] = response.members.include?(:next_token) && response.next_token
             break
@@ -45,7 +44,7 @@ module Infopark
       def local_config
         @local_config ||= (
           path = "#{Dir.home}/.config/infopark/aws_utils.json"
-          if File.exists?(path)
+          if File.exist?(path)
             JSON.parse(File.read(path))
           else
             {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark-aws_utils
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Tilo Prütz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -181,11 +181,11 @@ files:
 - lib/infopark/aws_utils/version.rb
 - spec/env_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage:
 licenses:
 - UNLICENSED
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,9 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: A utility lib to ease the use of the AWS SDK
 test_files: []