From 861b440de07bf5c82de456c40491ee4a316ab213 Mon Sep 17 00:00:00 2001
From: Michael Cristina <michael.cristina@optum.com>
Date: Wed, 17 Jul 2019 12:40:31 -0500
Subject: [PATCH] fix(describe): Dont panic when trying to describe an unknown
 resource

---
 internal/k8s/mapper.go      | 12 ++++++++++++
 internal/resource/base.go   | 13 +++++++++----
 internal/resource/custom.go |  2 +-
 internal/views/resource.go  |  2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/internal/k8s/mapper.go b/internal/k8s/mapper.go
index 9d13f4b2..2b79a4f5 100644
--- a/internal/k8s/mapper.go
+++ b/internal/k8s/mapper.go
@@ -243,4 +243,16 @@ var resMap = map[string]*meta.RESTMapping{
 		GroupVersionKind: schema.GroupVersionKind{Group: "apiextensions.k8s.io", Version: "v1beta1", Kind: "CustomResourceDefinition"},
 		Scope:            RestMapping,
 	},
+
+	"Events": {
+		Resource:         schema.GroupVersionResource{Group: "events.k8s.io", Version: "v1beta1", Resource: "events"},
+		GroupVersionKind: schema.GroupVersionKind{Group: "events.k8s.io", Version: "v1beta1", Kind: "Event"},
+		Scope:            RestMapping,
+	},
+
+	"PodDisruptionBudgets": {
+		Resource:         schema.GroupVersionResource{Group: "policy", Version: "v1beta1", Resource: "poddisruptionbudgets"},
+		GroupVersionKind: schema.GroupVersionKind{Group: "policy", Version: "v1beta1", Kind: "PodDisruptionBudget"},
+		Scope:            RestMapping,
+	},
 }
diff --git a/internal/resource/base.go b/internal/resource/base.go
index 9d896886..c9d9936f 100644
--- a/internal/resource/base.go
+++ b/internal/resource/base.go
@@ -131,13 +131,18 @@ func (b *Base) List(ns string) (Columnars, error) {
 func (b *Base) Describe(kind, pa string) (string, error) {
 	mapping, err := k8s.RestMapping.Find(kind)
 	if err != nil {
-		g, v, n := b.Resource.(*k8s.Resource).GetInfo()
-		mapper := k8s.RestMapper{b.Connection}
+		resource, ok := b.Resource.(*k8s.Resource)
+		if !ok {
+			log.Debug().Msgf("resource not a (*k8s.Resource) and %s", err)
+			return "", fmt.Errorf("resource not a (*k8s.Resource) and %s", err)
+		}
+		g, v, n := resource.GetInfo()
+		mapper := k8s.RestMapper{Connection: b.Connection}
 		var e error
 		mapping, e = mapper.ResourceFor(fmt.Sprintf("%s.%s.%s", n, v, g))
 		if e != nil {
-			log.Debug().Err(err).Msgf("Unable to find mapper for %s %s", kind, pa)
-			return "", err
+			log.Debug().Err(e).Msgf("Unable to find mapper for %s %s", kind, pa)
+			return "", e
 		}
 	}
 
diff --git a/internal/resource/custom.go b/internal/resource/custom.go
index 0004cd2b..83151309 100644
--- a/internal/resource/custom.go
+++ b/internal/resource/custom.go
@@ -38,7 +38,7 @@ func NewCustomList(c k8s.Connection, ns, group, version, name string) List {
 func NewCustom(c k8s.Connection, group, version, name string) *Custom {
 	cr := &Custom{Base: &Base{Connection: c, Resource: k8s.NewResource(c, group, version, name)}}
 	cr.Factory = cr
-	cr.group, cr.version, cr.name = cr.Resource.(*k8s.Resource).GetInfo()
+	cr.group, cr.version, cr.name = group, version, name
 
 	return cr
 }
diff --git a/internal/views/resource.go b/internal/views/resource.go
index b869d4e2..183d4dd9 100644
--- a/internal/views/resource.go
+++ b/internal/views/resource.go
@@ -189,7 +189,7 @@ func (v *resourceView) defaultEnter(ns, _, selection string) {
 
 	yaml, err := v.list.Resource().Describe(v.masterPage().baseTitle, selection)
 	if err != nil {
-		v.app.flash().errf("Describe command failed %s", err)
+		v.app.flash().errf("Describe command failed: %s", err)
 		return
 	}