Merge pull request #2073 from mhrivnak/fix-templateinstance-describe-panic

OCPBUGS-60281: Fix panic in oc describe templateinstance when Secret is nil

Author: openshift-merge-bot[bot]

pkg/helpers/describe/describer.go

@@ -1348,7 +1348,12 @@ func (d *TemplateInstanceDescriber) DescribeTemplateInstance(templateInstance *t
 		d.DescribeObjects(templateInstance.Status.Objects, out)
 		out.Write([]byte("\n"))
 		out.Flush()
-		d.DescribeParameters(templateInstance.Spec.Template, namespace, templateInstance.Spec.Secret.Name, out)
+		if templateInstance.Spec.Secret != nil {
+			d.DescribeParameters(templateInstance.Spec.Template, namespace, templateInstance.Spec.Secret.Name, out)
+		} else {
+			formatString(out, "Parameters", " ")
+			fmt.Fprint(out, "    No secret specified for parameters.")
+		}
 		out.Write([]byte("\n"))
 		out.Flush()
 		return nil

pkg/helpers/describe/describer_test.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	kubernetesscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
+	"k8s.io/kubectl/pkg/describe"
 )
 
 type describeClient struct {
@@ -792,3 +793,82 @@ func Test_describeBuildVolumes(t *testing.T) {
 		})
 	}
 }
+
+func TestTemplateInstanceDescriberNilSecret(t *testing.T) {
+	tests := []struct {
+		name             string
+		templateInstance *templatev1.TemplateInstance
+		want             []string
+	}{
+		{
+			name: "template instance with nil secret",
+			templateInstance: &templatev1.TemplateInstance{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-template-instance",
+					Namespace: "test-namespace",
+				},
+				Spec: templatev1.TemplateInstanceSpec{
+					Template: templatev1.Template{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "test-template",
+						},
+					},
+					Secret: nil,
+				},
+				Status: templatev1.TemplateInstanceStatus{
+					Conditions: []templatev1.TemplateInstanceCondition{},
+					Objects:    []templatev1.TemplateInstanceObject{},
+				},
+			},
+			want: []string{
+				"No secret specified for parameters",
+			},
+		},
+		{
+			name: "template instance with secret",
+			templateInstance: &templatev1.TemplateInstance{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-template-instance",
+					Namespace: "test-namespace",
+				},
+				Spec: templatev1.TemplateInstanceSpec{
+					Template: templatev1.Template{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "test-template",
+						},
+					},
+					Secret: &corev1.LocalObjectReference{
+						Name: "test-secret",
+					},
+				},
+				Status: templatev1.TemplateInstanceStatus{
+					Conditions: []templatev1.TemplateInstanceCondition{},
+					Objects:    []templatev1.TemplateInstanceObject{},
+				},
+			},
+			want: []string{
+				"Parameters",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			kubeClient := fake.NewSimpleClientset()
+			describer := &TemplateInstanceDescriber{
+				kubeClient: kubeClient,
+			}
+
+			result, err := describer.DescribeTemplateInstance(tt.templateInstance, "test-namespace", describe.DescriberSettings{})
+			if err != nil {
+				t.Fatalf("DescribeTemplateInstance failed: %v", err)
+			}
+
+			for _, expected := range tt.want {
+				if !strings.Contains(result, expected) {
+					t.Errorf("Expected output to contain %q, but got:\n%s", expected, result)
+				}
+			}
+		})
+	}
+}