Merge pull request #3150 from commercialhaskell/upload-cleanup

Upload cleanup, and save-hackage-creds option

Author: snoyberg

ChangeLog.md

@@ -48,6 +48,7 @@ Other enhancements:
   [Stackage no-revisions feature](http://www.snoyman.com/blog/2017/04/stackages-no-revisions-field)—as
   a method to ensure PVP compliance without having to proactively fix
   bounds issues for Stackage maintenance.
+* Expose a `save-hackage-creds` configuration option
 
 Bug fixes:
 

doc/yaml_configuration.md

@@ -739,6 +739,17 @@ in the directories it creates.  Source control tools can be specified with the
 templates:
   scm-init: git
 ```
+
+### save-hackage-creds
+
+Controls whether, when using `stack upload`, the user's Hackage
+username and password are stored in a local file. Default: true.
+
+```yaml
+save-hackage-creds: true
+```
+
+Since 1.5.0
 
 # urls
 

src/Stack/Config.hs

@@ -386,6 +386,7 @@ configFromConfigMonoid
          configAllowNewer = fromFirst False configMonoidAllowNewer
          configDefaultTemplate = getFirst configMonoidDefaultTemplate
          configDumpLogs = fromFirst DumpWarningLogs configMonoidDumpLogs
+         configSaveHackageCreds = fromFirst True configMonoidSaveHackageCreds
 
      configAllowDifferentUser <-
         case getFirst configMonoidAllowDifferentUser of

src/Stack/Types/Config.hs

@@ -372,6 +372,8 @@ data Config =
          ,configAllowLocals         :: !Bool
          -- ^ Are we allowed to build local packages? The script
          -- command disallows this.
+         ,configSaveHackageCreds    :: !Bool
+         -- ^ Should we save Hackage credentials to a file?
          }
 
 -- | Which packages do ghc-options on the command line apply to?
@@ -785,6 +787,8 @@ data ConfigMonoid =
     -- installation.
     , configMonoidDumpLogs           :: !(First DumpLogs)
     -- ^ See 'configDumpLogs'
+    , configMonoidSaveHackageCreds   :: !(First Bool)
+    -- ^ See 'configSaveHackageCreds'
     }
   deriving (Show, Generic)
 
@@ -856,6 +860,7 @@ parseConfigMonoidObject rootDir obj = do
     configMonoidDefaultTemplate <- First <$> obj ..:? configMonoidDefaultTemplateName
     configMonoidAllowDifferentUser <- First <$> obj ..:? configMonoidAllowDifferentUserName
     configMonoidDumpLogs <- First <$> obj ..:? configMonoidDumpLogsName
+    configMonoidSaveHackageCreds <- First <$> obj ..:? configMonoidSaveHackageCredsName
 
     return ConfigMonoid {..}
   where
@@ -989,6 +994,9 @@ configMonoidAllowDifferentUserName = "allow-different-user"
 configMonoidDumpLogsName :: Text
 configMonoidDumpLogsName = "dump-logs"
 
+configMonoidSaveHackageCredsName :: Text
+configMonoidSaveHackageCredsName = "save-hackage-creds"
+
 data ConfigException
   = ParseConfigFileException (Path Abs File) ParseException
   | ParseCustomSnapshotException Text ParseException