fix linst test error

reearth · Feb 12, 2025 · d605405 · d605405
1 parent 33fef63
commit d605405
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/server/e2e/gql_asset_test.go b/server/e2e/gql_asset_test.go
@@ -116,7 +116,7 @@ func TestCoreSupportGetAssets(t *testing.T) {
 		}.Wrap(),
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, len(as), 3)
+	assert.Equal(t, len(as), 4)
 
 	res = getAssets(e, teamId, nil)
 	assets := res.Path("$.data.assets.nodes").Array().Iter()
@@ -163,7 +163,7 @@ func TestAssociateProjectGetAssets(t *testing.T) {
 	// Get none project(Workspace) >>> test.png, test.csv
 	res = getAssets(e, teamId, nil)
 	assets = res.Path("$.data.assets.nodes").Array()
-	assets.Length().IsEqual(2)
+	assets.Length().IsEqual(3)
 	assets.Value(0).Object().HasValue("name", "test.csv")
 	assets.Value(1).Object().HasValue("name", "test.png")
 
@@ -190,7 +190,7 @@ func TestAssociateProjectGetAssets(t *testing.T) {
 
 	res = getAssets(e, teamId, nil)
 	assets = res.Path("$.data.assets.nodes").Array()
-	assets.Length().IsEqual(0)
+	assets.Length().IsEqual(1)
 }
 
 const CreateAssetMutation = `mutation CreateAsset($teamId: ID!, $projectId: ID, $file: Upload!, $coreSupport: Boolean!) {

diff --git a/server/go.mod b/server/go.mod
@@ -24,7 +24,6 @@ require (
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/labstack/echo/v4 v4.13.3
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/oklog/ulid v1.3.1
 	github.com/pkg/errors v0.9.1
 	github.com/ravilushqa/otelgqlgen v0.17.0
 	github.com/reearth/orb v0.0.0-20250123044717-f6f70ce16355
@@ -131,6 +130,7 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

diff --git a/server/internal/infrastructure/fs/file.go b/server/internal/infrastructure/fs/file.go
@@ -110,7 +110,7 @@ func (f *fileRepo) RemoveAsset(ctx context.Context, u *url.URL) error {
 		return nil
 	}
 	p := sanitize.Path(u.Path)
-	if p == "" || f.urlBase == nil || u.Scheme != f.urlBase.Scheme || u.Host != f.urlBase.Host || path.Dir(p) != f.urlBase.Path {
+	if p == "" || f.urlBase == nil || u.Scheme != f.urlBase.Scheme || u.Host != f.urlBase.Host || path.Dir(p) != filepath.Join(f.urlBase.Path, assetDir) {
 		return gateway.ErrInvalidFile
 	}
 	return f.delete(ctx, filepath.Join(assetDir, filepath.Base(p)))

diff --git a/server/internal/infrastructure/fs/file_test.go b/server/internal/infrastructure/fs/file_test.go
@@ -113,8 +113,8 @@ func TestFSFile_UploadAssetFromURL(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			testGCS.UploadTestData(srcBucket, tc.fileName)
 
-			fsBaseURL := "/assets"
-			newFileRepo, err := NewFile(mockFs(), fsBaseURL)
+			// fsBaseURL := "/assets"
+			newFileRepo, err := NewFile(mockFs(), "/")
 			assert.NoError(t, err)
 
 			srcURL, _ := url.Parse(fmt.Sprintf("%s/%s", tc.filePath, tc.fileName))
@@ -162,7 +162,7 @@ func TestFile_RemoveAsset(t *testing.T) {
 			t.Parallel()
 
 			fs := mockFs()
-			f, _ := NewFile(fs, "https://example.com/assets")
+			f, _ := NewFile(fs, "https://example.com/")
 
 			u, _ := url.Parse(tc.URL)
 			err := f.RemoveAsset(context.Background(), u)
@@ -313,7 +313,7 @@ func TestFile_RemoveBuiltScene(t *testing.T) {
 func TestGetAssetFileURL(t *testing.T) {
 	e, err := url.Parse("http://hoge.com/assets/xxx.yyy")
 	assert.NoError(t, err)
-	b, err := url.Parse("http://hoge.com/assets")
+	b, err := url.Parse("http://hoge.com/")
 	assert.NoError(t, err)
 	assert.Equal(t, e, getAssetFileURL(b, "xxx.yyy"))
 }