vaws 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1cfaef05b4b989fddfd11ba0d2424fd43f26d94d26320462364c9a57c99be67
-  data.tar.gz: 2d66fce672b4957c00d89573446be245b111a060a39e465649c7e0dd9b0d2718
+  metadata.gz: 1436a9e8759ca8ea7032a05550d72d21047a7b893ce0ba1a8df23530fe0c9d1a
+  data.tar.gz: 3adeb052af24a2646be4369c2ec103af27e46e945474c5da077ba833faab7941
 SHA512:
-  metadata.gz: 9830009d7ea188f8a73cb31756e02c5877c32dca90085b5fd234120419770f993227d3fbde9fda9f1ef8c3a0001f321fe945a5cec3b2b40c1de451befd42f183
-  data.tar.gz: 8e2c40b1fe8eda1928cb4b4ac168d1de0e0a245c1ad8e53ff3521753bbdf37b27d08e5bd89e0165589b50ba778a6ac3c284faa8416d879c4d9286538651cec05
+  metadata.gz: 2c64a36363baedb0bc3966447862183ca6ace97ef86a00bfcf6f22fa1b05df57dafe3c82eba49a2c4c0344d644f692140dbf6b725c663c3786b4af0a9ad8c0f1
+  data.tar.gz: 6e8ae8f04ffdc5f1d855a1ffed51e5d3b72cb83188795d83cfc9941deaa94d00596b1ecd26d6e5ca82d2ee2dab720cb28e755c7c50bb06e37f22b4de29ecbd37

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vaws (0.7.0)
+    vaws (0.8.0)
       aws-sdk-acm
       aws-sdk-ec2
       aws-sdk-ecs

data/lib/vaws/aws/acm_describer.rb

@@ -12,14 +12,22 @@ module Vaws
       end
 
       def set_basic_info
-        rows  = []
-        certs = @acm_client.list_certificates({ max_items: 1000 })
+        rows       = []
+        next_token = nil
 
-        certs.certificate_summary_list.each do |cert|
-          cert_arn    = cert.certificate_arn
-          cert_domain = cert.domain_name
-          rows << [cert_domain, cert_arn]
-        end
+        begin
+          param_args              = {
+            max_items: 1000
+          }
+          param_args[:next_token] = next_token if next_token
+          resp                    = @acm_client.list_certificates(param_args)
+          resp.certificate_summary_list.each do |cert|
+            cert_arn    = cert.certificate_arn
+            cert_domain = cert.domain_name
+            rows << [cert_domain, cert_arn]
+          end
+          next_token = resp.next_token
+        end while next_token
         @term_table = Terminal::Table.new :headings => ['Domain', 'Arn'], :rows => rows.sort
       end
     end

data/lib/vaws/aws/alb_describer.rb

@@ -12,20 +12,28 @@ module Vaws
       end
 
       def set_basic_info
-        rows = []
-        albs = @alb_client.describe_load_balancers
+        rows        = []
+        next_marker = nil
 
