awspec 1.30.0 → 1.32.0

data/lib/awspec/generator/doc/type/wafv2_ip_set.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Awspec::Generator
+  module Doc
+    module Type
+      class Wafv2IpSet < Base
+        def initialize
+          super
+          @type_name = 'Wafv2IpSet'
+          @type = Awspec::Type::Wafv2IpSet.new('my-ip-set')
+          @ret = @type.resource_via_client
+          @matchers = []
+          @ignore_matchers = []
+          @describes = []
+        end
+      end
+    end
+  end
+end

data/lib/awspec/generator/spec/codepipeline.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Awspec::Generator
+  module Spec
+    class Codepipeline
+      include Awspec::Helper::Finder
+      def generate_all
+        pipelines = select_all_codepipelines
+        raise 'Not Found CodePipeline' if pipelines.empty?
+
+        ERB.new(codepipeline_spec_template, nil, '-').result(binding).chomp
+      end
+
+      def codepipeline_spec_template
+        <<-'EOF'
+<% pipelines.each do |pipeline| %>
+describe codepipeline('<%= pipeline.name %>') do
+  it { should exist }
+  its(:name) { should eq '<%= pipeline.name %>' }
+  its(:version) { should eq <%= pipeline.version %> }
+  its(:pipeline_type) { should eq '<%= pipeline.pipeline_type %>' }
+  its(:execution_mode) { should eq '<%= pipeline.execution_mode %>' }
+end
+<% end %>
+EOF
+      end
+    end
+  end
+end

data/lib/awspec/generator/spec/iam_group.rb

@@ -27,7 +27,7 @@ module Awspec::Generator
 describe iam_group('<%= group.group_name %>') do
   it { should exist }
   its(:arn) { should eq '<%= group.arn %>' }
-  its(:create_date) { should eq Time.parse('<%= group.create_date %>') }
+  its(:create_date) { should eq Time.parse('<%= group.create_date.utc %>') }
 <% select_iam_policy_by_group_name(group.group_name).each do |policy| %>  it { should have_iam_policy('<%= policy.policy_name %>') }
 <% end %>
 <%- inline_policies.each do |line| -%>

data/lib/awspec/generator/spec/iam_policy.rb

@@ -23,7 +23,7 @@ describe iam_policy('<%= policy.policy_name %>') do
   it { should_not be_attachable }
 <%- end -%>
   its(:arn) { should eq '<%= policy.arn %>' }
-  its(:update_date) { should eq Time.parse('<%= policy.update_date %>') }
+  its(:update_date) { should eq Time.parse('<%= policy.update_date.utc %>') }
   its(:attachment_count) { should eq <%= policy.attachment_count %> }
 <%- users = select_attached_users(policy.arn) -%>
 <%- if users.empty? -%>

data/lib/awspec/generator/spec/iam_role.rb

@@ -27,7 +27,7 @@ module Awspec::Generator
 describe iam_role('<%= role.role_name %>') do
   it { should exist }
   its(:arn) { should eq '<%= role.arn %>' }
-  its(:create_date) { should eq Time.parse('<%= role.create_date %>') }
+  its(:create_date) { should eq Time.parse('<%= role.create_date.utc %>') }
 <% select_iam_policy_by_role_name(role.role_name).each do |policy| %>  it { should have_iam_policy('<%= policy.policy_name %>') }
 <% end %>
 <%- inline_policies.each do |line| -%>

data/lib/awspec/generator/spec/iam_user.rb

@@ -27,7 +27,7 @@ module Awspec::Generator
 describe iam_user('<%= user.user_name %>') do
   it { should exist }
   its(:arn) { should eq '<%= user.arn %>' }
-  its(:create_date) { should eq Time.parse('<%= user.create_date %>') }
+  its(:create_date) { should eq Time.parse('<%= user.create_date.utc %>') }
 <% select_iam_policy_by_user_name(user.user_name).each do |policy| %>  it { should have_iam_policy('<%= policy.policy_name %>') }
 <% end %>
 <%- inline_policies.each do |line| -%>

data/lib/awspec/generator/spec/rds_db_cluster.rb

@@ -2,7 +2,7 @@
 
 module Awspec::Generator
   module Spec
-    class RdsDbCluster
+    class RdsDBCluster
       include Awspec::Helper::Finder
       def generate(db_cluster_identifier)
         cluster = find_db_cluster(db_cluster_identifier)

