Skip to content

Commit

Permalink
fix: Mask sensitive values in log (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
adityachoudhari26 authored Jun 27, 2024
1 parent a5d4ed8 commit 514336d
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
4 changes: 2 additions & 2 deletions controllers/weightsandbiases_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ func (r *WeightsAndBiasesReconciler) Reconcile(ctx context.Context, req ctrl.Req
desiredSpec.Merge(deployerSpec)
desiredSpec.Merge(operator.Defaults(wandb, r.Scheme))

log.Info("Desired spec", "spec", desiredSpec)
log.Info("Desired spec", "spec", desiredSpec.SensitiveValuesMasked())

hasNotBeenFlaggedForDeletion := wandb.ObjectMeta.DeletionTimestamp.IsZero()
if hasNotBeenFlaggedForDeletion {
if currentActiveSpec != nil {
log.Info("Active spec found", "spec", currentActiveSpec)
log.Info("Active spec found", "spec", currentActiveSpec.SensitiveValuesMasked())
if currentActiveSpec.IsEqual(desiredSpec) {
log.Info("No changes found")
statusManager.Set(status.Completed)
Expand Down
35 changes: 35 additions & 0 deletions pkg/wandb/spec/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,38 @@ func (s *Spec) Merge(spec *Spec) {
s.mergeConfig(spec.Values)
}
}

func (s *Spec) SensitiveValuesMasked() *Spec {
if s.Values != nil {
return &Spec{
Metadata: s.Metadata,
Chart: s.Chart,
Values: maskValues(s.Values),
}
}
return s
}

var sensitiveKeys = map[string]bool{
"secret": true,
"accessKey": true,
}

func maskValues(values map[string]interface{}) map[string]interface{} {
newValues := make(map[string]interface{})
for key, value := range values {
switch v := value.(type) {
case map[string]interface{}:
newValues[key] = maskValues(v)
case string:
if sensitiveKeys[key] {
newValues[key] = "***"
} else {
newValues[key] = value
}
default:
newValues[key] = value
}
}
return newValues
}

0 comments on commit 514336d

Please sign in to comment.