Merge pull request #129 from gianlucam76/release-1.2

Make filters case insensitive

Author: gianlucam76

README.md

@@ -237,6 +237,11 @@ returns
 
 where cluster type can either be __capi__ for ClusterAPI powered clusters or __sveltos__ for SveltosClusters
 
+It is also possible to filter helm charts by:
+
+1. `profile_name` => filter profiles by name
+2. `profile_kind` => filter profiles by kind
+
 This API supports pagination. Use:
 
 . ```limit=<int>``` to specify the number of Kubernetes resources the API will return

internal/server/addons.go

@@ -220,13 +220,19 @@ func addDeployedChartsForFeature(profileName string, helmFilters *helmFilters,
 		chart := &charts[i]
 
 		if helmFilters != nil && helmFilters.ReleaseName != "" {
-			if !strings.Contains(chart.ReleaseName, helmFilters.ReleaseName) {
+			if !strings.Contains(
+				strings.ToLower(chart.ReleaseName),
+				strings.ToLower(helmFilters.ReleaseName)) {
+
 				continue
 			}
 		}
 
 		if helmFilters != nil && helmFilters.ReleaseNamespace != "" {
-			if !strings.Contains(chart.Namespace, helmFilters.ReleaseNamespace) {
+			if !strings.Contains(
+				strings.ToLower(chart.Namespace),
+				strings.ToLower(helmFilters.ReleaseNamespace)) {
+
 				continue
 			}
 		}
@@ -284,19 +290,28 @@ func addDeployedResourcesForFeature(profileName string, resourceFilters *resourc
 		resource := &resources[i]
 
 		if resourceFilters != nil && resourceFilters.Name != "" {
-			if !strings.Contains(resource.Name, resourceFilters.Name) {
+			if !strings.Contains(
+				strings.ToLower(resource.Name),
+				strings.ToLower(resourceFilters.Name)) {
+
 				continue
 			}
 		}
 
 		if resourceFilters != nil && resourceFilters.Namespace != "" {
-			if !strings.Contains(resource.Namespace, resourceFilters.Namespace) {
+			if !strings.Contains(
+				strings.ToLower(resource.Namespace),
+				strings.ToLower(resourceFilters.Namespace)) {
+
 				continue
 			}
 		}
 
 		if resourceFilters != nil && resourceFilters.Kind != "" {
-			if !strings.Contains(resource.Kind, resourceFilters.Kind) {
+			if !strings.Contains(
+				strings.ToLower(resource.Kind),
+				strings.ToLower(resourceFilters.Kind)) {
+
 				continue
 			}
 		}

internal/server/clustersummary_status.go

@@ -17,6 +17,8 @@ limitations under the License.
 package server
 
 import (
+	"strings"
+
 	libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
 )
 
@@ -30,19 +32,41 @@ func getFlattenedProfileStatusesInRange(flattenedProfileStatuses []ProfileStatus
 	return getSliceInRange(flattenedProfileStatuses, limit, skip)
 }
 
-func flattenProfileStatuses(profileStatuses []ClusterProfileStatus, failedOnly bool) []ProfileStatusResult {
+func flattenProfileStatuses(profileStatuses []ClusterProfileStatus, failedOnly bool,
+	filters *profileFilters) []ProfileStatusResult {
+
 	result := make([]ProfileStatusResult, 0)
 
 	for i := range profileStatuses {
-		result = append(result, flattenProfileStatus(&profileStatuses[i], failedOnly)...)
+		result = append(result, flattenProfileStatus(&profileStatuses[i], failedOnly, filters)...)
 	}
 
 	return result
 }
 
-func flattenProfileStatus(profileStatus *ClusterProfileStatus, failedOnly bool) []ProfileStatusResult {
+func flattenProfileStatus(profileStatus *ClusterProfileStatus, failedOnly bool,
+	filters *profileFilters) []ProfileStatusResult {
+
 	result := make([]ProfileStatusResult, 0)
 	for i := range profileStatus.Summary {
+		if filters != nil && filters.Name != "" {
+			if !strings.Contains(
+				strings.ToLower(profileStatus.ProfileName),
+				strings.ToLower(filters.Name)) {
+
+				continue
+			}
+		}
+
+		if filters != nil && filters.Kind != "" {
+			if !strings.Contains(
+				strings.ToLower(profileStatus.ProfileType),
+				strings.ToLower(filters.Kind)) {
+
+				continue
+			}
+		}
+
 		if !failedOnly || !isCompleted(profileStatus.Summary[i]) {
 			result = append(result,
 				ProfileStatusResult{

internal/server/http.go

@@ -287,13 +287,18 @@ var (
 	getClusterStatus = func(c *gin.Context) {
 		ginLogger.V(logs.LogDebug).Info("get list of profiles (and their status) matching a cluster")
 
-		failedOnly := getFailedOnlyFromQuery(c)
-		limit, skip := getLimitAndSkipFromQuery(c)
 		namespace, name, clusterType := getClusterFromQuery(c)
 		ginLogger.V(logs.LogDebug).Info(fmt.Sprintf("cluster %s:%s/%s", clusterType, namespace, name))
+
+		failedOnly := getFailedOnlyFromQuery(c)
+		limit, skip := getLimitAndSkipFromQuery(c)
 		ginLogger.V(logs.LogDebug).Info(fmt.Sprintf("limit %d skip %d", limit, skip))
 		ginLogger.V(logs.LogDebug).Info(fmt.Sprintf("failed %t", failedOnly))
 
+		filters := getProfileFiltersFromQuery(c)
+		ginLogger.V(logs.LogDebug).Info(fmt.Sprintf("filters: kind %q namespace %q name %q",
+			filters.Kind, filters.Namespace, filters.Name))
+
 		user, err := validateToken(c)
 		if err != nil {
 			_ = c.AbortWithError(http.StatusUnauthorized, err)
@@ -316,7 +321,7 @@ var (
 
 		clusterProfileStatuses := manager.GetClusterProfileStatusesByCluster(&namespace, &name, clusterType)
 
-		flattenedProfileStatuses := flattenProfileStatuses(clusterProfileStatuses, failedOnly)
+		flattenedProfileStatuses := flattenProfileStatuses(clusterProfileStatuses, failedOnly, filters)
 		sort.Slice(flattenedProfileStatuses, func(i, j int) bool {
 			return sortClusterProfileStatus(flattenedProfileStatuses, i, j)
 		})
@@ -764,13 +769,19 @@ func getProfileData(profiles map[corev1.ObjectReference]ProfileInfo, filters *pr
 		}
 
 		if filters.Namespace != "" {
-			if !strings.Contains(k.Namespace, filters.Namespace) {
+			if !strings.Contains(
+				strings.ToLower(k.Namespace),
+				strings.ToLower(filters.Namespace)) {
+
 				continue
 			}
 		}
 
 		if filters.Name != "" {
-			if !strings.Contains(k.Name, filters.Name) {
+			if !strings.Contains(
+				strings.ToLower(k.Name),
+				strings.ToLower(filters.Name)) {
+
 				continue
 			}
 		}

internal/server/profiles.go

@@ -70,9 +70,9 @@ type profileFilters struct {
 func getProfileFiltersFromQuery(c *gin.Context) *profileFilters {
 	var filters profileFilters
 	// Get the values from query parameters
-	filters.Namespace = c.Query("namespace")
-	filters.Name = c.Query("name")
-	filters.Kind = c.Query("kind")
+	filters.Namespace = c.Query("profile_namespace")
+	filters.Name = c.Query("profile_name")
+	filters.Kind = c.Query("profile_kind")
 
 	return &filters
 }