From c6f1defa9d6b7c80fd72d26f2bc0d4549b7b01b6 Mon Sep 17 00:00:00 2001 From: Andrew Keesler Date: Fri, 14 Aug 2020 09:18:31 -0400 Subject: [PATCH] LoginRequestStatus.Message should be a pointer since it is +optional Signed-off-by: Andrew Keesler --- internal/registry/loginrequest/rest.go | 3 ++- internal/registry/loginrequest/rest_test.go | 7 +++++-- kubernetes/1.19/api/apis/placeholder/types.go | 2 +- kubernetes/1.19/api/apis/placeholder/v1alpha1/types.go | 2 +- .../apis/placeholder/v1alpha1/zz_generated.conversion.go | 4 ++-- .../api/apis/placeholder/v1alpha1/zz_generated.deepcopy.go | 5 +++++ .../1.19/api/apis/placeholder/zz_generated.deepcopy.go | 5 +++++ test/integration/loginrequest_test.go | 6 +++++- 8 files changed, 26 insertions(+), 8 deletions(-) diff --git a/internal/registry/loginrequest/rest.go b/internal/registry/loginrequest/rest.go index c10885f5..4f66d3df 100644 --- a/internal/registry/loginrequest/rest.go +++ b/internal/registry/loginrequest/rest.go @@ -202,10 +202,11 @@ func traceFailureWithError(t *trace.Trace, failureType string, err error) { } func failureResponse() *placeholderapi.LoginRequest { + m := "authentication failed" return &placeholderapi.LoginRequest{ Status: placeholderapi.LoginRequestStatus{ Credential: nil, - Message: "authentication failed", + Message: &m, }, } } diff --git a/internal/registry/loginrequest/rest_test.go b/internal/registry/loginrequest/rest_test.go index a8ee6a95..59e809b4 100644 --- a/internal/registry/loginrequest/rest_test.go +++ b/internal/registry/loginrequest/rest_test.go @@ -123,7 +123,6 @@ func TestCreate(t *testing.T) { ClientCertificateData: "test-cert", ClientKeyData: "test-key", }, - Message: "", }, }) r.Equal(requestToken, webhook.calledWithToken) @@ -490,7 +489,7 @@ func requireSuccessfulResponseWithAuthenticationFailureMessage(t *testing.T, err require.Equal(t, response, &placeholderapi.LoginRequest{ Status: placeholderapi.LoginRequestStatus{ Credential: nil, - Message: "authentication failed", + Message: stringPtr("authentication failed"), }, }) } @@ -502,3 +501,7 @@ func successfulIssuer(ctrl *gomock.Controller) CertIssuer { Return([]byte("test-cert"), []byte("test-key"), nil) return issuer } + +func stringPtr(s string) *string { + return &s +} diff --git a/kubernetes/1.19/api/apis/placeholder/types.go b/kubernetes/1.19/api/apis/placeholder/types.go index 98160e53..6253c466 100644 --- a/kubernetes/1.19/api/apis/placeholder/types.go +++ b/kubernetes/1.19/api/apis/placeholder/types.go @@ -59,7 +59,7 @@ type LoginRequestStatus struct { // An error message will be returned for an unsuccessful login request. // +optional - Message string + Message *string } // +genclient diff --git a/kubernetes/1.19/api/apis/placeholder/v1alpha1/types.go b/kubernetes/1.19/api/apis/placeholder/v1alpha1/types.go index 43f48519..ca8ce922 100644 --- a/kubernetes/1.19/api/apis/placeholder/v1alpha1/types.go +++ b/kubernetes/1.19/api/apis/placeholder/v1alpha1/types.go @@ -59,7 +59,7 @@ type LoginRequestStatus struct { // An error message will be returned for an unsuccessful login request. // +optional - Message string `json:"message,omitempty"` + Message *string `json:"message,omitempty"` } // +genclient diff --git a/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.conversion.go b/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.conversion.go index d75a94ae..d8dce5a2 100644 --- a/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.conversion.go +++ b/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.conversion.go @@ -202,7 +202,7 @@ func Convert_placeholder_LoginRequestSpec_To_v1alpha1_LoginRequestSpec(in *place func autoConvert_v1alpha1_LoginRequestStatus_To_placeholder_LoginRequestStatus(in *LoginRequestStatus, out *placeholder.LoginRequestStatus, s conversion.Scope) error { out.Credential = (*placeholder.LoginRequestCredential)(unsafe.Pointer(in.Credential)) out.User = (*placeholder.User)(unsafe.Pointer(in.User)) - out.Message = in.Message + out.Message = (*string)(unsafe.Pointer(in.Message)) return nil } @@ -214,7 +214,7 @@ func Convert_v1alpha1_LoginRequestStatus_To_placeholder_LoginRequestStatus(in *L func autoConvert_placeholder_LoginRequestStatus_To_v1alpha1_LoginRequestStatus(in *placeholder.LoginRequestStatus, out *LoginRequestStatus, s conversion.Scope) error { out.Credential = (*LoginRequestCredential)(unsafe.Pointer(in.Credential)) out.User = (*User)(unsafe.Pointer(in.User)) - out.Message = in.Message + out.Message = (*string)(unsafe.Pointer(in.Message)) return nil } diff --git a/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.deepcopy.go b/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.deepcopy.go index 6ba17609..52ccfcc0 100644 --- a/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.deepcopy.go +++ b/kubernetes/1.19/api/apis/placeholder/v1alpha1/zz_generated.deepcopy.go @@ -125,6 +125,11 @@ func (in *LoginRequestStatus) DeepCopyInto(out *LoginRequestStatus) { *out = new(User) (*in).DeepCopyInto(*out) } + if in.Message != nil { + in, out := &in.Message, &out.Message + *out = new(string) + **out = **in + } return } diff --git a/kubernetes/1.19/api/apis/placeholder/zz_generated.deepcopy.go b/kubernetes/1.19/api/apis/placeholder/zz_generated.deepcopy.go index f89c5215..b7fa8f1d 100644 --- a/kubernetes/1.19/api/apis/placeholder/zz_generated.deepcopy.go +++ b/kubernetes/1.19/api/apis/placeholder/zz_generated.deepcopy.go @@ -125,6 +125,11 @@ func (in *LoginRequestStatus) DeepCopyInto(out *LoginRequestStatus) { *out = new(User) (*in).DeepCopyInto(*out) } + if in.Message != nil { + in, out := &in.Message, &out.Message + *out = new(string) + **out = **in + } return } diff --git a/test/integration/loginrequest_test.go b/test/integration/loginrequest_test.go index 3bd3f503..cb46bf63 100644 --- a/test/integration/loginrequest_test.go +++ b/test/integration/loginrequest_test.go @@ -155,7 +155,7 @@ func TestFailedLoginRequestWhenTheRequestIsValidButTheTokenDoesNotAuthenticateTh require.Empty(t, response.Spec) require.Nil(t, response.Status.Credential) require.Nil(t, response.Status.User) - require.Equal(t, "authentication failed", response.Status.Message) + require.Equal(t, stringPtr("authentication failed"), response.Status.Message) } func TestLoginRequest_ShouldFailWhenRequestDoesNotIncludeToken(t *testing.T) { @@ -178,3 +178,7 @@ func TestLoginRequest_ShouldFailWhenRequestDoesNotIncludeToken(t *testing.T) { require.Empty(t, response.Spec) require.Nil(t, response.Status.Credential) } + +func stringPtr(s string) *string { + return &s +}