add some tests, fix some lint

hashicorp · May 27, 2022 · 70f5a76 · 70f5a76
1 parent 832e633
commit 70f5a76
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 6 deletions.
diff --git a/control-plane/connect-inject/endpoints_controller.go b/control-plane/connect-inject/endpoints_controller.go
@@ -3,7 +3,6 @@ package connectinject
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net"
 	"regexp"
@@ -943,22 +942,22 @@ func (r *EndpointsController) processAnnotatedUpstream(pod corev1.Pod, rawUpstre
 			case "dc":
 				datacenter = strings.TrimSpace(pieces[4])
 			default:
-				return api.Upstream{}, errors.New(fmt.Sprintf("upstream structured incorrectly: %s", rawUpstream))
+				return api.Upstream{}, fmt.Errorf("upstream structured incorrectly: %s", rawUpstream)
 			}
 			fallthrough
 		case 4:
 			if strings.TrimSpace(pieces[3]) == "ns" {
 				namespace = strings.TrimSpace(pieces[2])
 			} else {
-				return api.Upstream{}, errors.New(fmt.Sprintf("upstream structured incorrectly: %s", rawUpstream))
+				return api.Upstream{}, fmt.Errorf("upstream structured incorrectly: %s", rawUpstream)
 			}
 			fallthrough
 		case 2:
 			if strings.TrimSpace(pieces[1]) == "svc" {
 				serviceName = strings.TrimSpace(pieces[0])
 			}
 		default:
-			return api.Upstream{}, errors.New(fmt.Sprintf("upstream structured incorrectly: %s", rawUpstream))
+			return api.Upstream{}, fmt.Errorf("upstream structured incorrectly: %s", rawUpstream)
 		}
 
 	} else {
@@ -971,13 +970,13 @@ func (r *EndpointsController) processAnnotatedUpstream(pod corev1.Pod, rawUpstre
 			case "dc":
 				datacenter = strings.TrimSpace(pieces[2])
 			default:
-				return api.Upstream{}, errors.New(fmt.Sprintf("upstream structured incorrectly: %s", rawUpstream))
+				return api.Upstream{}, fmt.Errorf("upstream structured incorrectly: %s", rawUpstream)
 			}
 			fallthrough
 		case 2:
 			serviceName = strings.TrimSpace(pieces[0])
 		default:
-			return api.Upstream{}, errors.New(fmt.Sprintf("upstream structured incorrectly: %s", rawUpstream))
+			return api.Upstream{}, fmt.Errorf("upstream structured incorrectly: %s", rawUpstream)
 		}
 
 	}

diff --git a/control-plane/connect-inject/endpoints_controller_test.go b/control-plane/connect-inject/endpoints_controller_test.go
@@ -360,6 +360,61 @@ func TestProcessUpstreams(t *testing.T) {
 			consulNamespacesEnabled: true,
 			consulPartitionsEnabled: true,
 		},
+		{
+			name: "annotated upstream error: invalid partition/dc/peer",
+			pod: func() *corev1.Pod {
+				pod1 := createPod("pod1", "1.2.3.4", true, true)
+				pod1.Annotations[annotationUpstreams] = "upstream1.svc.ns1.ns.part1.err:1234"
+				return pod1
+			},
+			expErr:                  "upstream structured incorrectly: upstream1.svc.ns1.ns.part1.err:1234",
+			consulNamespacesEnabled: true,
+			consulPartitionsEnabled: false,
+		},
+		{
+			name: "annotated upstream error: invalid namespace",
+			pod: func() *corev1.Pod {
+				pod1 := createPod("pod1", "1.2.3.4", true, true)
+				pod1.Annotations[annotationUpstreams] = "upstream1.svc.ns1.err:1234"
+				return pod1
+			},
+			expErr:                  "upstream structured incorrectly: upstream1.svc.ns1.err:1234",
+			consulNamespacesEnabled: true,
+			consulPartitionsEnabled: false,
+		},
+		{
+			name: "annotated upstream error: invalid number of pieces in the address",
+			pod: func() *corev1.Pod {
+				pod1 := createPod("pod1", "1.2.3.4", true, true)
+				pod1.Annotations[annotationUpstreams] = "upstream1.svc.err:1234"
+				return pod1
+			},
+			expErr:                  "upstream structured incorrectly: upstream1.svc.err:1234",
+			consulNamespacesEnabled: true,
+			consulPartitionsEnabled: false,
+		},
+		{
+			name: "annotated upstream error: invalid peer",
+			pod: func() *corev1.Pod {
+				pod1 := createPod("pod1", "1.2.3.4", true, true)
+				pod1.Annotations[annotationUpstreams] = "upstream1.svc.peer1.err:1234"
+				return pod1
+			},
+			expErr:                  "upstream structured incorrectly: upstream1.svc.peer1.err:1234",
+			consulNamespacesEnabled: false,
+			consulPartitionsEnabled: false,
+		},
+		{
+			name: "annotated upstream error: invalid number of pieces in the address without namespaces and partitions",
+			pod: func() *corev1.Pod {
+				pod1 := createPod("pod1", "1.2.3.4", true, true)
+				pod1.Annotations[annotationUpstreams] = "upstream1.svc.err:1234"
+				return pod1
+			},
+			expErr:                  "upstream structured incorrectly: upstream1.svc.err:1234",
+			consulNamespacesEnabled: false,
+			consulPartitionsEnabled: false,
+		},
 		{
 			name: "upstream with datacenter without ProxyDefaults",
 			pod: func() *corev1.Pod {