Merge pull request #140 from GraysonNull/grayson/icon-uri

GraysonNull · web-flow · commit 45c7d95ebecf · 2020-02-19T13:02:18.000-06:00
add IconURI to insights
diff --git a/pkg/analyze/analyzer.go b/pkg/analyze/analyzer.go
@@ -14,6 +14,7 @@ type AnalyzeResult struct {
 	Message string
 	URI     string
 	IconKey string
+	IconURI string
 }
 
 type getCollectedFileContents func(string) ([]byte, error)
diff --git a/pkg/analyze/cluster_version.go b/pkg/analyze/cluster_version.go
@@ -43,6 +43,7 @@ func analyzeClusterVersionResult(k8sVersion semver.Version, outcomes []*troubles
 		result := AnalyzeResult{
 			Title:   title,
 			IconKey: "kubernetes_cluster_version",
+			IconURI: "https://troubleshoot.sh/images/analyzer-icons/kubernetes.svg?w=16&h=16",
 		}
 
 		if outcome.Fail != nil {
diff --git a/pkg/analyze/common_status.go b/pkg/analyze/common_status.go
@@ -8,10 +8,11 @@ import (
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
 )
 
-func commonStatus(outcomes []*troubleshootv1beta1.Outcome, title, iconKey string, readyReplicas int) (*AnalyzeResult, error) {
+func commonStatus(outcomes []*troubleshootv1beta1.Outcome, title, iconKey string, iconURI string, readyReplicas int) (*AnalyzeResult, error) {
 	result := &AnalyzeResult{
 		Title:   title,
 		IconKey: iconKey,
+		IconURI: iconURI,
 	}
 
 	// ordering from the spec is important, the first one that matches returns
diff --git a/pkg/analyze/container_runtime.go b/pkg/analyze/container_runtime.go
@@ -29,6 +29,7 @@ func analyzeContainerRuntime(analyzer *troubleshootv1beta1.ContainerRuntime, get
 	result := &AnalyzeResult{
 		Title:   "Container Runtime",
 		IconKey: "kubernetes_container_runtime",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/container-runtime.svg?w=23&h=16",
 	}
 
 	// ordering is important for passthrough
diff --git a/pkg/analyze/crd.go b/pkg/analyze/crd.go
@@ -27,6 +27,7 @@ func analyzeCustomResourceDefinition(analyzer *troubleshootv1beta1.CustomResourc
 	result := AnalyzeResult{
 		Title:   title,
 		IconKey: "kubernetes_custom_resource_definition",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/custom-resource-definition.svg?w=13&h=16",
 	}
 
 	for _, storageClass := range crds {
diff --git a/pkg/analyze/deployment_status.go b/pkg/analyze/deployment_status.go
@@ -33,10 +33,11 @@ func analyzeDeploymentStatus(analyzer *troubleshootv1beta1.DeploymentStatus, get
 		return &AnalyzeResult{
 			Title:   fmt.Sprintf("%s Deployment Status", analyzer.Name),
 			IconKey: "kubernetes_deployment_status",
+			IconURI: "https://troubleshoot.sh/images/analyzer-icons/deployment-status.svg?w=17&h=17",
 			IsFail:  true,
 			Message: fmt.Sprintf("The deployment %q was not found", analyzer.Name),
 		}, nil
 	}
 
-	return commonStatus(analyzer.Outcomes, fmt.Sprintf("%s Status", analyzer.Name), "kubernetes_deployment_status", int(status.ReadyReplicas))
+	return commonStatus(analyzer.Outcomes, fmt.Sprintf("%s Status", analyzer.Name), "kubernetes_deployment_status", "https://troubleshoot.sh/images/analyzer-icons/deployment-status.svg?w=17&h=17", int(status.ReadyReplicas))
 }
diff --git a/pkg/analyze/distribution.go b/pkg/analyze/distribution.go
@@ -102,6 +102,7 @@ func analyzeDistribution(analyzer *troubleshootv1beta1.Distribution, getCollecte
 	result := &AnalyzeResult{
 		Title:   "Kubernetes Distribution",
 		IconKey: "kubernetes_distribution",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/distribution.svg?w=20&h=14",
 	}
 
 	// ordering is important for passthrough
diff --git a/pkg/analyze/image_pull_secret.go b/pkg/analyze/image_pull_secret.go
@@ -26,6 +26,7 @@ func analyzeImagePullSecret(analyzer *troubleshootv1beta1.ImagePullSecret, getCh
 	result := AnalyzeResult{
 		Title:   analyzer.CheckName,
 		IconKey: "kubernetes_image_pull_secret",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/image-pull-secret.svg?w=16&h=14",
 		IsFail:  true,
 		Message: failOutcome.Fail.Message,
 		URI:     failOutcome.Fail.URI,
diff --git a/pkg/analyze/ingress.go b/pkg/analyze/ingress.go
@@ -27,6 +27,7 @@ func analyzeIngress(analyzer *troubleshootv1beta1.Ingress, getCollectedFileConte
 	result := AnalyzeResult{
 		Title:   title,
 		IconKey: "kubernetes_ingress",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/ingress-controller.svg?w=20&h=13",
 	}
 
 	for _, ingress := range ingresses {
diff --git a/pkg/analyze/node_resources.go b/pkg/analyze/node_resources.go
@@ -45,6 +45,7 @@ func analyzeNodeResources(analyzer *troubleshootv1beta1.NodeResources, getCollec
 	result := &AnalyzeResult{
 		Title:   title,
 		IconKey: "kubernetes_node_resources",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/node-resources.svg?w=16&h=18",
 	}
 
 	for _, outcome := range analyzer.Outcomes {
diff --git a/pkg/analyze/secret.go b/pkg/analyze/secret.go
@@ -27,6 +27,7 @@ func analyzeSecret(analyzer *troubleshootv1beta1.AnalyzeSecret, getCollectedFile
 	result := AnalyzeResult{
 		Title:   title,
 		IconKey: "kubernetes_analyze_secret",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/secret.svg?w=13&h=16",
 	}
 
 	var failOutcome *troubleshootv1beta1.Outcome
diff --git a/pkg/analyze/statefulset_status.go b/pkg/analyze/statefulset_status.go
@@ -33,10 +33,11 @@ func analyzeStatefulsetStatus(analyzer *troubleshootv1beta1.StatefulsetStatus, g
 		return &AnalyzeResult{
 			Title:   fmt.Sprintf("%s Statefulset Status", analyzer.Name),
 			IconKey: "kubernetes_statefulset_status",
+			IconURI: "https://troubleshoot.sh/images/analyzer-icons/statefulset-status.svg?w=23&h=14",
 			IsFail:  true,
 			Message: fmt.Sprintf("The statefulset %q was not found", analyzer.Name),
 		}, nil
 	}
 
-	return commonStatus(analyzer.Outcomes, fmt.Sprintf("%s Status", analyzer.Name), "kubernetes_statefulset_status", int(status.ReadyReplicas))
+	return commonStatus(analyzer.Outcomes, fmt.Sprintf("%s Status", analyzer.Name), "kubernetes_statefulset_status", "https://troubleshoot.sh/images/analyzer-icons/statefulset-status.svg?w=23&h=14", int(status.ReadyReplicas))
 }
diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go
@@ -27,6 +27,7 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte
 	result := AnalyzeResult{
 		Title:   title,
 		IconKey: "kubernetes_storage_class",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/storage-class.svg?w=12&h=12",
 	}
 
 	for _, storageClass := range storageClasses {
diff --git a/pkg/analyze/text_analyze.go b/pkg/analyze/text_analyze.go
@@ -33,6 +33,7 @@ func analyzeTextAnalyze(analyzer *troubleshootv1beta1.TextAnalyze, getCollectedF
 	return &AnalyzeResult{
 		Title:   analyzer.CheckName,
 		IconKey: "kubernetes_text_analyze",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/text-analyze.svg",
 		IsFail:  true,
 		Message: "Invalid analyzer",
 	}, nil
@@ -66,6 +67,7 @@ func analyzeRegexPattern(pattern string, collected []byte, outcomes []*troublesh
 	return &AnalyzeResult{
 		Title:   checkName,
 		IconKey: "kubernetes_text_analyze",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/text-analyze.svg",
 		IsFail:  true,
 		Message: failOutcome.Fail.Message,
 		URI:     failOutcome.Fail.URI,
@@ -83,6 +85,7 @@ func analyzeRegexGroups(pattern string, collected []byte, outcomes []*troublesho
 	result := &AnalyzeResult{
 		Title:   checkName,
 		IconKey: "kubernetes_text_analyze",
+		IconURI: "https://troubleshoot.sh/images/analyzer-icons/text-analyze.svg?w=13&h=16",
 	}
 
 	foundMatches := map[string]string{}
diff --git a/pkg/convert/supportbundle.go b/pkg/convert/supportbundle.go
@@ -74,13 +74,15 @@ func FromAnalyzerResult(input []*analyze.AnalyzeResult) []*Result {
 				Labels: map[string]string{
 					"desiredPosition": "1",
 					"iconKey":         i.IconKey,
+					"iconUri":         i.IconURI,
 				},
 			},
 			Insight: &Insight{
 				Meta: Meta{
 					Name: name,
 					Labels: map[string]string{
 						"iconKey": i.IconKey,
+						"iconUri": i.IconURI,
 					},
 				},
 				Primary: i.Title,

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ type AnalyzeResult struct {`
`14`	`14`	`Message string`
`15`	`15`	`URI string`
`16`	`16`	`IconKey string`
	`17`	`+ IconURI string`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`type getCollectedFileContents func(string) ([]byte, error)`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ func analyzeClusterVersionResult(k8sVersion semver.Version, outcomes []*troubles`
`43`	`43`	`result := AnalyzeResult{`
`44`	`44`	`Title: title,`
`45`	`45`	`IconKey: "kubernetes_cluster_version",`
	`46`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/kubernetes.svg?w=16&h=16",`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`if outcome.Fail != nil {`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,11 @@ import (`
`8`	`8`	`troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func commonStatus(outcomes []troubleshootv1beta1.Outcome, title, iconKey string, readyReplicas int) (AnalyzeResult, error) {`
	`11`	`+func commonStatus(outcomes []troubleshootv1beta1.Outcome, title, iconKey string, iconURI string, readyReplicas int) (AnalyzeResult, error) {`
`12`	`12`	`result := &AnalyzeResult{`
`13`	`13`	`Title: title,`
`14`	`14`	`IconKey: iconKey,`
	`15`	`+ IconURI: iconURI,`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`// ordering from the spec is important, the first one that matches returns`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ func analyzeContainerRuntime(analyzer *troubleshootv1beta1.ContainerRuntime, get`
`29`	`29`	`result := &AnalyzeResult{`
`30`	`30`	`Title: "Container Runtime",`
`31`	`31`	`IconKey: "kubernetes_container_runtime",`
	`32`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/container-runtime.svg?w=23&h=16",`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`// ordering is important for passthrough`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func analyzeCustomResourceDefinition(analyzer *troubleshootv1beta1.CustomResourc`
`27`	`27`	`result := AnalyzeResult{`
`28`	`28`	`Title: title,`
`29`	`29`	`IconKey: "kubernetes_custom_resource_definition",`
	`30`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/custom-resource-definition.svg?w=13&h=16",`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`for _, storageClass := range crds {`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,11 @@ func analyzeDeploymentStatus(analyzer *troubleshootv1beta1.DeploymentStatus, get`
`33`	`33`	`return &AnalyzeResult{`
`34`	`34`	`Title: fmt.Sprintf("%s Deployment Status", analyzer.Name),`
`35`	`35`	`IconKey: "kubernetes_deployment_status",`
	`36`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/deployment-status.svg?w=17&h=17",`
`36`	`37`	`IsFail: true,`
`37`	`38`	`Message: fmt.Sprintf("The deployment %q was not found", analyzer.Name),`
`38`	`39`	`}, nil`
`39`	`40`	`}`
`40`	`41`
`41`		`- return commonStatus(analyzer.Outcomes, fmt.Sprintf("%s Status", analyzer.Name), "kubernetes_deployment_status", int(status.ReadyReplicas))`
	`42`	`+ return commonStatus(analyzer.Outcomes, fmt.Sprintf("%s Status", analyzer.Name), "kubernetes_deployment_status", "https://troubleshoot.sh/images/analyzer-icons/deployment-status.svg?w=17&h=17", int(status.ReadyReplicas))`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ func analyzeDistribution(analyzer *troubleshootv1beta1.Distribution, getCollecte`
`102`	`102`	`result := &AnalyzeResult{`
`103`	`103`	`Title: "Kubernetes Distribution",`
`104`	`104`	`IconKey: "kubernetes_distribution",`
	`105`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/distribution.svg?w=20&h=14",`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`// ordering is important for passthrough`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func analyzeIngress(analyzer *troubleshootv1beta1.Ingress, getCollectedFileConte`
`27`	`27`	`result := AnalyzeResult{`
`28`	`28`	`Title: title,`
`29`	`29`	`IconKey: "kubernetes_ingress",`
	`30`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/ingress-controller.svg?w=20&h=13",`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`for _, ingress := range ingresses {`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func analyzeNodeResources(analyzer *troubleshootv1beta1.NodeResources, getCollec`
`45`	`45`	`result := &AnalyzeResult{`
`46`	`46`	`Title: title,`
`47`	`47`	`IconKey: "kubernetes_node_resources",`
	`48`	`+ IconURI: "https://troubleshoot.sh/images/analyzer-icons/node-resources.svg?w=16&h=18",`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`for _, outcome := range analyzer.Outcomes {`