From 6ff46c0f3c6284934d01ef8107dde430c04f166c Mon Sep 17 00:00:00 2001
From: Johnny Steenbergen <jonathansteenbergen@gmail.com>
Date: Mon, 15 Jun 2020 13:14:24 -0700
Subject: [PATCH] chore(pkger): drop deprecated shouldRemove from parser
 identity

---
 pkger/parser.go         | 12 ------------
 pkger/parser_models.go  |  5 ++---
 pkger/service_models.go |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkger/parser.go b/pkger/parser.go
index ec24e58fbf..dcdb86abf0 100644
--- a/pkger/parser.go
+++ b/pkger/parser.go
@@ -348,9 +348,6 @@ func (p *Pkg) Summary() Summary {
 	}
 
 	for _, c := range p.checks() {
-		if c.shouldRemove {
-			continue
-		}
 		sum.Checks = append(sum.Checks, c.summarize())
 	}
 
@@ -359,18 +356,12 @@ func (p *Pkg) Summary() Summary {
 	}
 
 	for _, l := range p.labels() {
-		if l.shouldRemove {
-			continue
-		}
 		sum.Labels = append(sum.Labels, l.summarize())
 	}
 
 	sum.LabelMappings = p.labelMappings()
 
 	for _, n := range p.notificationEndpoints() {
-		if n.shouldRemove {
-			continue
-		}
 		sum.NotificationEndpoints = append(sum.NotificationEndpoints, n.summarize())
 	}
 
@@ -387,9 +378,6 @@ func (p *Pkg) Summary() Summary {
 	}
 
 	for _, v := range p.variables() {
-		if v.shouldRemove {
-			continue
-		}
 		sum.Variables = append(sum.Variables, v.summarize())
 	}
 
diff --git a/pkger/parser_models.go b/pkger/parser_models.go
index 4fe638ba38..816af9d37a 100644
--- a/pkger/parser_models.go
+++ b/pkger/parser_models.go
@@ -17,9 +17,8 @@ import (
 )
 
 type identity struct {
-	name         *references
-	displayName  *references
-	shouldRemove bool
+	name        *references
+	displayName *references
 }
 
 func (i *identity) Name() string {
diff --git a/pkger/service_models.go b/pkger/service_models.go
index b0ef729972..de5c726269 100644
--- a/pkger/service_models.go
+++ b/pkger/service_models.go
@@ -1131,7 +1131,7 @@ func (r *stateRule) diffRule() DiffNotificationRule {
 	sum := DiffNotificationRule{
 		DiffIdentifier: DiffIdentifier{
 			ID:      SafeID(r.ID()),
-			Remove:  r.parserRule.shouldRemove,
+			Remove:  IsRemoval(r.stateStatus),
 			PkgName: r.parserRule.PkgName(),
 		},
 		New: DiffNotificationRuleValues{