forked from toolshed/abra
		
	fix: warn if secrets still exist
This commit is contained in:
		@ -140,7 +140,12 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 | 
				
			|||||||
					return
 | 
										return
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
 | 
									if err := client.StoreSecret(secretRemoteName, passwords[0], server); err != nil {
 | 
				
			||||||
 | 
										if strings.Contains(err.Error(), "AlreadyExists") {
 | 
				
			||||||
 | 
											logrus.Warnf("%s already exists, moving on...", secretRemoteName)
 | 
				
			||||||
 | 
											ch <- nil
 | 
				
			||||||
 | 
										} else {
 | 
				
			||||||
						ch <- err
 | 
											ch <- err
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
					return
 | 
										return
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				secrets[secretName] = passwords[0]
 | 
									secrets[secretName] = passwords[0]
 | 
				
			||||||
@ -151,8 +156,14 @@ func GenerateSecrets(secretEnvVars map[string]string, appName, server string) (m
 | 
				
			|||||||
					return
 | 
										return
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
 | 
									if err := client.StoreSecret(secretRemoteName, passphrases[0], server); err != nil {
 | 
				
			||||||
 | 
										if strings.Contains(err.Error(), "AlreadyExists") {
 | 
				
			||||||
 | 
											logrus.Warnf("%s already exists, moving on...", secretRemoteName)
 | 
				
			||||||
 | 
											ch <- nil
 | 
				
			||||||
 | 
										} else {
 | 
				
			||||||
						ch <- err
 | 
											ch <- err
 | 
				
			||||||
					}
 | 
										}
 | 
				
			||||||
 | 
										return
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
				secrets[secretName] = passphrases[0]
 | 
									secrets[secretName] = passphrases[0]
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			ch <- nil
 | 
								ch <- nil
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user