Merge pull request #45 from ssmiller25/fix/44/skipincorrectparams

Fix image generation when Envoy/Istio logging tags included

Author: ssmiller25

internal/manifest/kubernetes.go

@@ -225,6 +225,24 @@ func getPodImages(resource []byte) ([]string, error) {
 
 func getImagesFromContainers(containers []corev1.Container) []string {
 	var images []string
+
+	var imgStringsToFilter []string
+
+	//Work-around for mis-identified image parameters that include a URL
+	imgStringsToFilter = append(imgStringsToFilter, "http://")
+	imgStringsToFilter = append(imgStringsToFilter, "https://")
+
+	//Work around for Envoy/Istio log parameters (https://www.envoyproxy.io/docs/envoy/latest/start/quick-start/run-envoy.html#debugging-envoy)
+	// Too many componetns, so just targetting log levels.  Should be low instance of collusion between these values and actual image tags
+
+	imgStringsToFilter = append(imgStringsToFilter, ":trace")
+	imgStringsToFilter = append(imgStringsToFilter, ":debug")
+	imgStringsToFilter = append(imgStringsToFilter, ":info")
+	imgStringsToFilter = append(imgStringsToFilter, ":warn")
+	imgStringsToFilter = append(imgStringsToFilter, ":error")
+	imgStringsToFilter = append(imgStringsToFilter, ":critical")
+	imgStringsToFilter = append(imgStringsToFilter, ":off")
+
 	for _, container := range containers {
 		images = append(images, container.Image)
 
@@ -240,8 +258,16 @@ func getImagesFromContainers(containers []corev1.Container) []string {
 				continue
 			}
 
-			//Work-around for mis-identified image
-			if strings.Contains(image, "http://") || strings.Contains(image, "https://") {
+			// Filter out specific strings that are mis-interpreted as container images
+			var skiploop bool = false
+
+			for _, string := range imgStringsToFilter {
+				if strings.Contains(image, string) {
+					skiploop = true
+				}
+			}
+
+			if skiploop {
 				continue
 			}
 

internal/manifest/kubernetes_test.go

@@ -54,3 +54,30 @@ func TestGetImagesFromContainers_WithURLParameter(t *testing.T) {
 	}
 
 }
+
+// Envoy/Istio specify their log levels as component:level (See https://www.envoyproxy.io/docs/envoy/latest/start/quick-start/run-envoy.html#debugging-envoy)
+func TestGetImagesFromContainers_WithLogComponent(t *testing.T) {
+	containers := []corev1.Container{
+		{
+			Image: "baseimage:v1",
+			Args: []string{
+				"--proxyComponentLogLevel=misc:error",
+				"--log_output_level=default:info",
+			},
+		},
+	}
+	actual := getImagesFromContainers(containers)
+
+	if !contains(actual, "baseimage:v1") {
+		t.Errorf("expected baseimage:v1 to exist in list of images but it did not: %v", actual)
+	}
+
+	if contains(actual, "misc:error") {
+		t.Errorf("Invalid image parsing for args contain misc:error parameter: %v", actual)
+	}
+
+	if contains(actual, "default:info") {
+		t.Errorf("Invalid image parsing for args contain default:info parameter: %v", actual)
+	}
+
+}