From 0ebd6c8eecb33cdf966508f83d84b5eae8330c0d Mon Sep 17 00:00:00 2001
From: Ashlie Martinez <ashmrtnz@alcion.ai>
Date: Thu, 5 Oct 2023 12:36:54 -0700
Subject: [PATCH] Minor refactor of tag keys and error generation

---
 src/pkg/backup/backup_bases.go      | 8 ++++++--
 src/pkg/backup/backup_bases_test.go | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pkg/backup/backup_bases.go b/src/pkg/backup/backup_bases.go
index da6403f1f..1953012b9 100644
--- a/src/pkg/backup/backup_bases.go
+++ b/src/pkg/backup/backup_bases.go
@@ -25,7 +25,7 @@ const (
 	LegacyUserTagPrefix = "tag:"
 
 	tenantIDKey      = "tenant"
-	resourceIDKey    = "resource"
+	resourceIDKey    = "protectedResource"
 	serviceCatPrefix = "sc-"
 	separator        = "_"
 
@@ -35,6 +35,8 @@ const (
 	defaultTagValue = "1"
 )
 
+var errMissingPrefix = clues.New("missing tag prefix")
+
 func serviceCatString(
 	service path.ServiceType,
 	category path.CategoryType,
@@ -50,7 +52,9 @@ func serviceCatStringToTypes(
 	if trimmed == input {
 		return path.UnknownService,
 			path.UnknownCategory,
-			clues.New("missing tag prefix")
+			clues.Stack(errMissingPrefix).With(
+				"expected_prefix", serviceCatPrefix,
+				"input", input)
 	}
 
 	parts := strings.Split(trimmed, separator)
diff --git a/src/pkg/backup/backup_bases_test.go b/src/pkg/backup/backup_bases_test.go
index f58d2ea13..410bee7c6 100644
--- a/src/pkg/backup/backup_bases_test.go
+++ b/src/pkg/backup/backup_bases_test.go
@@ -20,7 +20,7 @@ func TestBackupBasesUnitSuite(t *testing.T) {
 	suite.Run(t, &BackupBasesUnitSuite{Suite: tester.NewUnitSuite(t)})
 }
 
-func (suite *BackupBasesUnitSuite) TestReasonSerialization() {
+func (suite *BackupBasesUnitSuite) TestServiceCategorySerialization() {
 	table := []struct {
 		name           string
 		input          string