Attempt to fix post merge problems.

cli/app/new.go

@@ -193,7 +193,7 @@ func createSecrets(cl *dockerClient.Client, secretsConfig map[string]secret.Secr
 		sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
 	}
 
-	secrets, err := secret.GenerateSecrets(cl, secretsConfig, sanitisedAppName, internal.NewAppServer)
+	secrets, err := secret.GenerateSecrets(cl, secretsConfig, internal.NewAppServer)
 	if err != nil {
 		return nil, err
 	}

cli/app/secret.go

@@ -96,14 +96,11 @@ var appSecretGenerateCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 
-		if err := secret.EnsureSecretLengths(secretsConfig, internal.Domain, config.SanitiseAppName(app.Name)); err != nil {
+		if err := secret.EnsureSecretLengths(secrets, internal.Domain, config.SanitiseAppName(app.Name)); err != nil {
 			logrus.Fatal(err)
 		}
 
-		secretsToCreate := make(map[string]string)
+		if !allSecrets {
-		if allSecrets {
-			secretsToCreate = secretsConfig
-		} else {
 			secretName := c.Args().Get(1)
 			secretVersion := c.Args().Get(2)
 			s, ok := secrets[secretName]

pkg/secret/secret.go

@@ -283,7 +283,7 @@ func PollSecretsStatus(cl *dockerClient.Client, app config.App) (secretStatuses,
 	return secStats, nil
 }
 
-func EnsureSecretLengths(secrets map[string]string, domainName string, sanitisedAppName string) error {
+func EnsureSecretLengths(secrets map[string]Secret, domainName string, sanitisedAppName string) error {
 	if len(sanitisedAppName) > config.MAX_SANITISED_APP_NAME_LENGTH {
 		sanitisedAppName = sanitisedAppName[:config.MAX_SANITISED_APP_NAME_LENGTH]
 	}