Merge branch 'main' of ssh://github.com/reearth/reearth-cms into refa…

…ctor-server/geojson-csv-export
reearth · Oct 29, 2024 · 4adb3db · 4adb3db
2 parents f1a2dcf + 859fc79
commit 4adb3db
Show file tree

Hide file tree

Showing 104 changed files with 3,867 additions and 2,297 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_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/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.23.1
+go 1.23.2
 
 use (
 	./server