Merge pull request #1099 from selfieebritto/issue-1089

#1089 Added nil check on associated KeyPair
tailwarden · Oct 16, 2023 · 843d4cb · 843d4cb
2 parents ee52e42 + 96dba3a
commit 843d4cb
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/providers/aws/ec2/instances.go b/providers/aws/ec2/instances.go
@@ -212,12 +212,14 @@ func getEC2Relations(inst *etype.Instance, resourceArn string) (rel []models.Lin
 	})
 
 	// Get associated Keypair
-	rel = append(rel, models.Link{
-		ResourceID: *inst.KeyName,
-		Name:       *inst.KeyName,
-		Type:       "Key Pair",
-		Relation:   "USES",
-	})
+	if inst.KeyName != nil {
+		rel = append(rel, models.Link{
+			ResourceID: *inst.KeyName,
+			Name:       *inst.KeyName,
+			Type:       "Key Pair",
+			Relation:   "USES",
+		})
+	}
 
 	// Get associated IAM roles
 	if inst.IamInstanceProfile != nil {