From 71f08ccfc7d230ecb6ca446f7449982c4c7f25fb Mon Sep 17 00:00:00 2001 From: qiaozp Date: Sun, 11 Sep 2022 01:13:32 +0800 Subject: [PATCH] Fix: vela show panic for component markdown format Signed-off-by: qiaozp --- e2e/commonContext.go | 10 ++++++++++ e2e/trait/trait_test.go | 1 + e2e/workload/workload_test.go | 1 + references/cli/show.go | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/e2e/commonContext.go b/e2e/commonContext.go index 96fb1516f..46625fbe5 100644 --- a/e2e/commonContext.go +++ b/e2e/commonContext.go @@ -186,4 +186,14 @@ var ( }) }) } + + ShowCapabilityReferenceMarkdown = func(context string, capabilityName string) bool { + return ginkgo.Context(context, func() { + ginkgo.It("should show capability reference in markdown", func() { + cli := fmt.Sprintf("vela show %s --format=markdown", capabilityName) + _, err := Exec(cli) + gomega.Expect(err).Should(gomega.BeNil()) + }) + }) + } ) diff --git a/e2e/trait/trait_test.go b/e2e/trait/trait_test.go index 450d0cea4..14f95af7c 100644 --- a/e2e/trait/trait_test.go +++ b/e2e/trait/trait_test.go @@ -28,6 +28,7 @@ var _ = ginkgo.Describe("Trait", func() { var _ = ginkgo.Describe("Test vela show", func() { e2e.ShowCapabilityReference("show ingress", "ingress") + e2e.ShowCapabilityReferenceMarkdown("show ingress markdown", "ingress") env := "namespace-xxxfwrr23erfm" e2e.EnvInitWithNamespaceOptionContext("env init", env, env) diff --git a/e2e/workload/workload_test.go b/e2e/workload/workload_test.go index 1b79b9a62..4d000fb59 100644 --- a/e2e/workload/workload_test.go +++ b/e2e/workload/workload_test.go @@ -37,6 +37,7 @@ var _ = Describe("Workload", func() { var _ = Describe("Test vela show", func() { e2e.ShowCapabilityReference("show webservice", "webservice") + e2e.ShowCapabilityReferenceMarkdown("show webservice markdown", "webservice") env := "namespace-xxxfwrr23erfm" e2e.EnvInitWithNamespaceOptionContext("env init", env, env) diff --git a/references/cli/show.go b/references/cli/show.go index 88c9c0b17..9c25ed4fc 100644 --- a/references/cli/show.go +++ b/references/cli/show.go @@ -186,6 +186,10 @@ func startReferenceDocsSite(ctx context.Context, ns string, c common.Args, ioStr if err != nil { return err } + ref.DiscoveryMapper, err = c.GetDiscoveryMapper() + if err != nil { + return err + } if err := ref.CreateMarkdown(ctx, capabilities, docsPath, true, pd); err != nil { return err } @@ -454,6 +458,10 @@ func ShowReferenceMarkdown(ctx context.Context, c common.Args, ioStreams cmdutil return err } ref.ParseReference = paserRef + ref.DiscoveryMapper, err = c.GetDiscoveryMapper() + if err != nil { + return err + } if err := ref.GenerateReferenceDocs(ctx, c, outputPath); err != nil { return errors.Wrap(err, "failed to generate reference docs") }