Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

release notes plumbing

Browse Source
This commit is contained in:
Keagan McClelland
2021-02-03 10:44:34 -07:00
committed by Aiden McClelland
parent 18df87b8f5
commit 44def3be85
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agent/src/Handler/Status.hs
View File

@@ -40,8 +40,7 @@ getVersionR = pure . AppVersionRes $ agentVersion
getVersionLatestR :: Handler VersionLatestRes getVersionLatestR :: Handler VersionLatestRes
getVersionLatestR = handleS9ErrT $ do getVersionLatestR = handleS9ErrT $ do
s <- getsYesod appSettings s <- getsYesod appSettings
v <- interp s $ Reg.getLatestAgentVersion uncurry VersionLatestRes <$> interp s Reg.getLatestAgentVersion
pure $ VersionLatestRes v
where interp s = ExceptT . liftIO . runError . injectFilesystemBaseFromContext s . runRegistryUrlIOC where interp s = ExceptT . liftIO . runError . injectFilesystemBaseFromContext s . runRegistryUrlIOC

13
agent/src/Handler/Types/V0/Base.hs
View File

@@ -15,11 +15,13 @@ import Lib.Types.Emver
import Model import Model
data VersionLatestRes = VersionLatestRes data VersionLatestRes = VersionLatestRes
{ versionLatestVersion :: Version { versionLatestVersion :: Version
, versionLatestReleaseNotes :: Maybe Text
} }
deriving (Eq, Show) deriving (Eq, Show)
instance ToJSON VersionLatestRes where instance ToJSON VersionLatestRes where
toJSON VersionLatestRes {..} = object $ ["versionLatest" .= versionLatestVersion] toJSON VersionLatestRes {..} =
object $ ["versionLatest" .= versionLatestVersion, "releaseNotes" .= versionLatestReleaseNotes]
instance ToTypedContent VersionLatestRes where instance ToTypedContent VersionLatestRes where
toTypedContent = toTypedContent . toJSON toTypedContent = toTypedContent . toJSON
instance ToContent VersionLatestRes where instance ToContent VersionLatestRes where
@@ -31,14 +33,15 @@ data ServerRes = ServerRes
, serverStatus :: Maybe AppStatus , serverStatus :: Maybe AppStatus
, serverStatusAt :: UTCTime , serverStatusAt :: UTCTime
, serverVersionInstalled :: Version , serverVersionInstalled :: Version
, serverNotifications :: [ Entity Notification ] , serverNotifications :: [Entity Notification]
, serverWifi :: WifiList , serverWifi :: WifiList
, serverSsh :: [ SshKeyFingerprint ] , serverSsh :: [SshKeyFingerprint]
, serverAlternativeRegistryUrl :: Maybe Text , serverAlternativeRegistryUrl :: Maybe Text
, serverSpecs :: SpecsRes , serverSpecs :: SpecsRes
, serverWelcomeAck :: Bool , serverWelcomeAck :: Bool
, serverAutoCheckUpdates :: Bool , serverAutoCheckUpdates :: Bool
} deriving (Eq, Show) }
deriving (Eq, Show)
type JsonEncoding a = Encoding type JsonEncoding a = Encoding
jsonEncode :: (Monad m, ToJSON a) => a -> m (JsonEncoding a) jsonEncode :: (Monad m, ToJSON a) => a -> m (JsonEncoding a)

7
agent/src/Lib/External/Registry.hs vendored
View File

@@ -150,12 +150,13 @@ getAppVersionForSpec appId spec = do
v <- o .: "version" v <- o .: "version"
pure v pure v
getLatestAgentVersion :: (Has RegistryUrl sig m, Has (Error S9Error) sig m, MonadIO m) => m Version getLatestAgentVersion :: (Has RegistryUrl sig m, Has (Error S9Error) sig m, MonadIO m) => m (Version, Maybe Text)
getLatestAgentVersion = do getLatestAgentVersion = do
val <- registryRequest agentVersionPath val <- registryRequest agentVersionPath
parseOrThrow agentVersionPath val $ withObject "version response" $ \o -> do parseOrThrow agentVersionPath val $ withObject "version response" $ \o -> do
v <- o .: "version" v <- o .: "version"
pure v rn <- o .:? "release-notes"
pure (v, rn)
where agentVersionPath = "sys/version/agent" where agentVersionPath = "sys/version/agent"
getLatestAgentVersionForSpec :: (Has RegistryUrl sig m, Has (Lift IO) sig m, Has (Error S9Error) sig m) getLatestAgentVersionForSpec :: (Has RegistryUrl sig m, Has (Lift IO) sig m, Has (Error S9Error) sig m)

4
agent/src/Lib/Synchronizers.hs
View File

@@ -480,7 +480,7 @@ replaceDerivativeCerts :: (HasFilesystemBase sig m, Fused.Has (Error S9Error) si
replaceDerivativeCerts = do replaceDerivativeCerts = do
sid <- getStart9AgentHostname sid <- getStart9AgentHostname
let hostname = sid <> ".local" let hostname = sid <> ".local"
tor <- getAgentHiddenServiceUrl torAddr <- getAgentHiddenServiceUrl
caKeyPath <- toS <$> getAbsoluteLocationFor rootCaKeyPath caKeyPath <- toS <$> getAbsoluteLocationFor rootCaKeyPath
caConfPath <- toS <$> getAbsoluteLocationFor rootCaOpenSslConfPath caConfPath <- toS <$> getAbsoluteLocationFor rootCaOpenSslConfPath
@@ -531,7 +531,7 @@ replaceDerivativeCerts = do
, duration = 365 , duration = 365
} }
hostname hostname
tor torAddr
liftIO $ do liftIO $ do
putStrLn @Text "openssl logs" putStrLn @Text "openssl logs"
putStrLn @Text "exit code: " putStrLn @Text "exit code: "

4
agent/src/Lib/Tor.hs
View File

@@ -7,9 +7,7 @@ import Network.HTTP.Client
import Network.Connection import Network.Connection
import Lib.SystemPaths import Lib.SystemPaths
import Network.HTTP.Client.TLS ( mkManagerSettings import Network.HTTP.Client.TLS ( mkManagerSettings )
, newTlsManagerWith
)
import Data.Default import Data.Default
getAgentHiddenServiceUrl :: (HasFilesystemBase sig m, MonadIO m) => m Text getAgentHiddenServiceUrl :: (HasFilesystemBase sig m, MonadIO m) => m Text