Merge pull request #218 from FleekHQ/develop

Release to master
FleekHQ · Oct 23, 2020 · d0233c3 · d0233c3
2 parents b2f00da + d3a5e44
commit d0233c3
Show file tree

Hide file tree

Showing 38 changed files with 1,885 additions and 1,983 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,6 +44,7 @@ jobs:
           echo "::set-output name=TXL_HUB_GATEWAY_URL::TXL_HUB_GATEWAY_URL_${STAGE}"
           echo "::set-output name=TXL_USER_KEY::TXL_USER_KEY_${STAGE}"
           echo "::set-output name=TXL_USER_SECRET::TXL_USER_SECRET_${STAGE}"
+          echo "::set-output name=SPACE_STORAGE_SITE_URL::SPACE_STORAGE_SITE_URL_${STAGE}"
       - name: Release via goreleaser
         uses: goreleaser/goreleaser-action@master
         with:
@@ -64,3 +65,4 @@ jobs:
           TXL_HUB_GATEWAY_URL: ${{ secrets[steps.secretnames.outputs.TXL_HUB_GATEWAY_URL] }}
           TXL_USER_KEY: ${{ secrets[steps.secretnames.outputs.TXL_USER_KEY] }}
           TXL_USER_SECRET: ${{ secrets[steps.secretnames.outputs.TXL_USER_SECRET] }}
