From 759a00eeb3aa5fb30b9e4b9424440494b0aa86e7 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Wed, 24 Nov 2021 13:47:16 +0200
Subject: [PATCH] fix: less fussy catalogue generation

---
 cli/catalogue/generate.go  |  2 +-
 pkg/catalogue/catalogue.go | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/cli/catalogue/generate.go b/cli/catalogue/generate.go
index 8b1d2e95..ea324cf8 100644
--- a/cli/catalogue/generate.go
+++ b/cli/catalogue/generate.go
@@ -178,7 +178,7 @@ A new catalogue copy can be published to the recipes repository by passing the
 
 			features, category, err := catalogue.GetRecipeFeaturesAndCategory(recipeMeta.Name)
 			if err != nil {
-				logrus.Fatal(err)
+				logrus.Warn(err)
 			}
 
 			catl[recipeMeta.Name] = catalogue.RecipeMeta{
diff --git a/pkg/catalogue/catalogue.go b/pkg/catalogue/catalogue.go
index 29ca131f..a5099aae 100644
--- a/pkg/catalogue/catalogue.go
+++ b/pkg/catalogue/catalogue.go
@@ -411,7 +411,7 @@ func GetImageMetadata(imageRowString string) (image, error) {
 	if err != nil {
 		logrus.Fatal(err)
 	}
-	img.Image = imageName
+	img.Image = strings.ReplaceAll(imageName, "`", "")
 
 	imageURL, err := GetStringInBetween(imgString, "(", ")")
 	if err != nil {
@@ -441,7 +441,7 @@ func GetRecipeFeaturesAndCategory(recipeName string) (features, string, error) {
 		"<!-- metadata -->", "<!-- endmetadata -->",
 	)
 	if err != nil {
-		logrus.Fatal(err)
+		return feat, category, err
 	}
 
 	readmeLines := strings.Split( // Array item from lines
@@ -553,9 +553,22 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
 				path = strings.Split(path, "/")[1]
 			}
 
+			var tag string
+			switch img.(type) {
+			case reference.NamedTagged:
+				tag = img.(reference.NamedTagged).Tag()
+			case reference.Named:
+				logrus.Warnf("%s service is missing image tag?", path)
+				continue
+			}
+
+			logrus.Debugf("looking up image: '%s' from '%s'", img, path)
+
 			digest, err := client.GetTagDigest(img)
 			if err != nil {
-				return err
+				// return err
+				logrus.Warn(err)
+				continue
 			}
 
 			versionMeta[service.Name] = ServiceMeta{