Merge branch 'main' into fix-web/metadata-from-table

reearth · Oct 24, 2024 · 6238c11 · 6238c11
2 parents f0547cf + 20b14e6
commit 6238c11
Show file tree

Hide file tree

Showing 60 changed files with 2,066 additions and 1,363 deletions.
diff --git a/.github/workflows/decompressor_build.yml → .github/workflows/build_decompressor.yml b/.github/workflows/decompressor_build.yml → .github/workflows/build_decompressor.yml
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
@@ -1,9 +1,8 @@
 name: server-build
 on:
-  workflow_run:
-    workflows: [ci-server]
-    types: [completed]
+  push:
     branches: [main, release]
+    paths: [server/**, .github/workflows/build_server.yml]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
@@ -27,7 +26,7 @@ jobs:
         id: info
         # The tag name should be retrieved lazily, as tagging may be delayed.
         env:
-          BRANCH: ${{ github.event.workflow_run.head_branch }}
+          BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
           if [[ "$BRANCH" = "release" ]]; then

diff --git a/.github/workflows/web_build.yml → .github/workflows/build_web.yml b/.github/workflows/web_build.yml → .github/workflows/build_web.yml
@@ -1,9 +1,8 @@
 name: web-build
 on:
-  workflow_run:
-    workflows: [ci-web]
-    types: [completed]
-    branches: [main, release]
+  push:
+    branches: [ main, release ]
+    paths: [ web/**, .github/workflows/build_web.yml ]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true

diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
@@ -1,9 +1,8 @@
 name: worker-build
 on:
-  workflow_run:
-    workflows: [ci-worker]
-    types: [completed]
+  push:
     branches: [main, release]
+    paths: [worker/**, .github/workflows/build_worker.yml]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: |
-            web
+            web/**
             .github/workflows/ci.yml
             .github/workflows/ci_web.yml
 
@@ -27,7 +27,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: |
-            server
+            server/**
             .github/workflows/ci.yml
             .github/workflows/ci_server.yml
             .github/workflows/build_server.yml
@@ -37,7 +37,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: |
-            worker
+            worker/**
             .github/workflows/ci.yml
             .github/workflows/ci_worker.yml
             .github/workflows/build_worker.yml

diff --git a/.github/workflows/ci_server.yml b/.github/workflows/ci_server.yml
@@ -15,6 +15,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: server/go.mod
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
@@ -35,6 +36,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: server/go.mod
       - name: check forgotten translations
         working-directory: server
         run: make i18n-ci
@@ -53,6 +55,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: server/go.mod
       - name: test
         run: go test ./... -v -race -coverprofile=coverage.txt -covermode=atomic -timeout 10m
         working-directory: server

diff --git a/.github/workflows/ci_worker.yml b/.github/workflows/ci_worker.yml
@@ -14,6 +14,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: worker/go.mod
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
@@ -36,6 +37,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: worker/go.mod
       - name: test
         run: go test ./... -v -race -coverprofile=coverage.txt -covermode=atomic -timeout 10m
         working-directory: worker

diff --git a/.github/workflows/cron_ion_token_test.yml b/.github/workflows/cron_ion_token_test.yml
@@ -4,19 +4,20 @@ on:
     - cron: "0 0 2 * *"
   workflow_dispatch:
 env:
-  GCS_DOMAIN: gs://cms.test.reearth.dev
-  REEARTH_CONFIG_FILENAME: reearth_config.json
+  CMS_WEB: reearth-cms-web
+  REGION: us-central1
 jobs:
   update_ion_token:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read # To checkout
+      id-token: write # To authenticate with Google Cloud using OIDC
     steps:
+      - uses: actions/checkout@v4
       - uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2
-      - name: Download reearth config
-        run: gsutil cp "${{ env.GCS_DOMAIN }}/${{ env.REEARTH_CONFIG_FILENAME }}" .
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER}}
       - name: Get Cesium Ion token
         id: ion_token
         run: |
@@ -35,9 +36,9 @@ jobs:
           " \
           )
           echo "token=${ION_TOKEN}" >> $GITHUB_OUTPUT
-      - name: Update Ion token in reearth config
+      - name: Update Cloud Run
         run: |
-          echo $(cat ${{ env.REEARTH_CONFIG_FILENAME }} | jq -r '.cesiumIonAccessToken |= "${{ steps.ion_token.outputs.token }}"') > ${{ env.REEARTH_CONFIG_FILENAME }}
-          echo $(cat ${{ env.REEARTH_CONFIG_FILENAME }})
-      - name: Upload reearth config
-        run: gsutil -h "Cache-Control:no-store" cp reearth_config.json "${{ env.GCS_DOMAIN }}/${{ env.REEARTH_CONFIG_FILENAME }}"
+          gcloud run services update $CMS_WEB \
+            --update-env-vars REEARTH_CMS_CESIUM_ION_ACCESS_TOKEN=${{ steps.ion_token.outputs.token }} \
+            --region $REGION \
+            --platform managed
diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
@@ -34,6 +34,9 @@ jobs:
     name: Deploy web to test env
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'ci-web' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
     runs-on: ubuntu-latest
+    permissions:
+      contents: read # To checkout
+      id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/create-github-app-token@v1
         id: app-token
@@ -55,7 +58,8 @@ jobs:
         run: tar -xvf reearth-cms-web.tar.gz
       - uses: google-github-actions/auth@v2
         with:
-          credentials_json: "${{ secrets.GCP_SA_KEY }}"
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v2
       - name: Deploy
@@ -65,12 +69,16 @@ jobs:
     name: Deploy server to test env
     runs-on: ubuntu-latest
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'server-build' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
+    permissions:
+      contents: read # To checkout
+      id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/checkout@v4
 
       - uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v2
       - name: Configure docker
@@ -92,12 +100,16 @@ jobs:
     name: Deploy web to test env
     runs-on: ubuntu-latest
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'web-build' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
+    permissions:
+      contents: read # To checkout
+      id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/checkout@v4
 
       - uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v2
       - name: Configure docker
@@ -119,12 +131,16 @@ jobs:
     name: Deploy worker to test env
     runs-on: ubuntu-latest
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'worker-build' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
+    permissions:
+      contents: read # To checkout
+      id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/checkout@v4
 
       - uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCP_SA_KEY }}
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v2
       - name: Configure docker

diff --git a/server/e2e/gql_field_test.go b/server/e2e/gql_field_test.go
@@ -134,6 +134,7 @@ type fIds struct {
 	boolFId           string
 	selectFId         string
 	integerFId        string
+	numberFId         string
 	urlFId            string
 	dateFId           string
 	tagFID            string
@@ -192,6 +193,16 @@ func createFieldOfEachType(t *testing.T, e *httpexpect.Expect, mId string) fIds
 			},
 		})
 
+	numberFId, _ := createField(e, mId, "number", "number", "number",
+		false, false, false, false, "Number",
+		map[string]any{
+			"number": map[string]any{
+				"defaultValue": nil,
+				"min":          nil,
+				"max":          nil,
+			},
+		})
+
 	urlFId, _ := createField(e, mId, "url", "url", "url",
 		false, false, false, false, "URL",
 		map[string]any{
@@ -260,6 +271,7 @@ func createFieldOfEachType(t *testing.T, e *httpexpect.Expect, mId string) fIds
 		boolFId,
 		selectFId,
 		integerFId,
+		numberFId,
 		urlFId,
 		dateFId,
 		tagFId,
@@ -276,6 +288,7 @@ func createFieldOfEachType(t *testing.T, e *httpexpect.Expect, mId string) fIds
 		boolFId:           boolFId,
 		selectFId:         selectFId,
 		integerFId:        integerFId,
+		numberFId:         numberFId,
 		urlFId:            urlFId,
 		dateFId:           dateFId,
 		tagFID:            tagFId,

diff --git a/server/e2e/gql_item_test.go b/server/e2e/gql_item_test.go
@@ -412,7 +412,7 @@ func TestClearItemValues(t *testing.T) {
 	})
 	fields := r1.Path("$.data.createItem.item.fields[:].value").Raw().([]any)
 	assert.Equal(t, []any{
-		"Text", "TextArea", "MarkdownText", aid.String(), true, "s1", float64(1), "https://www.1s.com", "2023-01-01T00:00:00Z", tagIds[0], true, "{\n\t\"type\": \"Point\",\n\t\"coordinates\": [102.0, 0.5]\n}", "{\n\t\"type\": \"Point\",\n\t\"coordinates\": [102.0, 0.5]\n}",
+		"Text", "TextArea", "MarkdownText", aid.String(), true, "s1", float64(1), nil, "https://www.1s.com", "2023-01-01T00:00:00Z", tagIds[0], true, "{\n\t\"type\": \"Point\",\n\t\"coordinates\": [102.0, 0.5]\n}", "{\n\t\"type\": \"Point\",\n\t\"coordinates\": [102.0, 0.5]\n}",
 	}, fields)
 	i1ver, _ := getItem(e, iid)
 	_, r2 := updateItem(e, iid, i1ver, []map[string]any{
@@ -432,7 +432,7 @@ func TestClearItemValues(t *testing.T) {
 	})
 	fields = r2.Path("$.data.updateItem.item.fields[:].value").Raw().([]any)
 	assert.Equal(t, []any{
-		nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
+		nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
 	}, fields)
 
 	iid2, _ := createItem(e, mId, sId, nil, []map[string]any{
@@ -453,7 +453,7 @@ func TestClearItemValues(t *testing.T) {
 	_, r3 := getItem(e, iid2)
 	fields2 := r3.Path("$.data.node.fields[:].value").Raw().([]any)
 	assert.Equal(t, []any{
-		nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
+		nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
 	}, fields2)
 
 }

diff --git a/server/e2e/integration_item_test.go b/server/e2e/integration_item_test.go
@@ -1450,7 +1450,7 @@ func TestIntegrationModelImportJSONWithJsonInput(t *testing.T) {
 	mId, _ := createModel(e, pId, "test", "test", "test-1")
 	createFieldOfEachType(t, e, mId)
 
-	jsonContent := `[{"text": "test1", "bool": true, "integer": 1},{"text": "test2", "bool": false, "integer": 2},{"text": "test3", "bool": null, "integer": null}]`
+	jsonContent := `[{"text": "test1", "bool": true, "number": 1.1},{"text": "test2", "bool": false, "number": 2},{"text": "test3", "bool": null, "number": null}]`
 	aId := UploadAsset(e, pId, "./test1.json", jsonContent).Object().Value("id").String().Raw()
 	res := IntegrationModelImportJSON(e, mId, aId, "json", "insert", false, nil)
 	res.Object().IsEqual(map[string]any{
@@ -1573,7 +1573,7 @@ func TestIntegrationItemsAsCSV(t *testing.T) {
 	})
 
 	res := IntegrationItemsAsCSV(e, mId, 1, 10, i1Id, "", "", nil)
-	expected := fmt.Sprintf("id,location_lat,location_lng,text,textArea,markdown,asset,bool,select,integer,url,date,tag,checkbox\n%s,139.28179282584915,36.58570985749664,test1,,,,,,,,,,\n", i1Id)
+	expected := fmt.Sprintf("id,location_lat,location_lng,text,textArea,markdown,asset,bool,select,integer,number,url,date,tag,checkbox\n%s,139.28179282584915,36.58570985749664,test1,,,,,,,,,,,\n", i1Id)
 	res.IsEqual(expected)
 }
 
@@ -1593,7 +1593,7 @@ func TestIntegrationItemsWithProjectAsCSV(t *testing.T) {
 	})
 
 	res := IntegrationItemsWithProjectAsCSV(e, pId, mId, 1, 10, i1Id, "", "", nil)
-	expected := fmt.Sprintf("id,location_lat,location_lng,text,textArea,markdown,asset,bool,select,integer,url,date,tag,checkbox\n%s,139.28179282584915,36.58570985749664,test1,,,,,,30,,,,\n", i1Id)
+	expected := fmt.Sprintf("id,location_lat,location_lng,text,textArea,markdown,asset,bool,select,integer,number,url,date,tag,checkbox\n%s,139.28179282584915,36.58570985749664,test1,,,,,,30,,,,,\n", i1Id)
 	res.IsEqual(expected)
 }