Use `Path` again instead of `DiskPath`allow-pages-to-use-zip

4 files changed, 46 insertions, 46 deletions

diff --git a/internal/client/lookup_path.go b/internal/client/lookup_path.go
index a4a8b110..15f2d1a8 100644
--- a/internal/client/lookup_path.go
+++ b/internal/client/lookup_path.go
@@ -8,10 +8,10 @@ import (
 // and actual data on disk
 type LookupPath struct {
 	Prefix      string `json:"prefix"`
-	DiskPath    string `json:"disk_path"`
+	Path        string `json:"disk_path"`
 	ArchivePath string `json:"archive_path"`
 
-	NamespaceProject bool   `mock_api.go:8json:"namespace_project"`
+	NamespaceProject bool   `json:"namespace_project"`
 	HTTPSOnly        bool   `json:"https_only"`
 	AccessControl    bool   `json:"access_control"`
 	ProjectID        uint64 `json:"id"`
diff --git a/internal/client/mock_api.go b/internal/client/mock_api.go
index eed04fd0..cbea8a81 100644
--- a/internal/client/mock_api.go
+++ b/internal/client/mock_api.go
@@ -5,7 +5,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/project.internal/",
-				DiskPath: "group.internal/project.internal/public",
+				Path: "group.internal/project.internal/public",
 			},
 		},
 	},
@@ -13,23 +13,23 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/project.no.404/",
-				DiskPath: "group.404/project.no.404/public/",
+				Path: "group.404/project.no.404/public/",
 			},
 			LookupPath{
 				Prefix:   "/project.404/",
-				DiskPath: "group.404/project.404/public/",
+				Path: "group.404/project.404/public/",
 			},
 			LookupPath{
 				Prefix:   "/project.404.symlink/",
-				DiskPath: "group.404/project.404.symlink/public/",
+				Path: "group.404/project.404.symlink/public/",
 			},
 			LookupPath{
 				Prefix:   "/domain.404/",
-				DiskPath: "group.404/domain.404/public/",
+				Path: "group.404/domain.404/public/",
 			},
 			LookupPath{
 				Prefix:   "/group.404.test.io/",
-				DiskPath: "group.404/group.404.test.io/public/",
+				Path: "group.404/group.404.test.io/public/",
 			},
 		},
 	},
@@ -37,11 +37,11 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/CapitalProject/",
-				DiskPath: "CapitalGroup/CapitalProject/public/",
+				Path: "CapitalGroup/CapitalProject/public/",
 			},
 			LookupPath{
 				Prefix:   "/project/",
-				DiskPath: "CapitalGroup/project/public/",
+				Path: "CapitalGroup/project/public/",
 			},
 		},
 	},
@@ -49,47 +49,47 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:        "/private.project/",
-				DiskPath:      "group.auth/private.project/public/",
+				Path:      "group.auth/private.project/public/",
 				AccessControl: true,
 				ProjectID:     1000,
 			},
 			LookupPath{
 				Prefix:        "/private.project.1/",
-				DiskPath:      "group.auth/private.project.1/public/",
+				Path:      "group.auth/private.project.1/public/",
 				AccessControl: true,
 				ProjectID:     2000,
 			},
 			LookupPath{
 				Prefix:        "/private.project.2/",
-				DiskPath:      "group.auth/private.project.2/public/",
+				Path:      "group.auth/private.project.2/public/",
 				AccessControl: true,
 				ProjectID:     3000,
 			},
 			LookupPath{
 				Prefix:        "/subgroup/private.project/",
-				DiskPath:      "group.auth/subgroup/private.project/public/",
+				Path:      "group.auth/subgroup/private.project/public/",
 				AccessControl: true,
 				ProjectID:     1001,
 			},
 			LookupPath{
 				Prefix:        "/subgroup/private.project.1/",
-				DiskPath:      "group.auth/subgroup/private.project.1/public/",
+				Path:      "group.auth/subgroup/private.project.1/public/",
 				AccessControl: true,
 				ProjectID:     2001,
 			},
 			LookupPath{
 				Prefix:        "/subgroup/private.project.2/",
-				DiskPath:      "group.auth/subgroup/private.project.2/public/",
+				Path:      "group.auth/subgroup/private.project.2/public/",
 				AccessControl: true,
 				ProjectID:     3001,
 			},
 			LookupPath{
 				Prefix:   "/group.auth.gitlab-example.com/",
-				DiskPath: "group.auth/group.auth.gitlab-example.com/public/",
+				Path: "group.auth/group.auth.gitlab-example.com/public/",
 			},
 			LookupPath{
 				Prefix:           "/",
-				DiskPath:         "group.auth/group.auth.gitlab-example.com/public/",
+				Path:         "group.auth/group.auth.gitlab-example.com/public/",
 				NamespaceProject: true,
 			},
 		},
