From dbd4d868802410f0a03fe140824a44bcd4591269 Mon Sep 17 00:00:00 2001 From: Vasil Sirakov Date: Wed, 25 Sep 2024 12:58:21 +0300 Subject: [PATCH] Added 'ec2' prefix in front of instance id ec2 filter tag name. Signed-off-by: Vasil Sirakov --- providers/aws/connection/connection.go | 4 ++-- providers/aws/connection/connection_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/providers/aws/connection/connection.go b/providers/aws/connection/connection.go index b1b8ca4a7..17c3c8dba 100644 --- a/providers/aws/connection/connection.go +++ b/providers/aws/connection/connection.go @@ -149,9 +149,9 @@ func parseOptsToFilters(opts map[string]string) DiscoveryFilters { d.Ec2DiscoveryFilters.ExcludeRegions = append(d.Ec2DiscoveryFilters.ExcludeRegions, v) case strings.HasPrefix(k, "all:region:"), strings.HasPrefix(k, "region:"): d.GeneralDiscoveryFilters.Regions = append(d.GeneralDiscoveryFilters.Regions, v) - case strings.HasPrefix(k, "instance-id:"): + case strings.HasPrefix(k, "ec2:instance-id:"): d.Ec2DiscoveryFilters.InstanceIds = append(d.Ec2DiscoveryFilters.InstanceIds, v) - case strings.HasPrefix(k, "exclude:instance-id:"): + case strings.HasPrefix(k, "exclude:ec2:instance-id:"): d.Ec2DiscoveryFilters.ExcludeInstanceIds = append(d.Ec2DiscoveryFilters.ExcludeInstanceIds, v) case strings.HasPrefix(k, "all:tag:"): d.GeneralDiscoveryFilters.Tags[strings.TrimPrefix(k, "all:tag:")] = v diff --git a/providers/aws/connection/connection_test.go b/providers/aws/connection/connection_test.go index 85ed7833d..80bd8a3a1 100644 --- a/providers/aws/connection/connection_test.go +++ b/providers/aws/connection/connection_test.go @@ -45,11 +45,11 @@ func TestParseOptsToFilters(t *testing.T) { "exclude:ec2:region:us-east-1": "us-east-1", "exclude:ec2:region:us-west-1": "us-west-1", // Ec2DiscoveryFilters.InstanceIds - "instance-id:iid-1": "iid-1", - "instance-id:iid-2": "iid-2", + "ec2:instance-id:iid-1": "iid-1", + "ec2:instance-id:iid-2": "iid-2", // Ec2DiscoveryFilters.ExcludeInstanceIds - "exclude:instance-id:iid-1": "iid-1", - "exclude:instance-id:iid-2": "iid-2", + "exclude:ec2:instance-id:iid-1": "iid-1", + "exclude:ec2:instance-id:iid-2": "iid-2", // GeneralDiscoveryFilters.Regions "all:region:us-east-1": "us-east-1", "all:region:us-west-1": "us-west-1",