Merge branch 'istio-ecosystem:master' into master

admiral/pkg/apis/admiral/filters/filters.go

@@ -28,16 +28,3 @@ func Logger(inner http.Handler, name string) http.Handler {
 		)
 	})
 }
-
-func Auth(inner http.Handler, name string) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
-		log.Printf(
-			"Auth Logger for endpoint %s", name,
-		)
-		//TODO implement authnz
-
-		inner.ServeHTTP(w, r)
-
-	})
-}

admiral/pkg/clusters/sidecar_handler_test.go

@@ -1 +1,32 @@
 package clusters
+
+import (
+	"context"
+	"github.com/stretchr/testify/assert"
+	"istio.io/client-go/pkg/apis/networking/v1alpha3"
+	"testing"
+)
+
+func TestSidecarHandler_Added(t *testing.T) {
+	var dh SidecarHandler
+	var ctx context.Context
+	var obj *v1alpha3.Sidecar
+	err := dh.Added(ctx, obj)
+	assert.Nil(t, err)
+}
+
+func TestSidecarHandler_Updated(t *testing.T) {
+	var dh SidecarHandler
+	var ctx context.Context
+	var obj *v1alpha3.Sidecar
+	err := dh.Updated(ctx, obj)
+	assert.Nil(t, err)
+}
+
+func TestSidecarHandler_Deleted(t *testing.T) {
+	var dh SidecarHandler
+	var ctx context.Context
+	var obj *v1alpha3.Sidecar
+	err := dh.Deleted(ctx, obj)
+	assert.Nil(t, err)
+}

admiral/pkg/clusters/types_test.go

@@ -1,7 +1,9 @@
 package clusters
 
 import (
+	"github.com/stretchr/testify/assert"
 	"sync"
+	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -42,3 +44,36 @@ func setupForTypeTests() {
 		common.InitializeConfig(admiralParamsForTypesTests())
 	})
 }
+
+func TestRangeRemoteControllers(t *testing.T) {
+	setupForTypeTests()
+
+	rr := &RemoteRegistry{
+		Mutex:             sync.Mutex{},
+		remoteControllers: map[string]*RemoteController{"test": &RemoteController{}},
+	}
+
+	counter := 0
+	// testFunc is a function that tests the RemoteController
+	testFunc := func(k string, v *RemoteController) {
+		counter = counter + 1
+	}
+
+	// TestRangeRemoteControllers is a table-driven test for RangeRemoteControllers
+	tests := []struct {
+		name     string
+		expected int
+	}{
+		{
+			name:     "TestRangeRemoteControllers",
+			expected: 1,
+		},
+	}
+	for _, tt := range tests {
+		counter = 0
+		t.Run(tt.name, func(t *testing.T) {
+			rr.RangeRemoteControllers(testFunc)
+			assert.Equal(t, tt.expected, counter)
+		})
+	}
+}

admiral/pkg/controller/admiral/configmap_test.go

@@ -2,6 +2,7 @@ package admiral
 
 import (
 	"context"
+	"github.com/istio-ecosystem/admiral/admiral/pkg/client/loader"
 	"testing"
 	"time"
 
@@ -172,3 +173,27 @@ func TestConfigMapController_PutConfigMap(t *testing.T) {
 	}
 
 }
+
+func TestNewConfigMapController(t *testing.T) {
+	clientLoader := &loader.FakeClientLoader{}
+	seIPPrefix := "prefix"
+	controller, err := NewConfigMapController(seIPPrefix, clientLoader)
+	if err != nil {
+		t.Errorf("No error expected. Err: %v", err)
+	}
+
+	if controller.ServiceEntryIPPrefix != seIPPrefix {
+		t.Errorf("Expected %v but got %v", seIPPrefix, controller.ServiceEntryIPPrefix)
+	}
+}
+
+func TestConfigMapController_GetIPPrefixForServiceEntries(t *testing.T) {
+	seIPPrefix := "prefix"
+	controller := ConfigMapController{
+		ServiceEntryIPPrefix: seIPPrefix,
+	}
+
+	if controller.GetIPPrefixForServiceEntries() != seIPPrefix {
+		t.Errorf("Expected %v but got %v", seIPPrefix, controller.GetIPPrefixForServiceEntries())
+	}
+}