@@ -98,29 +98,29 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:    "/project5/",
-				DiskPath:  "group.https-only/project5/public/",
+				Path:  "group.https-only/project5/public/",
 				HTTPSOnly: true,
 			},
 			LookupPath{
 				Prefix:   "/project4/",
-				DiskPath: "group.https-only/project4/public/",
+				Path: "group.https-only/project4/public/",
 			},
 			LookupPath{
 				Prefix:   "/project3/",
-				DiskPath: "group.https-only/project3/public/",
+				Path: "group.https-only/project3/public/",
 			},
 			LookupPath{
 				Prefix:   "/project2/",
-				DiskPath: "group.https-only/project2/public/",
+				Path: "group.https-only/project2/public/",
 			},
 			LookupPath{
 				Prefix:    "/project1/",
-				DiskPath:  "group.https-only/project1/public/",
+				Path:  "group.https-only/project1/public/",
 				HTTPSOnly: true,
 			},
 			LookupPath{
 				Prefix:           "/",
-				DiskPath:         "group.auth/group.auth.gitlab-example.com/public/",
+				Path:         "group.auth/group.auth.gitlab-example.com/public/",
 				NamespaceProject: true,
 			},
 		},
@@ -129,27 +129,27 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/CapitalProject/",
-				DiskPath: "group/CapitalProject/public/",
+				Path: "group/CapitalProject/public/",
 			},
 			LookupPath{
 				Prefix:   "/project/",
-				DiskPath: "group/project/public/",
+				Path: "group/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/project2/",
-				DiskPath: "group/project2/public/",
+				Path: "group/project2/public/",
 			},
 			LookupPath{
 				Prefix:   "/subgroup/project/",
-				DiskPath: "group/subgroup/project/public/",
+				Path: "group/subgroup/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/group.test.io/",
-				DiskPath: "group/group.test.io/public/",
+				Path: "group/group.test.io/public/",
 			},
 			LookupPath{
 				Prefix:           "/",
-				DiskPath:         "group/group.gitlab-example.com/public/",
+				Path:         "group/group.gitlab-example.com/public/",
 				NamespaceProject: true,
 			},
 		},
@@ -158,27 +158,27 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/sub1/sub2/sub3/sub4/sub5/project/",
-				DiskPath: "nested/sub1/sub2/sub3/sub4/sub5/project/public/",
+				Path: "nested/sub1/sub2/sub3/sub4/sub5/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/sub1/sub2/sub3/sub4/project/",
-				DiskPath: "nested/sub1/sub2/sub3/sub4/project/public/",
+				Path: "nested/sub1/sub2/sub3/sub4/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/sub1/sub2/sub3/project/",
-				DiskPath: "nested/sub1/sub2/sub3/project/public/",
+				Path: "nested/sub1/sub2/sub3/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/sub1/sub2/project/",
-				DiskPath: "nested/sub1/sub2/project/public/",
+				Path: "nested/sub1/sub2/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/sub1/project/",
-				DiskPath: "nested/sub1/project/public/",
+				Path: "nested/sub1/project/public/",
 			},
 			LookupPath{
 				Prefix:   "/project/",
-				DiskPath: "nested/project/public/",
+				Path: "nested/project/public/",
 			},
 		},
 	},
@@ -188,7 +188,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/",
-				DiskPath: "group.404/domain.404.com/public/",
+				Path: "group.404/domain.404.com/public/",
 			},
 		},
 	},
@@ -196,7 +196,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:        "/",
-				DiskPath:      "group.auth/private.project/public/",
+				Path:      "group.auth/private.project/public/",
 				AccessControl: true,
 				ProjectID:     1000,
 			},
@@ -206,7 +206,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:    "/",
-				DiskPath:  "group.https-only/project5/public/",
+				Path:  "group.https-only/project5/public/",
 				HTTPSOnly: false,
 			},
 		},
@@ -215,7 +215,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:    "/",
-				DiskPath:  "group.https-only/project4/public/",
+				Path:  "group.https-only/project4/public/",
 				HTTPSOnly: false,
 			},
 		},
@@ -224,7 +224,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:    "/",
-				DiskPath:  "group.https-only/project3/public/",
+				Path:  "group.https-only/project3/public/",
 				HTTPSOnly: true,
 			},
 		},
@@ -233,7 +233,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/",
-				DiskPath: "group/group.test.io/public/",
+				Path: "group/group.test.io/public/",
 			},
 		},
 	},
@@ -241,7 +241,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/",
-				DiskPath: "group/group.test.io/public/",
+				Path: "group/group.test.io/public/",
 			},
 		},
 	},
@@ -249,7 +249,7 @@ var internalConfigs = map[string]DomainResponse{
 		LookupPath: []LookupPath{
 			LookupPath{
 				Prefix:   "/",
-				DiskPath: "group/group.test.io/public/",
+				Path: "group/group.test.io/public/",
 			},
 		},
 		Certificate: "test",
diff --git a/internal/storage/file_system.go b/internal/storage/file_system.go
index 18a228a6..7df14cf4 100644
--- a/internal/storage/file_system.go
+++ b/internal/storage/file_system.go
@@ -16,7 +16,7 @@ type fileSystem struct {
 }
 
 func (f *fileSystem) rootPath() string {
-	fullPath, err := filepath.EvalSymlinks(filepath.Join(f.DiskPath))
+	fullPath, err := filepath.EvalSymlinks(filepath.Join(f.Path))
 	if err != nil {
 		return ""
 	}
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
index 5f767479..da84361c 100644
--- a/internal/storage/storage.go
+++ b/internal/storage/storage.go
@@ -27,7 +27,7 @@ type S interface {
 
 // New provides a compatible storage with lookupPath
 func New(lookupPath *client.LookupPath) (S, error) {
-	if lookupPath.DiskPath != "" {
+	if lookupPath.Path != "" {
 		return &fileSystem{lookupPath}, nil
 	} else if lookupPath.ArchivePath != "" {
 		return newZipStorage(lookupPath)