-        # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ElasticLoadBalancingV2/Client.html#describe_load_balancers-instance_method
-        albs.load_balancers.each do |alb|
-          arn    = alb.load_balancer_arn.sub!(/arn:aws:elasticloadbalancing:ap-northeast-1:163714994724:loadbalancer\/...\//, '')
-          dns    = alb.dns_name
-          name   = alb.load_balancer_name
-          scheme = alb.scheme
-          vpc    = alb.vpc_id
-          type   = alb.type
+        begin
+          param_args          = {
+            page_size: 400
+          }
+          param_args[:marker] = next_marker if next_marker
+          resp                = @alb_client.describe_load_balancers(param_args)
 
-          rows << [name, type, scheme, vpc, arn, dns]
-        end
+          # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ElasticLoadBalancingV2/Client.html#describe_load_balancers-instance_method
+          resp.load_balancers.each do |alb|
+            arn    = alb.load_balancer_arn.sub!(/arn:aws:elasticloadbalancing:ap-northeast-1:163714994724:loadbalancer\/...\//, '')
+            dns    = alb.dns_name
+            name   = alb.load_balancer_name
+            scheme = alb.scheme
+            vpc    = alb.vpc_id
+            type   = alb.type
+            rows << [name, type, scheme, vpc, arn, dns]
+            next_marker = resp.next_marker
+          end
+        end while next_marker
         @term_table = Terminal::Table.new :headings => ['Name', 'Type', 'Scheme', 'Vpc', 'Short_Arn', 'Dns'], :rows => rows.sort
       end
     end

data/lib/vaws/aws/ec2_describer.rb

@@ -13,28 +13,37 @@ module Vaws
       end
 
       def set_basic_info
-        rows             = []
-        sg_ids           = ""
-        ec2_reservations = @ec2_client.describe_instances.reservations
-        ec2_reservations.each do |ec2_rsvn|
-          ec2_rsvn.instances.each do |ec2_instance|
-            ec2_instance.tags.each do |tag|
-              @tag = tag.value if tag.key == 'Name'
-            end
-            ec2_instance.security_groups.each_with_index do |sg, index|
-              sg_ids << "#{sg.group_id}, "
-              sg_ids = sg_ids.gsub(/, $/, '') if index == ec2_instance.security_groups.size - 1
+        rows       = []
+        next_token = nil
+        sg_ids     = ""
+
+        begin
+          param_args              = {
+            max_results: 1000
+          }
+          param_args[:next_token] = next_token if next_token
+          resp                    = @ec2_client.describe_instances(param_args)
+          resp[:reservations].each do |reservation|
+            reservation.instances.each do |instance|
+              instance.tags.each do |tag|
+                @tag = tag.value if tag.key == 'Name'
+              end
+              instance.security_groups.each_with_index do |sg, index|
+                sg_ids << "#{sg.group_id}, "
+                sg_ids = sg_ids.gsub(/, $/, '') if index == instance.security_groups.size - 1
+              end
+              instance_id   = instance.instance_id
+              instance_type = instance.instance_type
+              public_ip     = instance.public_ip_address
+              private_ip    = instance.private_ip_address
+              state_name    = instance.state.name
+              rows << [@tag, instance_id, instance_type, public_ip, private_ip, state_name, sg_ids]
+              sg_ids = ''
             end
-            instance_id   = ec2_instance.instance_id
-            instance_type = ec2_instance.instance_type
-            public_ip     = ec2_instance.public_ip_address
-            private_ip    = ec2_instance.private_ip_address
-            state_name    = ec2_instance.state.name
-            rows << [@tag, instance_id, instance_type, public_ip, private_ip, state_name, sg_ids]
-            sg_ids = ''
           end
-        end
-        @term_table = Terminal::Table.new :headings => ['Name', 'Id', 'Type', 'GlobalIp', 'PrivateIp', 'Status','SecurityGroupId'], :rows => rows.sort
+          next_token = resp.next_token
+        end while next_token
+        @term_table = Terminal::Table.new :headings => ['Name', 'Id', 'Type', 'GlobalIp', 'PrivateIp', 'Status', 'SecurityGroupId'], :rows => rows.sort
       end
     end
   end

data/lib/vaws/aws/ecs_describer.rb

@@ -14,14 +14,13 @@ module Vaws
       end
 
       def set_basic_info
-        get_cluster_arns
-
         rows = []
-        @cluster_arns.each do |cluster_arn|
+
+        cluster_arns.each do |cluster_arn|
           cluster_name = cluster_arn.gsub(/arn:aws:ecs:#{ENV['AWS_DEFAULT_REGION']}:[0-9]*:cluster\//, "")
           @cluster_info.store("#{cluster_name}", {})
           cluster_name     = "#{cluster_name}"
-          cluster_services = get_service_names(cluster_arn)
+          cluster_services = service_names(cluster_arn)
 
           ecs_cluster           = @ecs_client.describe_clusters({ clusters: ["#{cluster_arn}"] }).clusters
           running_tasks_count   = ecs_cluster[0].running_tasks_count
@@ -36,15 +35,22 @@ module Vaws
 
       private
 
-      def get_cluster_arns
-        @cluster_arns = @ecs_client.list_clusters[:cluster_arns]
+      def cluster_arns
+        param_args = {
+          max_results: 100
+        }
+        @ecs_client.list_clusters(param_args)[:cluster_arns]
       end
 
-      def get_service_arns(cluster_arn)
-        @ecs_client.list_services({ cluster: "#{cluster_arn}" })[:service_arns]
+      def service_arns(cluster_arn)
+        param_args = {
+          cluster:     cluster_arn,
+          max_results: 1
+        }
+        @ecs_client.list_services(param_args)[:service_arns]
       end
 
-      def get_service_names(cluster_arn)
+      def service_names(cluster_arn)
         service_ary = @ecs_client.list_services({ cluster: "#{cluster_arn}", max_results: 100 })[:service_arns].sort
         service_ary.join("\n").gsub(/arn:aws:ecs:#{ENV['AWS_DEFAULT_REGION']}:[0-9]*:service\//, "")
       end

data/lib/vaws/aws/route53_describer.rb

@@ -14,33 +14,70 @@ module Vaws
 
       def set_basic_info
         rows = []
-        get_hosted_zone
-
-        @r53_hosted_zone_ids.each do |zone_id|
-          record_values = ''
-          records       = @r53_client.list_resource_record_sets({ hosted_zone_id: "#{zone_id}", max_items: 1000 })
-          records.resource_record_sets.each do |record_sets|
-            record_name = record_sets.name
-            record_type = record_sets.type
-            record_ttl  = record_sets.ttl
-            if record_sets.alias_target.nil?
-              record_sets.resource_records.each do |record|
+
+        zone_id                = selected_zone_id
+        record_values          = ''
+        next_record_identifier = nil
+        next_record_name       = nil
+        next_record_type       = nil
+
+        begin
+          param_args                           = {
+            hosted_zone_id: zone_id,
+            max_items:      200
+          }
+          param_args[:start_record_identifier] = next_record_identifier if next_record_identifier
+          param_args[:start_record_name]       = next_record_name if next_record_name
+          param_args[:start_record_type]       = next_record_type if next_record_type
+          resp                                 = @r53_client.list_resource_record_sets(param_args)
+
+          resp.resource_record_sets.each do |record_set|
+            name = record_set.name
+            type = record_set.type
+            ttl  = record_set.ttl
+            if record_set.alias_target.nil?
+              record_set.resource_records.each do |record|
                 record_values << "#{record.value.to_s}\n"
               end
             else
-              record_values = record_sets.alias_target.dns_name
+              record_values = record_set.alias_target.dns_name
             end
-            rows << [record_name, record_type, record_values, record_ttl]
+            rows << [name, type, record_values, ttl]
             record_values = ''
           end
-        end
+          next_record_identifier = resp.next_record_identifier
+          next_record_name       = resp.next_record_name
+          next_record_type       = resp.next_record_type
+        end while next_record_identifier
         @term_table = Terminal::Table.new :headings => ['Fqdn', 'Type', 'Value', 'Ttl'], :rows => rows.sort
       end
 
+
       private
 
-      def get_hosted_zone
-        @r53_client.list_hosted_zones({ max_items: 100 }).hosted_zones.each do |zone|
+      def selected_zone_id
+        puts "# ZONE LIST"
+        zones = hosted_zones
+        zones.each_with_index do |zone, cnt|
+          puts "#{cnt}:#{zone[:name]}"
+        end
+        print "zone number: "
+        input = STDIN.gets
+        begin
+          raise unless /[0-9].*/ =~ input
+          input_zone_number = input.to_i
+          zones[input_zone_number][:id] if zones[input_zone_number][:id]
+        rescue
+          puts "Not found zone"
+          return
+        end
+      end
+
+      def hosted_zones
+        param_args = {
+          max_items: 100
+        }
+        @r53_client.list_hosted_zones(param_args).hosted_zones.each do |zone|
           @r53_hosted_zone_ids << zone.id
         end
       end

data/lib/vaws/aws/security_group_describer.rb

@@ -13,33 +13,42 @@ module Vaws
       end
 
       def set_basic_info
-        rows    = []
-        resp_sg = @ec2_client.describe_security_groups
-        resp_sg.security_groups.each do |security_group|
-          group_name = security_group.group_name
-          group_id   = security_group.group_id
+        rows       = []
+        next_token = nil
 
-          # Inboundルール
-          security_group.ip_permissions.each do |ip_permission|
-            ip_permission.from_port.nil? ? from_port = "all" : from_port = ip_permission.from_port.to_s
-            ip_permission.ip_protocol == "-1" ? ip_protocol = "all" : ip_protocol = ip_permission.ip_protocol
+        begin
+          param_args              = {
+            max_results: 100
+          }
+          param_args[:next_token] = next_token if next_token
+          resp                    = @ec2_client.describe_security_groups(param_args)
+          resp.security_groups.each do |security_group|
+            group_name = security_group.group_name
+            group_id   = security_group.group_id
 
-            # セキュリティグループによるルール
-            ip_permission.user_id_group_pairs.each do |user_id_group_pair|
-              cidr_ip = user_id_group_pair.group_id
-              rows << [group_name, group_id, "#{cidr_ip}:#{from_port}", ip_protocol]
-              group_name = ''
-              group_id   = ''
-            end
-            # IPアドレスによるルール
-            ip_permission.ip_ranges.each do |ip_range|
-              cidr_ip = ip_range.cidr_ip
-              rows << [group_name, group_id, "#{cidr_ip}:#{from_port}", ip_protocol]
-              group_name = ''
-              group_id   = ''
+            # Inboundルール
+            security_group.ip_permissions.each do |ip_permission|
+              ip_permission.from_port.nil? ? from_port = "all" : from_port = ip_permission.from_port.to_s
+              ip_permission.ip_protocol == "-1" ? ip_protocol = "all" : ip_protocol = ip_permission.ip_protocol
+
+              # セキュリティグループによるルール
+              ip_permission.user_id_group_pairs.each do |user_id_group_pair|
+                cidr_ip = user_id_group_pair.group_id
+                rows << [group_name, group_id, "#{cidr_ip}:#{from_port}", ip_protocol]
+                group_name = ''
+                group_id   = ''
+              end
+              # IPアドレスによるルール
+              ip_permission.ip_ranges.each do |ip_range|
+                cidr_ip = ip_range.cidr_ip
+                rows << [group_name, group_id, "#{cidr_ip}:#{from_port}", ip_protocol]
+                group_name = ''
+                group_id   = ''
+              end
             end
           end
-        end
+          next_token = resp.next_token
+        end while next_token
         @term_table = Terminal::Table.new :headings => ['Name', 'Id', 'Inbound(Cidr|Securitygroup:Port)', 'Protocol'], :rows => rows
       end
     end

data/lib/vaws/aws/ssm_describer.rb

@@ -12,17 +12,24 @@ module Vaws
       end
 
       def set_basic_info
-        rows   = []
-        params = @ssm_client.describe_parameters({ max_results: 50 })
+        rows       = []
+        next_token = nil
 
-        params.parameters.each do |param|
-          name             = param.name
-          type             = param.type
-          version          = param.version
-          last_modify_date = param.last_modified_date
-
-          rows << [name, type, version, last_modify_date]
-        end
+        begin
+          param_args              = {
+            max_results: 100
+          }
+          param_args[:next_token] = next_token if next_token
+          resp                    = @ssm_client.describe_parameters(param_args)
+          resp.parameters.each do |param|
+            name             = param.name
+            type             = param.type
+            version          = param.version
+            last_modify_date = param.last_modified_date
+            rows << [name, type, version, last_modify_date]
+          end
+          next_token = resp.next_token
+        end while next_token
         @term_table = Terminal::Table.new :headings => ['Path', 'Type', 'Version', 'LastModifyDate'], :rows => rows.sort
       end
     end

data/lib/vaws/aws/subnet_describer.rb

@@ -12,16 +12,24 @@ module Vaws
       end
 
       def set_basic_info
-        rows    = []
-        subnets = @subnet_client.describe_subnets
-        subnets.subnets.each do |subnet|
-          az        = subnet.availability_zone
-          cidr      = subnet.cidr_block
-          subnet_id = subnet.subnet_id
-          vpc_id    = subnet.vpc_id
+        rows       = []
+        next_token = nil
 
-          rows << [cidr, subnet_id, az, vpc_id]
-        end
+        begin
+          param_args              = {
+            max_results: 100
+          }
+          param_args[:next_token] = next_token if next_token
+          resp                    = @subnet_client.describe_subnets(param_args)
+          resp.subnets.each do |subnet|
+            az        = subnet.availability_zone
+            cidr      = subnet.cidr_block
+            subnet_id = subnet.subnet_id
+            vpc_id    = subnet.vpc_id
+            rows << [cidr, subnet_id, az, vpc_id]
+          end
+          next_token = resp.next_token
+        end while next_token
         @term_table = Terminal::Table.new :headings => ['Cidr', 'SubnetId', 'Az', 'VpcId'], :rows => rows.sort
       end
     end

data/lib/vaws/aws/vpc_describer.rb

@@ -12,21 +12,27 @@ module Vaws
       end
 
       def set_basic_info
-        rows = []
-        vpcs = @vpc_client.describe_vpcs
+        rows       = []
+        next_token = nil
 
-        vpcs.vpcs.each do |vpc|
-          cidr   = vpc.cidr_block
-          vpc_id = vpc.vpc_id
-
-          tags = ''
-          vpc.tags.each_with_index do |tag, index|
-            tags << "#{tag.value}, "
-            tags = tags.gsub(/, $/, '') if index == vpc.tags.size - 1
+        begin
+          param_args              = {
+            max_results: 100
+          }
+          param_args[:next_token] = next_token if next_token
+          resp                    = @vpc_client.describe_vpcs(param_args)
+          resp.vpcs.each do |vpc|
+            cidr   = vpc.cidr_block
+            vpc_id = vpc.vpc_id
+            tags   = ''
+            vpc.tags.each_with_index do |tag, index|
+              tags << "#{tag.value}, "
+              tags = tags.gsub(/, $/, '') if index == vpc.tags.size - 1
+            end
+            rows << [vpc_id, cidr, tags]
           end
-
-          rows << [vpc_id, cidr, tags]
-        end
+          next_token = resp.next_token
+        end while next_token
         @term_table = Terminal::Table.new :headings => ['VpcId', 'Cidr', 'Tags'], :rows => rows.sort
       end
     end

data/lib/vaws/version.rb

@@ -1,3 +1,3 @@
 module Vaws
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vaws
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Shota Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The vaws command simplifies the display of AWS resources.