Merge pull request #110 from yangcao77/805-fix-v2index-sample

only apply filter if value is set

Author: yangcao77

index/server/pkg/server/endpoint.go

@@ -331,34 +331,36 @@ func buildIndexAPIResponse(c *gin.Context, wantV1Index bool) {
 	} else {
 		minSchemaVersion := c.Query("minSchemaVersion")
 		maxSchemaVersion := c.Query("maxSchemaVersion")
-		// check if schema version filters are in valid format.
-		// should only include major and minor version. e.g. 2.1
-		if minSchemaVersion != "" {
-			matched, err := regexp.MatchString(`^([2-9])\.([0-9]+)$`, minSchemaVersion)
-			if !matched || err != nil {
-				c.JSON(http.StatusInternalServerError, gin.H{
-					"status": fmt.Sprintf("minSchemaVersion %s is not valid, should only include major and minor version. %v", minSchemaVersion, err),
-				})
-				return
+		if maxSchemaVersion != "" || minSchemaVersion != "" {
+			// check if schema version filters are in valid format.
+			// should only include major and minor version. e.g. 2.1
+			if minSchemaVersion != "" {
+				matched, err := regexp.MatchString(`^([2-9])\.([0-9]+)$`, minSchemaVersion)
+				if !matched || err != nil {
+					c.JSON(http.StatusInternalServerError, gin.H{
+						"status": fmt.Sprintf("minSchemaVersion %s is not valid, should only include major and minor version. %v", minSchemaVersion, err),
+					})
+					return
+				}
 			}
-		}
-		if maxSchemaVersion != "" {
-			matched, err := regexp.MatchString(`^([2-9])\.([0-9]+)$`, maxSchemaVersion)
-			if !matched || err != nil {
+			if maxSchemaVersion != "" {
+				matched, err := regexp.MatchString(`^([2-9])\.([0-9]+)$`, maxSchemaVersion)
+				if !matched || err != nil {
+					c.JSON(http.StatusInternalServerError, gin.H{
+						"status": fmt.Sprintf("maxSchemaVersion %s is not valid, should only include major and minor version. %v", maxSchemaVersion, err),
+					})
+					return
+				}
+			}
+
+			index, err = util.FilterDevfileSchemaVersion(index, minSchemaVersion, maxSchemaVersion)
+			if err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{
-					"status": fmt.Sprintf("maxSchemaVersion %s is not valid, should only include major and minor version. %v", maxSchemaVersion, err),
+					"status": fmt.Sprintf("failed to apply schema version filter: %v", err),
 				})
 				return
 			}
 		}
-
-		index, err = util.FilterDevfileSchemaVersion(index, minSchemaVersion, maxSchemaVersion)
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{
-				"status": fmt.Sprintf("failed to apply schema version filter: %v", err),
-			})
-			return
-		}
 	}
 	// Filter the index if archs has been requested
 	if len(archs) > 0 {