S2a options set default LocalIdentity for ClientOptions (matthewsteve…

…nson88#61) * added default identity to clientOptions LocalIdentity * changed default to nil, added unit test for nil identity
Ryanfsdf · Jul 29, 2020 · 9226b66 · 9226b66
1 parent 34b2ec4
commit 9226b66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/security/s2a/s2a_options.go b/security/s2a/s2a_options.go
@@ -86,6 +86,9 @@ func DefaultServerOptions(handshakerAddress string) *ServerOptions {
 }
 
 func toProtoIdentity(identity Identity) (*s2apb.Identity, error) {
+	if identity == nil {
+		return nil, nil
+	}
 	switch id := identity.(type) {
 	case *spiffeID:
 		return &s2apb.Identity{IdentityOneof: &s2apb.Identity_SpiffeId{SpiffeId: id.Name()}}, nil

diff --git a/security/s2a/s2a_options_test.go b/security/s2a/s2a_options_test.go
@@ -42,6 +42,10 @@ func TestToProtoIdentity(t *testing.T) {
 				IdentityOneof: &s2apb.Identity_Hostname{Hostname: "test_hostname"},
 			},
 		},
+		{
+			identity:    nil,
+			outIdentity: nil,
+		},
 	} {
 		t.Run(tc.outIdentity.String(), func(t *testing.T) {
 			protoSpiffeID, err := toProtoIdentity(tc.identity)