From 71049108cea80e37a06902d63b3c1e215a107ce6 Mon Sep 17 00:00:00 2001 From: Arcturus Date: Thu, 14 Jan 2021 14:50:53 +0800 Subject: [PATCH] The output-folder for a profile now no longer reports errors (#14161) * the output-folder for a profile now no longer reports errors * refine the error message to give more clear guidance of fixing --- tools/generator/validate/validation.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/generator/validate/validation.go b/tools/generator/validate/validation.go index 0e7a62cf515b..61d85d089d35 100644 --- a/tools/generator/validate/validation.go +++ b/tools/generator/validate/validation.go @@ -77,7 +77,7 @@ func MgmtCheck(ctx *MetadataValidateContext, tag string, metadata model.Metadata return err } if !mgmtOutputRegex.MatchString(rel) { - return fmt.Errorf("the output-folder of a management plane package '%s' must be in this pattern: '^services(/preview)?/[^/]+/mgmt/[^/]+/[^/]+$'", tag) + return fmt.Errorf("the output-folder of a management plane package '%s' is expected to have this pattern: 'services/(preview)?/{RPname}/mgmt/{packageVersion}/{namespace}'", tag) } } return nil @@ -104,5 +104,5 @@ var ( previewSwaggerRegex = regexp.MustCompile(`^preview|.+[/\\]preview[/\\]`) previewOutputRegex = regexp.MustCompile(`^services/preview/`) mgmtReadmeRegex = regexp.MustCompile(`[/\\]resource-manager[/\\]`) - mgmtOutputRegex = regexp.MustCompile(`^services(/preview)?/[^/]+/mgmt/[^/]+/[^/]+$`) + mgmtOutputRegex = regexp.MustCompile(`^services(/preview)?/[^/]+/mgmt/[^/]+/[^/]+$|^profiles/[^/]+/[^/]+/mgmt/[^/]+$`) )