CyberCoveLLC/threshold-plugin-aws
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't ignore non-running instances, rely on filter instead

Browse Source 
We now add the instance-state = ["running"] filter to all queries if
instance-state is not explicitly defined beforehand. This should ensure
that all queries return running instances beforehand (saving some
post-processing later too).

As such, I'm removing an artifact of the old code where we were not
doing this, which was basically to skip all running instances.

Additionally, this will allow an operator to include non-running
instances in a filter should this be desired for whatever reason.
This commit is contained in:
Chris Marchesi committed 2021-10-07 14:15:32 -07:00
1 parent 9a5e4016fa
commit 9099292d03
2 files changed
+2 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugin/plugin_test.go
+2 -52
View File
@@ -1183,7 +1183,7 @@ func TestPluginListHostsErr(t *testing.T) {
),
)),
},
expectedErr: "error processing host results for host set id \"foobar\": response integrity error: missing instance state",
expectedErr: "error processing host results for host set id \"foobar\": response integrity error: missing instance id",
},
}
@@ -1674,42 +1674,13 @@ func TestAwsInstanceToHost(t *testing.T) {
expectedErr: "response integrity error: missing instance entry",
},
{
name: "nil instance state",
name: "missing instance id",
instance: &ec2.Instance{},
expectedErr: "response integrity error: missing instance state",
},
{
name: "missing instance state name",
instance: &ec2.Instance{
State: &ec2.InstanceState{},
},
expectedErr: "response integrity error: missing instance state name",
},
{
name: "missing instance id",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
},
expectedErr: "response integrity error: missing instance id",
},
{
name: "instance not running",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameTerminated),
},
InstanceId: aws.String("foobar"),
},
expected: nil,
},
{
name: "nil interface entry",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
NetworkInterfaces: []*ec2.InstanceNetworkInterface{nil},
},
@@ -1718,9 +1689,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "nil interface address entry",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
NetworkInterfaces: []*ec2.InstanceNetworkInterface{
&ec2.InstanceNetworkInterface{
@@ -1733,9 +1701,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "good, single IP w/public addr",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
PrivateIpAddress: aws.String("10.0.0.1"),
PublicIpAddress: aws.String("1.1.1.1"),
@@ -1760,9 +1725,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "good, private",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
PrivateIpAddress: aws.String("10.0.0.1"),
NetworkInterfaces: []*ec2.InstanceNetworkInterface{
@@ -1783,9 +1745,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "good, multiple interfaces",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
PrivateIpAddress: aws.String("10.0.0.1"),
PublicIpAddress: aws.String("1.1.1.1"),
@@ -1817,9 +1776,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "good, multiple public interfaces",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
PrivateIpAddress: aws.String("10.0.0.1"),
PublicIpAddress: aws.String("1.1.1.1"),
@@ -1854,9 +1810,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "good, multiple addresses on single interface",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
PrivateIpAddress: aws.String("10.0.0.1"),
PublicIpAddress: aws.String("1.1.1.1"),
@@ -1884,9 +1837,6 @@ func TestAwsInstanceToHost(t *testing.T) {
{
name: "good, single IP w/public addr and IPv6",
instance: &ec2.Instance{
State: &ec2.InstanceState{
Name: aws.String(ec2.InstanceStateNameRunning),
},
InstanceId: aws.String("foobar"),
PrivateIpAddress: aws.String("10.0.0.1"),
PublicIpAddress: aws.String("1.1.1.1"),