+          SPACE_STORAGE_SITE_URL: ${{ secrets[steps.secretnames.outputs.SPACE_STORAGE_SITE_URL] }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -25,6 +25,7 @@ builds:
       - -X main.textilehubgatewayurl={{ .Env.TXL_HUB_GATEWAY_URL }}
       - -X main.textileuserkey={{ .Env.TXL_USER_KEY }}
       - -X main.textileusersecret={{ .Env.TXL_USER_SECRET }}
+      - -X main.spacestoragesiteurl={{ .Env.SPACE_STORAGE_SITE_URL }}
     main: ./cmd/space-daemon/main.go
     binary: space
     goos:
@@ -48,6 +49,7 @@ builds:
       - -X main.textilehubgatewayurl={{ .Env.TXL_HUB_GATEWAY_URL }}
       - -X main.textileuserkey={{ .Env.TXL_USER_KEY }}
       - -X main.textileusersecret={{ .Env.TXL_USER_SECRET }}
+      - -X main.spacestoragesiteurl={{ .Env.SPACE_STORAGE_SITE_URL }}
     main: ./cmd/space-daemon/main.go
     binary: space
     goos:
@@ -73,6 +75,7 @@ builds:
       - -X main.textilehubgatewayurl={{ .Env.TXL_HUB_GATEWAY_URL }}
       - -X main.textileuserkey={{ .Env.TXL_USER_KEY }}
       - -X main.textileusersecret={{ .Env.TXL_USER_SECRET }}
+      - -X main.spacestoragesiteurl={{ .Env.SPACE_STORAGE_SITE_URL }}
     main: ./cmd/space-daemon/main.go
     binary: space
     goos:

diff --git a/Makefile b/Makefile
@@ -7,6 +7,7 @@ build:
 	-X 'main.mongousr=${MONGO_USR}' \
 	-X 'main.mongopw=${MONGO_PW}' \
 	-X 'main.spaceapi=${SERVICES_API_URL}' \
+	-X 'main.spacestoragesiteurl=${SPACE_STORAGE_SITE_URL}' \
 	-X 'main.vaultapi=${VAULT_API_URL}' \
 	-X 'main.vaultsaltsecret=${VAULT_SALT_SECRET}' \
 	-X 'main.spacehubauth=${SERVICES_HUB_AUTH_URL}' \

diff --git a/cmd/space-daemon/main.go b/cmd/space-daemon/main.go
@@ -32,6 +32,7 @@ var (
 	mongohost            string
 	mongorepset          string
 	spaceapi             string
+	spacestoragesiteurl  string
 	vaultapi             string
 	vaultsaltsecret      string
 	spacehubauth         string
@@ -63,6 +64,7 @@ func main() {
 		Mongohost:            mongohost,
 		Mongorepset:          mongorepset,
 		ServicesAPIURL:       spaceapi,
+		SpaceStorageSiteUrl:  spacestoragesiteurl,
 		VaultAPIURL:          vaultapi,
 		VaultSaltSecret:      vaultsaltsecret,
 		ServicesHubAuthURL:   spacehubauth,

diff --git a/config/config.go b/config/config.go
@@ -9,6 +9,7 @@ const (
 	SpaceServerPort          = "space/rpcPort"
 	SpaceProxyServerPort     = "space/rpcProxyPort"
 	SpaceRestProxyServerPort = "space/restProxyPort"
+	SpaceStorageSiteUrl      = "space/storageSiteUrl"
 	SpaceStorePath           = "space/storePath"
 	TextileHubTarget         = "space/textileHubTarget"
 	TextileHubMa             = "space/textileHubMa"
@@ -50,6 +51,7 @@ type Flags struct {
 	Mongorepset          string
 	DevMode              bool
 	ServicesAPIURL       string
+	SpaceStorageSiteUrl  string
 	VaultAPIURL          string
 	VaultSaltSecret      string
 	ServicesHubAuthURL   string

diff --git a/config/map_config.go b/config/map_config.go
@@ -36,6 +36,7 @@ func NewMap(envVal env.SpaceEnv, flags *Flags) Config {
 		configStr[SpaceVaultAPIURL] = os.Getenv(env.VaultAPIURL)
 		configStr[SpaceVaultSaltSecret] = os.Getenv(env.VaultSaltSecret)
 		configStr[SpaceServicesHubAuthURL] = os.Getenv(env.ServicesHubAuthURL)
+		configStr[SpaceStorageSiteUrl] = os.Getenv(env.SpaceStorageSiteUrl)
 		configStr[TextileHubTarget] = os.Getenv(env.TextileHubTarget)
 		configStr[TextileHubMa] = os.Getenv(env.TextileHubMa)
 		configStr[TextileThreadsTarget] = os.Getenv(env.TextileThreadsTarget)
@@ -58,6 +59,9 @@ func NewMap(envVal env.SpaceEnv, flags *Flags) Config {
 		configStr[SpaceVaultAPIURL] = flags.VaultAPIURL
 		configStr[SpaceVaultSaltSecret] = flags.VaultSaltSecret
 		configStr[SpaceServicesHubAuthURL] = flags.ServicesHubAuthURL
+		if flags.SpaceStorageSiteUrl != "" {
+			configStr[SpaceStorageSiteUrl] = flags.SpaceStorageSiteUrl
+		}
 		configStr[TextileHubTarget] = flags.TextileHubTarget
 		configStr[TextileHubMa] = flags.TextileHubMa
 		configStr[TextileThreadsTarget] = flags.TextileThreadsTarget

diff --git a/core/env/env.go b/core/env/env.go
@@ -21,6 +21,7 @@ const (
 	VaultAPIURL          = "VAULT_API_URL"
 	VaultSaltSecret      = "VAULT_SALT_SECRET"
 	ServicesHubAuthURL   = "SERVICES_HUB_AUTH_URL"
+	SpaceStorageSiteUrl  = "SPACE_STORAGE_SITE_URL"
 	TextileHubTarget     = "TXL_HUB_TARGET"
 	TextileHubMa         = "TXL_HUB_MA"
 	TextileThreadsTarget = "TXL_THREADS_TARGET"

diff --git a/core/events/events.go b/core/events/events.go
@@ -15,6 +15,9 @@ const (
 	FileBackupInProgress FileEventType = "FileBackupInProgress"
 	FileBackupReady      FileEventType = "FileBackupReady"
 
+	FileRestored  FileEventType = "FileRestored"
+	FileRestoring FileEventType = "FileRestoring"
+
 	FolderAdded   FileEventType = "FolderAdded"
 	FolderDeleted FileEventType = "FolderDeleted"
 	// NOTE: not sure if this needs to be specific to rename or copy

diff --git a/core/space/domain/domain.go b/core/space/domain/domain.go
@@ -25,10 +25,11 @@ type ThreadInfo struct {
 
 type FileInfo struct {
 	DirEntry
-	IpfsHash         string
-	BackedUp         bool
-	LocallyAvailable bool
-	BackupInProgress bool
+	IpfsHash          string
+	BackedUp          bool
+	LocallyAvailable  bool
+	BackupInProgress  bool
+	RestoreInProgress bool
 }
 
 type OpenFileInfo struct {
@@ -152,11 +153,12 @@ type APISessionTokens struct {
 }
 
 type MirrorFile struct {
-	Path             string
-	BucketSlug       string
-	Backup           bool
-	Shared           bool
-	BackupInProgress bool
+	Path              string
+	BucketSlug        string
+	Backup            bool
+	Shared            bool
+	BackupInProgress  bool
+	RestoreInProgress bool
 }
 
 type SharedDirEntry struct {