Added 'ec2' prefix in front of instance id ec2 filter tag name.

Signed-off-by: Vasil Sirakov <sirakov97@gmail.com>
mondoohq · Sep 25, 2024 · dbd4d86 · dbd4d86
1 parent 78a0956
commit dbd4d86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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",