data/lib/awspec/generator/spec/rds_db_cluster_parameter_group.rb

@@ -2,7 +2,7 @@
 
 module Awspec::Generator
   module Spec
-    class RdsDbClusterParameterGroup
+    class RdsDBClusterParameterGroup
       include Awspec::Helper::Finder
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group

data/lib/awspec/generator/spec/rds_db_parameter_group.rb

@@ -2,7 +2,7 @@
 
 module Awspec::Generator
   module Spec
-    class RdsDbParameterGroup
+    class RdsDBParameterGroup
       include Awspec::Helper::Finder
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group

data/lib/awspec/generator/spec/wafv2_ip_set.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Awspec::Generator
+  module Spec
+    class Wafv2IpSet
+      include Awspec::Helper::Finder
+      def generate_by_scope(scope)
+        ip_sets = select_all_ip_sets(scope)
+        raise 'Not Found WAFV2 IP sets' if ip_sets.empty?
+
+        specs = ip_sets.map do |i|
+          ip_set = get_ip_set(scope, i.name, i.id)
+          ERB.new(wafv2_ip_set_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      def wafv2_ip_set_spec_template
+        <<-'EOF'
+describe wafv2_ip_set('<%= ip_set.name %>'), scope: '<%= scope %>' do
+  it { should exist }
+  its(:name) { should eq '<%= ip_set.name %>' }
+  its(:id) { should eq '<%= ip_set.id %>' }
+  its(:arn) { should eq '<%= ip_set.arn %>' }
+  its(:description) { should eq '<%= ip_set.description %>' }
+  its(:ip_address_version) { should eq '<%= ip_set.ip_address_version %>' }
+<% ip_set.addresses.each do |address| %>
+  it { should have_ip_address('<%= address %>') }
+<% end %>
+end
+EOF
+      end
+    end
+  end
+end

data/lib/awspec/generator.rb

@@ -44,6 +44,8 @@ require 'awspec/generator/spec/rds_proxy'
 require 'awspec/generator/spec/rds_db_cluster'
 require 'awspec/generator/spec/rds_global_cluster'
 require 'awspec/generator/spec/managed_prefix_list'
+require 'awspec/generator/spec/codepipeline'
+require 'awspec/generator/spec/wafv2_ip_set'
 
 # Doc
 require 'awspec/generator/doc/type'

data/lib/awspec/helper/finder/codebuild.rb

@@ -4,10 +4,8 @@ module Awspec::Helper
   module Finder
     module Codebuild
       def find_codebuild_project(id)
-        projects = select_all_codebuild_projects.select do |project|
-          project == id
-        end
-        projects.single_resource(id)
+        res = codebuild_client.batch_get_projects({ names: [id] })
+        res.projects.single_resource(id)
       end
 
       def select_all_codebuild_projects

data/lib/awspec/helper/finder/codepipeline.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Awspec::Helper
+  module Finder
+    module Codepipeline
+      def find_codepipeline(id)
+        res = codepipeline_client.get_pipeline({ name: id })
+        res.pipeline
+      end
+
+      def select_all_codepipelines
+        req = {}
+        pipelines = []
+        loop do
+          res = codepipeline_client.list_pipelines(req)
+          pipelines.push(*res.pipelines)
+          break if res.next_token.nil?
+
+          req[:next_token] = res.next_token
+        end
+        pipelines
+      end
+    end
+  end
+end

data/lib/awspec/helper/finder/vpc_endpoints.rb

@@ -4,17 +4,15 @@ module Awspec::Helper
   module Finder
     module VpcEndpoints
       def find_vpc_endpoint(id)
-        res = ec2_client.describe_vpc_endpoints({
-                                                  filters: [{ name: 'vpc-endpoint-id', values: [id] }]
-                                                })
+        res = ec2_client.describe_vpc_endpoints({ vpc_endpoint_ids: [id] })
 
         ret = res.vpc_endpoints.select do |vpce|
           vpce.vpc_endpoint_id == id
         end
 
         resource = ret.single_resource(id)
-        return resource if resource
-
+        resource if resource
+      rescue Aws::EC2::Errors::InvalidVpcEndpointIdNotFound, Aws::EC2::Errors::InvalidVpcEndpointIdMalformed
         res = ec2_client.describe_vpc_endpoints({
                                                   filters: [{ name: 'tag:Name', values: [id] }]
                                                 })

data/lib/awspec/helper/finder/wafv2.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Awspec::Helper
+  module Finder
+    module Wafv2
+      def find_ip_set(scope, name)
+        ip_sets = select_all_ip_sets(scope)
+        ip_set  = ip_sets.find do |i|
+          i.name == name
+        end
+        return false unless ip_set
+
+        get_ip_set(scope, name, ip_set.id)
+      end
+
+      def select_all_ip_sets(scope)
+        res = wafv2_client.list_ip_sets({ scope: scope })
+        res.ip_sets
+      end
+
+      def get_ip_set(scope, name, id)
+        res = wafv2_client.get_ip_set({ name: name, scope: scope, id: id })
+        res.ip_set
+      end
+    end
+  end
+end

data/lib/awspec/helper/finder.rb

@@ -55,6 +55,8 @@ require 'awspec/helper/finder/cognito_user_pool'
 require 'awspec/helper/finder/msk'
 require 'awspec/helper/finder/cognito_identity_pool'
 require 'awspec/helper/finder/transfer'
+require 'awspec/helper/finder/codepipeline'
+require 'awspec/helper/finder/wafv2'
 
 require 'awspec/helper/finder/account_attributes'
 
@@ -117,6 +119,8 @@ module Awspec::Helper
     include Awspec::Helper::Finder::Msk
     include Awspec::Helper::Finder::CognitoIdentityPool
     include Awspec::Helper::Finder::Transfer
+    include Awspec::Helper::Finder::Codepipeline
+    include Awspec::Helper::Finder::Wafv2
 
     CLIENTS = {
       ec2_client: Aws::EC2::Client,
@@ -165,7 +169,9 @@ module Awspec::Helper
       msk_client: Aws::Kafka::Client,
       cognito_identity_client: Aws::CognitoIdentity::Client,
       cognito_identity_provider_client: Aws::CognitoIdentityProvider::Client,
-      transfer_client: Aws::Transfer::Client
+      transfer_client: Aws::Transfer::Client,
+      codepipeline_client: Aws::CodePipeline::Client,
+      wafv2_client: Aws::WAFV2::Client
     }
 
     CLIENT_OPTIONS = {

data/lib/awspec/helper/type.rb

@@ -24,7 +24,7 @@ module Awspec
         internet_gateway acm cloudwatch_logs dynamodb_table eip sqs ssm_parameter cloudformation_stack
         codebuild sns_topic redshift redshift_cluster_parameter_group codedeploy codedeploy_deployment_group
         secretsmanager msk transit_gateway cognito_identity_pool cognito_user_pool vpc_endpoints
-        transfer_server managed_prefix_list
+        transfer_server managed_prefix_list codepipeline wafv2_ip_set
       ]
 
       ACCOUNT_ATTRIBUTES = %w[

data/lib/awspec/matcher/belong_to_subnet.rb

@@ -34,7 +34,7 @@ RSpec::Matchers.define :belong_to_subnet do |subnet_id|
     end
 
     # RDS DB Subnet Group
-    if type.instance_of?(Awspec::Type::RdsDbSubnetGroup)
+    if type.instance_of?(Awspec::Type::RdsDBSubnetGroup)
       subnets = type.resource_via_client[:subnets]
       ret = subnets.find do |s|
         s[:subnet_identifier] == subnet_id

data/lib/awspec/shared_context.rb

@@ -38,3 +38,9 @@ shared_context 'application_name', :application_name do
     example.metadata[:described_class].application_name = example.metadata[:application_name]
   end
 end
+
+shared_context 'scope', :scope do
+  before do |example|
+    example.metadata[:described_class].scope = example.metadata[:scope]
+  end
+end

data/lib/awspec/stub/cloudfront_distribution.rb

@@ -17,7 +17,6 @@ Aws.config[:cloudfront] = {
               status: 'Deployed',
               last_modified_time: Time.new(2015, 1, 2, 10, 00, 00, '+00:00'),
               domain_name: 'abcdefghijklmn.cloudfront.net',
-              staging: false,
               aliases: {
                 quantity: 0,
                 items: []
@@ -117,7 +116,6 @@ Aws.config[:cloudfront] = {
               status: 'Deployed',
               last_modified_time: Time.new(2016, 3, 2, 10, 00, 00, '+00:00'),
               domain_name: '123456789zyxw.cloudfront.net',
-              staging: false,
               aliases: {
                 quantity: 1,
                 items: ['cf-s3-origin-hosting.dev.example.com']

data/lib/awspec/stub/codebuild.rb

@@ -2,6 +2,62 @@
 
 Aws.config[:codebuild] = {
   stub_responses: {
+    batch_get_projects: {
+      projects: [
+        {
+          name: 'my-codebuild1',
+          arn: 'arn:aws:codebuild:ap-northeast-1:123456789012:project/my-codebuild1',
+          source: {
+            type: 'S3',
+            location: 'example-bucket/test.zip',
+            insecure_ssl: false
+          },
+          secondary_sources: [],
+          secondary_source_versions: [],
+          artifacts: {
+            type: 'NO_ARTIFACTS'
+          },
+          secondary_artifacts: [],
+          cache: {
+            type: 'NO_CACHE'
+          },
+          environment: {
+            type: 'LINUX_CONTAINER',
+            image: 'aws/codebuild/amazonlinux2-x86_64-standard:5.0',
+            compute_type: 'BUILD_GENERAL1_SMALL',
+            environment_variables: [],
+            privileged_mode: false,
+            image_pull_credentials_type: 'CODEBUILD'
+          },
+          service_role: 'arn:aws:iam::123456789012:role/service-role/codebuild-my-codebuild1-service-role',
+          timeout_in_minutes: 60,
+          queued_timeout_in_minutes: 480,
+          encryption_key: 'arn:aws:kms:ap-northeast-1:123456789012:alias/aws/s3',
+          tags: [
+            {
+              key: 'env',
+              value: 'dev'
+            }
+          ],
+          created: Time.local(2024),
+          last_modified: Time.local(2024),
+          badge: {
+            badge_enabled: false
+          },
+          logs_config: {
+            cloud_watch_logs: {
+              status: 'ENABLED'
+            },
+            s3_logs: {
+              status: 'DISABLED',
+              encryption_disabled: false
+            }
+          },
+          project_visibility: 'PRIVATE'
+        }
+      ],
+      projects_not_found: []
+    },
     list_projects: {
       projects: %w[
         my-codebuild1

data/lib/awspec/stub/codepipeline.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+Aws.config[:codepipeline] = {
+  stub_responses: {
+    get_pipeline: {
+      pipeline: {
+        name: 'my-codepipeline',
+        role_arn: 'arn:aws:iam::123456789012:role/service-role/AWSCodePipelineServiceRole-my-codepipeline',
+        artifact_store: {
+          type: 'S3',
+          location: 'codepipeline-ap-northeast-1-12345678901'
+        },
+        stages: [
+          {
+            name: 'Source',
+            actions: [
+              {
+                name: 'Source',
+                action_type_id: {
+                  category: 'Source',
+                  owner: 'AWS',
+                  provider: 'S3',
+                  version: '1'
+                },
+                run_order: 1,
+                configuration: {
+                  'PollForSourceChanges' => 'false',
+                  'S3Bucket' => 'example-bucket',
+                  'S3ObjectKey' => 'test.zip'
+                },
+                output_artifacts: [
+                  {
+                    name: 'SourceArtifact'
+                  }
+                ],
+                input_artifacts: [],
+                region: 'ap-northeast-1',
+                namespace: 'SourceVariables'
+              }
+            ]
+          },
+          {
+            name: 'Build',
+            actions: [
+              {
+                name: 'Build',
+                action_type_id: {
+                  category: 'Build',
+                  owner: 'AWS',
+                  provider: 'CodeBuild',
+                  version: '1'
+                },
+                run_order: 1,
+                configuration: {
+                  'ProjectName' => 'my-codebuild1'
+                },
+                output_artifacts: [
+                  {
+                    name: 'BuildArtifact'
+                  }
+                ],
+                input_artifacts: [
+                  {
+                    name: 'SourceArtifact'
+                  }
+                ],
+                region: 'ap-northeast-1',
+                namespace: 'BuildVariables'
+              }
+            ]
+          }
+        ],
+        version: 1,
+        execution_mode: 'QUEUED',
+        pipeline_type: 'V2'
+      },
+      metadata: {
+        pipeline_arn: 'arn:aws:codepipeline:ap-northeast-1:123456789012:my-codepipeline',
+        created: Time.local(2024),
+        updated: Time.local(2024)
+      }
+    },
+    list_pipelines: {
+      pipelines: [
+        {
+          name: 'my-codepipeline1',
+          version: 1,
+          pipeline_type: 'V2',
+          execution_mode: 'QUEUED',
+          created: Time.local(2024),
+          updated: Time.local(2024)
+        },
+        {
+          name: 'my-codepipeline2',
+          version: 1,
+          pipeline_type: 'V2',
+          execution_mode: 'QUEUED',
+          created: Time.local(2024),
+          updated: Time.local(2024)
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/stub/wafv2_ip_set.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+Aws.config[:wafv2] = {
+  stub_responses: {
+    get_ip_set: {
+      ip_set: {
+        name: 'my-ip-set',
+        id: '01234567-89ab-cdef-0123-456789abcdef',
+        arn: 'arn:aws:wafv2:ap-northeast-1:123456789012:regional/ipset/my-ip-set/01234567-89ab-cdef-0123-456789abcdef',
+        description: 'dev ips',
+        ip_address_version: 'IPV4',
+        addresses: [
+          '10.0.0.0/32',
+          '10.0.0.1/32'
+        ]
+      },
+      lock_token: '01234567-89ab-cdef-0123456789abcdef0'
+    },
+    list_ip_sets: {
+      next_marker: 'my-ip-set',
+      ip_sets: [
+        {
+          name: 'my-ip-set',
+          id: '01234567-89ab-cdef-0123-456789abcdef',
+          description: 'dev ips',
+          lock_token: '01234567-89ab-cdef-0123456789abcdef0',
+          arn: 'arn:aws:wafv2:ap-northeast-1:123456789012:regional/ipset/my-ip-set/01234567-89ab-cdef-0123-456789abcdef'
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/type/codebuild.rb

@@ -2,6 +2,9 @@
 
 module Awspec::Type
   class Codebuild < ResourceBase
+    aws_resource Aws::CodeBuild::Types::Project
+    tags_allowed
+
     def resource_via_client
       @resource_via_client ||= find_codebuild_project(@display_name)
     end

data/lib/awspec/type/codepipeline.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Awspec::Type
+  class Codepipeline < ResourceBase
+    def resource_via_client
+      @resource_via_client ||= find_codepipeline(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client if resource_via_client.name
+    end
+  end
+end

data/lib/awspec/type/rds_db_cluster.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class RdsDbCluster < ResourceBase
+  class RdsDBCluster < ResourceBase
     aws_resource Aws::RDS::Types::DBCluster
 
     def resource_via_client

data/lib/awspec/type/rds_db_cluster_parameter_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class RdsDbClusterParameterGroup < ResourceBase
+  class RdsDBClusterParameterGroup < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
 

data/lib/awspec/type/rds_db_parameter_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class InvalidRdsDbParameter < StandardError
+  class InvalidRdsDBParameter < StandardError
     ##
     # Overrides the superclass initialize method to include more information
     # and default error message.
@@ -19,7 +19,7 @@ module Awspec::Type
     ##
     # Thanks to AWS for creating parameters names like
     # 'rds.accepted_password_auth_method', which would be caught as method 'rds'
-    # by method_missing in RdsDbParameterGroup class, this class was created
+    # by method_missing in RdsDBParameterGroup class, this class was created
     # See https://github.com/k1LoW/awspec/issues/527 for more details
     def initialize(params)
       @params = params
@@ -33,11 +33,11 @@ module Awspec::Type
       param_name = name.to_sym
       return @params[param_name] if @params.include?(param_name)
 
-      raise InvalidRdsDbParameter, name
+      raise InvalidRdsDBParameter, name
     end
   end
 
-  class RdsDbParameterGroup < ResourceBase
+  class RdsDBParameterGroup < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
 

data/lib/awspec/type/rds_db_subnet_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class RdsDbSubnetGroup < ResourceBase
+  class RdsDBSubnetGroup < ResourceBase
     aws_resource Aws::RDS::Types::DBSubnetGroup
 
     def resource_via_client

data/lib/awspec/type/wafv2_ip_set.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Awspec::Type
+  class Wafv2IpSet < ResourceBase
+    attr_accessor :scope
+
+    def resource_via_client
+      @resource_via_client ||= find_ip_set(scope, @display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.id if resource_via_client
+    end
+
+    def scope
+      @scope || 'REGIONAL'
+    end
+
+    def has_ip_address?(ip_address)
+      resource_via_client.addresses.include?(ip_address)
+    end
+  end
+end

data/lib/awspec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Awspec
-  VERSION = '1.30.0'
-end
+  VERSION = '1.32.0'
+end