Unverified Commit 9610ed8f authored by memoclaw's avatar memoclaw Committed by GitHub

fix(lint): correct goimports struct literal alignment after removing...

fix(lint): correct goimports struct literal alignment after removing write-only credential fields (#5794)
Co-authored-by: 's avatarClaude <noreply@anthropic.com>
parent 9d3a74bc
...@@ -185,7 +185,7 @@ func convertIdentityProviderFromStore(identityProvider *storepb.IdentityProvider ...@@ -185,7 +185,7 @@ func convertIdentityProviderFromStore(identityProvider *storepb.IdentityProvider
AuthUrl: oauth2Config.AuthUrl, AuthUrl: oauth2Config.AuthUrl,
TokenUrl: oauth2Config.TokenUrl, TokenUrl: oauth2Config.TokenUrl,
UserInfoUrl: oauth2Config.UserInfoUrl, UserInfoUrl: oauth2Config.UserInfoUrl,
Scopes: oauth2Config.Scopes, Scopes: oauth2Config.Scopes,
FieldMapping: &v1pb.FieldMapping{ FieldMapping: &v1pb.FieldMapping{
Identifier: oauth2Config.FieldMapping.Identifier, Identifier: oauth2Config.FieldMapping.Identifier,
DisplayName: oauth2Config.FieldMapping.DisplayName, DisplayName: oauth2Config.FieldMapping.DisplayName,
...@@ -233,4 +233,3 @@ func convertIdentityProviderConfigToStore(identityProviderType v1pb.IdentityProv ...@@ -233,4 +233,3 @@ func convertIdentityProviderConfigToStore(identityProviderType v1pb.IdentityProv
} }
return nil return nil
} }
...@@ -127,6 +127,8 @@ func (s *APIV1Service) UpdateInstanceSetting(ctx context.Context, request *v1pb. ...@@ -127,6 +127,8 @@ func (s *APIV1Service) UpdateInstanceSetting(ctx context.Context, request *v1pb.
storage.S3Config.AccessKeySecret = existing.S3Config.AccessKeySecret storage.S3Config.AccessKeySecret = existing.S3Config.AccessKeySecret
} }
} }
default:
// No credential preservation needed for other setting types.
} }
instanceSetting, err := s.Store.UpsertInstanceSetting(ctx, updateSetting) instanceSetting, err := s.Store.UpsertInstanceSetting(ctx, updateSetting)
...@@ -261,11 +263,11 @@ func convertInstanceStorageSettingFromStore(settingpb *storepb.InstanceStorageSe ...@@ -261,11 +263,11 @@ func convertInstanceStorageSettingFromStore(settingpb *storepb.InstanceStorageSe
} }
if settingpb.S3Config != nil { if settingpb.S3Config != nil {
setting.S3Config = &v1pb.InstanceSetting_StorageSetting_S3Config{ setting.S3Config = &v1pb.InstanceSetting_StorageSetting_S3Config{
AccessKeyId: settingpb.S3Config.AccessKeyId, AccessKeyId: settingpb.S3Config.AccessKeyId,
// AccessKeySecret is write-only: never returned in responses. // AccessKeySecret is write-only: never returned in responses.
Endpoint: settingpb.S3Config.Endpoint, Endpoint: settingpb.S3Config.Endpoint,
Region: settingpb.S3Config.Region, Region: settingpb.S3Config.Region,
Bucket: settingpb.S3Config.Bucket, Bucket: settingpb.S3Config.Bucket,
UsePathStyle: settingpb.S3Config.UsePathStyle, UsePathStyle: settingpb.S3Config.UsePathStyle,
} }
} }
......
...@@ -28,8 +28,8 @@ func withSuppressSSE(ctx context.Context) context.Context { ...@@ -28,8 +28,8 @@ func withSuppressSSE(ctx context.Context) context.Context {
} }
func isSSESuppressed(ctx context.Context) bool { func isSSESuppressed(ctx context.Context) bool {
v, _ := ctx.Value(suppressSSEKey{}).(bool) v, ok := ctx.Value(suppressSSEKey{}).(bool)
return v return ok && v
} }
func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoRequest) (*v1pb.Memo, error) { func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoRequest) (*v1pb.Memo, error) {
......
...@@ -32,20 +32,6 @@ func userCtx(ctx context.Context, userID int32) context.Context { ...@@ -32,20 +32,6 @@ func userCtx(ctx context.Context, userID int32) context.Context {
return context.WithValue(ctx, auth.UserIDContextKey, userID) return context.WithValue(ctx, auth.UserIDContextKey, userID)
} }
// drainEvents reads all events currently buffered in the channel and returns
// them as a string slice. It stops as soon as the channel is empty (non-blocking).
func drainEvents(ch <-chan []byte) []string {
var out []string
for {
select {
case data := <-ch:
out = append(out, string(data))
default:
return out
}
}
}
// collectEventsFor reads events from ch for the given duration and returns them. // collectEventsFor reads events from ch for the given duration and returns them.
func collectEventsFor(ch <-chan []byte, d time.Duration) []string { func collectEventsFor(ch <-chan []byte, d time.Duration) []string {
var out []string var out []string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment