Merge pull request #2501 from dperny/redact-registry-auth

Redact registry auth token from swarm-rafttool
moby · Feb 12, 2018 · 2543c41 · 2543c41
2 parents 1a0c0d5 + 8fbde78
commit 2543c41
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/cmd/swarm-rafttool/dump.go b/cmd/swarm-rafttool/dump.go
@@ -118,10 +118,16 @@ func dumpWAL(swarmdir, unlockKey string, start, end uint64, redact bool) error {
 						case *api.StoreAction_Task:
 							if container := actype.Task.Spec.GetContainer(); container != nil {
 								container.Env = []string{"ENVVARS REDACTED"}
+								if container.PullOptions != nil {
+									container.PullOptions.RegistryAuth = "REDACTED"
+								}
 							}
 						case *api.StoreAction_Service:
 							if container := actype.Service.Spec.Task.GetContainer(); container != nil {
 								container.Env = []string{"ENVVARS REDACTED"}
+								if container.PullOptions != nil {
+									container.PullOptions.RegistryAuth = "REDACTED"
+								}
 							}
 						}
 					}
@@ -192,13 +198,15 @@ func dumpSnapshot(swarmdir, unlockKey string, redact bool) error {
 			if task != nil {
 				if container := task.Spec.GetContainer(); container != nil {
 					container.Env = []string{"ENVVARS REDACTED"}
+					container.PullOptions.RegistryAuth = "REDACTED"
 				}
 			}
 		}
 		for _, service := range s.Store.Services {
 			if service != nil {
 				if container := service.Spec.Task.GetContainer(); container != nil {
 					container.Env = []string{"ENVVARS REDACTED"}
+					container.PullOptions.RegistryAuth = "REDACTED"
 				}
 			}
 		}