From 0b089a16bed64488d0c8b316c1693ecb0e458b5e Mon Sep 17 00:00:00 2001
From: He Weiwei <hweiwei@vmware.com>
Date: Mon, 24 Jan 2022 14:05:37 +0800
Subject: [PATCH] Bump up spectral to v6.1.0 (#16263)

Signed-off-by: He Weiwei <hweiwei@vmware.com>
---
 .spectral.yaml | 11 ++---------
 Makefile       |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.spectral.yaml b/.spectral.yaml
index 46bc1195b..e56dcb6f6 100644
--- a/.spectral.yaml
+++ b/.spectral.yaml
@@ -5,15 +5,8 @@ functionsDir: "./tools/spectral/functions"
 functions: [requireRequestId]
 
 rules:
-  info-contact: false
-  info-license: false
-  license-url: false
   no-$ref-siblings: false
-  oas2-valid-definition-example: false
-  oas2-valid-response-schema-example: false
-  openapi-tags: false
-  operation-default-response: false
-  operation-tag-defined: false
+  oas2-valid-schema-example: false
 
   required-operationId:
     description: must have a operationId.
@@ -33,7 +26,7 @@ rules:
         type: camel
 
   requestId-required:
-    description: must have a requestId paramaters.
+    description: must have a requestId parameters.
     given: $.paths[*][*]
     severity: error
     then:
diff --git a/Makefile b/Makefile
index 60a66a991..3b0536e58 100644
--- a/Makefile
+++ b/Makefile
@@ -316,7 +316,7 @@ endef
 
 # lint swagger doc
 SPECTRAL_IMAGENAME=$(IMAGENAMESPACE)/spectral
-SPECTRAL_VERSION=v5.9.1
+SPECTRAL_VERSION=v6.1.0
 SPECTRAL_IMAGE_BUILD_CMD=${DOCKERBUILD} -f ${TOOLSPATH}/spectral/Dockerfile --build-arg GOLANG=${GOBUILDIMAGE} --build-arg SPECTRAL_VERSION=${SPECTRAL_VERSION} -t ${SPECTRAL_IMAGENAME}:$(SPECTRAL_VERSION) .
 SPECTRAL=$(RUNCONTAINER) $(SPECTRAL_IMAGENAME):$(SPECTRAL_VERSION)