fix agent code review

BuildGuide.md

@@ -98,10 +98,6 @@
       ```
       rm -rf ~/.stack/setup-exe-src/
       ```
-   1. Re-make the agent
-      ```
-      make agent
-      ```
 
 6. Install requirements for step 7
    1. Install NVM

agent/config/settings.yml

@@ -33,5 +33,5 @@ database:
   database: "start9_agent.sqlite3"
   poolsize: "_env:YESOD_SQLITE_POOLSIZE:10"
 
-app-mgr-version-spec: "=0.2.15"
+app-mgr-version-spec: "=0.2.14"
 #analytics: UA-YOURCODE

agent/migrations/0.2.14::0.2.15

@@ -1 +0,0 @@
-SELECT TRUE;

agent/package.yaml

@@ -1,5 +1,5 @@
 name: ambassador-agent
-version: 0.2.15
+version: 0.2.14
 
 default-extensions:
   - NoImplicitPrelude

agent/src/Lib/Synchronizers.hs

@@ -102,12 +102,12 @@ parseKernelVersion = do
     pure $ KernelVersion (Version (major', minor', patch', 0)) arch
 
 synchronizer :: Synchronizer
-synchronizer = sync_0_2_15
+synchronizer = sync_0_2_14
 {-# INLINE synchronizer #-}
 
-sync_0_2_15 :: Synchronizer
-sync_0_2_15 = Synchronizer
-    "0.2.15"
+sync_0_2_14 :: Synchronizer
+sync_0_2_14 = Synchronizer
+    "0.2.14"
     [ syncCreateAgentTmp
     , syncCreateSshDir
     , syncRemoveAvahiSystemdDependency
@@ -592,6 +592,8 @@ syncUpgradeTor :: SyncOp
 syncUpgradeTor = SyncOp "Install Latest Tor" check migrate False
     where
         check = run $ do
+            shell "apt-get clean"
+            shell "apt-get update"
             mTorVersion <- (shell "dpkg -s tor" $| shell "grep '^Version'" $| shell "cut -d ' ' -f2" $| conduit await)
             let torVersion = case mTorVersion of
                     Nothing -> panic "invalid output from dpkg, can't read tor version"

appmgr/Cargo.lock

@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "addr2line"
 version = "0.14.1"
@@ -43,7 +41,7 @@ checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
 
 [[package]]
 name = "appmgr"
-version = "0.2.15"
+version = "0.2.14"
 dependencies = [
  "async-trait",
  "avahi-sys",

appmgr/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Aiden McClelland <me@drbonez.dev>"]
 edition = "2018"
 name = "appmgr"
-version = "0.2.15"
+version = "0.2.14"
 
 [lib]
 name = "appmgrlib"

appmgr/src/version/mod.rs

@@ -31,9 +31,8 @@ mod v0_2_11;
 mod v0_2_12;
 mod v0_2_13;
 mod v0_2_14;
-mod v0_2_15;
 
-pub use v0_2_15::Version as Current;
+pub use v0_2_14::Version as Current;
 
 #[derive(serde::Serialize, serde::Deserialize)]
 #[serde(untagged)]
@@ -60,7 +59,6 @@ enum Version {
     V0_2_12(Wrapper<v0_2_12::Version>),
     V0_2_13(Wrapper<v0_2_13::Version>),
     V0_2_14(Wrapper<v0_2_14::Version>),
-    V0_2_15(Wrapper<v0_2_15::Version>),
     Other(emver::Version),
 }
 
@@ -177,7 +175,6 @@ pub async fn init() -> Result<(), failure::Error> {
             Version::V0_2_12(v) => v.0.migrate_to(&Current::new()).await?,
             Version::V0_2_13(v) => v.0.migrate_to(&Current::new()).await?,
             Version::V0_2_14(v) => v.0.migrate_to(&Current::new()).await?,
-            Version::V0_2_15(v) => v.0.migrate_to(&Current::new()).await?,
             Version::Other(_) => (),
             // TODO find some way to automate this?
         }
@@ -273,7 +270,6 @@ pub async fn self_update(requirement: emver::VersionRange) -> Result<(), Error>
         Version::V0_2_12(v) => Current::new().migrate_to(&v.0).await?,
         Version::V0_2_13(v) => Current::new().migrate_to(&v.0).await?,
         Version::V0_2_14(v) => Current::new().migrate_to(&v.0).await?,
-        Version::V0_2_15(v) => Current::new().migrate_to(&v.0).await?,
         Version::Other(_) => (),
         // TODO find some way to automate this?
     };

appmgr/src/version/v0_2_15.rs

@@ -1,21 +0,0 @@
-use super::*;
-
-const V0_2_15: emver::Version = emver::Version::new(0, 2, 15, 0);
-
-pub struct Version;
-#[async_trait]
-impl VersionT for Version {
-    type Previous = v0_2_14::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> &'static emver::Version {
-        &V0_2_15
-    }
-    async fn up(&self) -> Result<(), Error> {
-        Ok(())
-    }
-    async fn down(&self) -> Result<(), Error> {
-        Ok(())
-    }
-}

ui/client-manifest.yaml

@@ -1,6 +1,6 @@
 manifest-version: 0
 app-id: start9-ambassador
-app-version: 0.2.15
+app-version: 0.2.14
 uri-rewrites:
     - =/api -> http://{{start9-ambassador}}:5959/authenticate
     - /api/ -> http://{{start9-ambassador}}:5959/

ui/package-lock.json

@@ -322,12 +322,6 @@
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         },
-        "typescript": {
-          "version": "4.0.5",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
-          "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
-          "dev": true
-        },
         "webpack-sources": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.0.1.tgz",

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "embassy-ui",
-  "version": "0.2.15",
+  "version": "0.2.14",
   "description": "GUI for EmbassyOS",
   "author": "Start9 Labs",
   "homepage": "https://github.com/Start9Labs/embassy-ui",
@@ -53,7 +53,7 @@
     "@types/marked": "^1.1.0",
     "@types/node": "^14.11.10",
     "@types/uuid": "^8.0.0",
-    "node-html-parser": "2.0.0",
+    "node-html-parser": "^2.0.0",
     "ts-node": "^9.1.0",
     "tslint": "^6.1.0",
     "typescript": "4.0.5"

ui/src/app/app-config/config-cursor.ts

@@ -298,7 +298,6 @@ export class ConfigCursor<T extends ValueType> {
     const mappedCfg = this.mappedConfig()
     if (cfg && mappedCfg && typeof cfg === 'object' && typeof mappedCfg === 'object') {
       const spec = this.spec()
-      if (spec === undefined) return true
       let allKeys: Set<string>
       if (spec.type === 'union') {
         let unionSpec = spec as  ValueSpecOf<'union'>
@@ -483,4 +482,4 @@ export function displayUniqueBy(uniqueBy: UniqueBy, spec: ValueSpecObject | Valu
       }
     }).join(' or ')
   }
-}
+}

