Fix find vpc_endpoint by Name

k1LoW · Jan 27, 2025 · 9b96cd8 · 9b96cd8
1 parent 6493b44
commit 9b96cd8
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/lib/awspec/helper/finder/vpc_endpoints.rb b/lib/awspec/helper/finder/vpc_endpoints.rb
@@ -4,26 +4,29 @@ module Awspec::Helper
   module Finder
     module VpcEndpoints
       def find_vpc_endpoint(id)
-        res = ec2_client.describe_vpc_endpoints({ vpc_endpoint_ids: [id] })
+        begin
+          res = ec2_client.describe_vpc_endpoints({ vpc_endpoint_ids: [id] })
 
-        ret = res.vpc_endpoints.select do |vpce|
-          vpce.vpc_endpoint_id == id
-        end
+          ret = res.vpc_endpoints.select do |vpce|
+            vpce.vpc_endpoint_id == id
+          end
 
-        resource = ret.single_resource(id)
-        return resource if resource
+          resource = ret.single_resource(id)
+          return resource if resource
 
-        res = ec2_client.describe_vpc_endpoints({
-                                                  filters: [{ name: 'tag:Name', values: [id] }]
-                                                })
+        rescue Aws::EC2::Errors::InvalidVpcEndpointIdNotFound, Aws::EC2::Errors::InvalidVpcEndpointIdMalformed
+          res = ec2_client.describe_vpc_endpoints({
+                                                    filters: [{ name: 'tag:Name', values: [id] }]
+                                                  })
 
-        ret = res.vpc_endpoints.select do |vpce|
-          vpce.tags.find do |tag|
-            tag.key == 'Name' && tag.value == id
+          ret = res.vpc_endpoints.select do |vpce|
+            vpce.tags.find do |tag|
+              tag.key == 'Name' && tag.value == id
+            end
           end
-        end
 
-        ret.single_resource(id)
+          ret.single_resource(id)
+        end
       end
     end
   end