ui/src/app/modals/os-welcome/os-welcome.page.html

@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-title >
-      <ion-label style="font-size: 20px;" class="ion-text-wrap">Welcome to 0.2.15!</ion-label>
+      <ion-label style="font-size: 20px;" class="ion-text-wrap">Welcome to 0.2.14!</ion-label>
     </ion-title>
   </ion-toolbar>
 </ion-header>
@@ -10,7 +10,7 @@
   <div style="display: flex; flex-direction: column; justify-content: space-between; height: 100%">
     <h2>Highlights</h2>
     <div class="main-content">
-      <p>This release fixes the occasional error of "'apt-get update' returned a failure exit code: 100"</p>
+      <p>This release contains an important security patch to the tor binaries</p>
     </div>
 
     <div class="close-button">

ui/src/app/services/api/mock-api.service.ts

@@ -499,8 +499,8 @@ const mockApiNotifications: ReqRes.GetNotificationsRes = [
 const mockApiServer: () => ReqRes.GetServerRes = () => ({
   serverId: 'start9-mockxyzab',
   name: 'Embassy:12345678',
-  versionInstalled: '0.2.15',
-  versionLatest: '0.2.15',
+  versionInstalled: '0.2.14',
+  versionLatest: '0.2.14',
   status: ServerStatus.RUNNING,
   alternativeRegistryUrl: 'beta-registry.start9labs.com',
   welcomeAck: true,