Merge pull request #3515 from magda-io/issue/3513

#3513 Fixed Indexer reindex trigger job doesn't start
magda-io · Apr 12, 2024 · fe23739 · fe23739
2 parents 73f1763 + ffac866
commit fe23739
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 60 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,10 @@
 
 ## v3.0.1
 
+- #3513 Fixed Indexer reindex trigger job doesn't start
+
+## v3.0.1
+
 - #3511 fixed Map Preview doesn't select the default feature layer correctly when it's supplied via query parameter
 
 ## v3.0.0

diff --git a/deploy/helm/internal-charts/indexer/README.md b/deploy/helm/internal-charts/indexer/README.md
@@ -27,7 +27,7 @@ Kubernetes: `>= 1.21.0`
 | reindexJobImage.pullPolicy | string | `"IfNotPresent"` |  |
 | reindexJobImage.pullSecrets | bool | `false` |  |
 | reindexJobImage.repository | string | `"docker.io"` |  |
-| reindexJobImage.tag | string | `"14-alpine"` |  |
+| reindexJobImage.tag | string | `"18-alpine"` |  |
 | resources.limits.cpu | string | `"250m"` |  |
 | resources.requests.cpu | string | `"100m"` |  |
 | resources.requests.memory | string | `"250Mi"` |  |

diff --git a/deploy/helm/internal-charts/indexer/templates/configmap-reindex-trigger-script.yaml b/deploy/helm/internal-charts/indexer/templates/configmap-reindex-trigger-script.yaml
@@ -8,16 +8,17 @@ data:
     {
       "name": "reindex-trigger-script",
       "version": "1.0.0",
+      "type": "module",
       "main": "index.js",
       "dependencies": {
         "@magda/typescript-common": "{{ .Chart.Version | default "^1.3.0" }}",
-        "cross-fetch": "^3.1.5"
+        "cross-fetch": "^4.0.0"
       }
     }
   index.js: |
     #!/usr/bin/env node
-    const buildJwt = require("@magda/typescript-common/dist/session/buildJwt").default;
-    const fetch = require("cross-fetch");
+    import buildJwt from "@magda/typescript-common/dist/session/buildJwt.js";
+    import fetch from "cross-fetch";
         
     const defaultAdminUserId = process.env.USER_ID;
     const jwtSecret = process.env.JWT_SECRET;

diff --git a/deploy/helm/internal-charts/indexer/values.yaml b/deploy/helm/internal-charts/indexer/values.yaml
@@ -8,7 +8,7 @@ image:
 reindexJobImage: 
   name: "node"
   repository: "docker.io"
-  tag: "14-alpine"
+  tag: "18-alpine"
   pullPolicy: IfNotPresent
   pullSecrets: false
 

diff --git a/deploy/helm/local-auth-test-deployment/readme.md b/deploy/helm/local-auth-test-deployment/readme.md
@@ -1,14 +1,14 @@
 # magda-local-auth-test-deployment
 
-![Version: 2.2.3-alpha.0](https://img.shields.io/badge/Version-2.2.3--alpha.0-informational?style=flat-square)
+![Version: 3.0.1-alpha.0](https://img.shields.io/badge/Version-3.0.1--alpha.0-informational?style=flat-square)
 
 ## Requirements
 
 Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda-core | magda-core | 2.2.3-alpha.0 |
+| file://../magda-core | magda-core | 3.0.1-alpha.0 |
 
 ## Values
 

diff --git a/deploy/helm/local-deployment/readme.md b/deploy/helm/local-deployment/readme.md
@@ -1,43 +1,42 @@
 # magda-local-deployment
 
-![Version: 2.2.3-alpha.0](https://img.shields.io/badge/Version-2.2.3--alpha.0-informational?style=flat-square)
+![Version: 3.0.1-alpha.0](https://img.shields.io/badge/Version-3.0.1--alpha.0-informational?style=flat-square)
 
 ## Requirements
 
 Kubernetes: `>= 1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../magda | magda | 2.2.3-alpha.0 |
-| oci://ghcr.io/magda-io/charts | magda-auth-arcgis | 2.0.0 |
+| file://../magda | magda | 3.0.1-alpha.0 |
+| oci://ghcr.io/magda-io/charts | magda-auth-arcgis | 2.0.1 |
 | oci://ghcr.io/magda-io/charts | magda-auth-facebook | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | magda-auth-google | 2.0.0 |
+| oci://ghcr.io/magda-io/charts | magda-auth-google | 2.0.1 |
 | oci://ghcr.io/magda-io/charts | magda-auth-internal | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-brisbane(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-dga(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-qld(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-wa(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-sa(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-vic(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-aurin(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-nsw(magda-ckan-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-bom(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-tern(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-marlin(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-environment(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-ga(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-aodn(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-listtas(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-aims(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-mrt(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-neii(magda-csw-connector) | 2.0.1 |
-| oci://ghcr.io/magda-io/charts | connector-sdinsw(magda-csw-connector) | 2.0.1 |
+| oci://ghcr.io/magda-io/charts | connector-vic(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-dga(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-qld(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-wa(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-sa(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-aurin(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-brisbane(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-nsw(magda-ckan-connector) | 2.1.0 |
+| oci://ghcr.io/magda-io/charts | connector-tern(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-marlin(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-environment(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-ga(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-listtas(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-bom(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-aodn(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-mrt(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-neii(magda-csw-connector) | 2.0.2 |
+| oci://ghcr.io/magda-io/charts | connector-sdinsw(magda-csw-connector) | 2.0.2 |
 | oci://ghcr.io/magda-io/charts | connector-dap(magda-dap-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-logan(magda-project-open-data-connector) | 2.0.0 |
+| oci://ghcr.io/magda-io/charts | connector-melbournewater(magda-project-open-data-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | connector-moretonbay(magda-project-open-data-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | connector-melbourne(magda-project-open-data-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | connector-southerngrampians(magda-project-open-data-connector) | 2.0.0 |
-| oci://ghcr.io/magda-io/charts | connector-melbournewater(magda-project-open-data-connector) | 2.0.0 |
+| oci://ghcr.io/magda-io/charts | connector-logan(magda-project-open-data-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | connector-launceston(magda-project-open-data-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | connector-hobart(magda-project-open-data-connector) | 2.0.0 |
 | oci://ghcr.io/magda-io/charts | connector-actmapi(magda-project-open-data-connector) | 2.0.0 |
@@ -56,14 +55,12 @@ Kubernetes: `>= 1.14.0-0`
 | connector-actmapi.config.id | string | `"actmapi"` |  |
 | connector-actmapi.config.name | string | `"ACT Government ACTMAPi"` |  |
 | connector-actmapi.config.sourceUrl | string | `"https://actmapi-actgov.opendata.arcgis.com/api/feed/dcat-us/1.1.json"` |  |
-| connector-aims.config.id | string | `"aims"` |  |
-| connector-aims.config.name | string | `"Australian Institute of Marine Science"` |  |
-| connector-aims.config.pageSize | int | `100` |  |
-| connector-aims.config.sourceUrl | string | `"https://geo.aims.gov.au/geonetwork/srv/eng/csw"` |  |
 | connector-aodn.config.id | string | `"aodn"` |  |
 | connector-aodn.config.name | string | `"Australian Oceans Data Network"` |  |
+| connector-aodn.config.outputSchema | string | `"http://standards.iso.org/iso/19115/-3/mdb/2.0"` |  |
 | connector-aodn.config.pageSize | int | `100` |  |
 | connector-aodn.config.sourceUrl | string | `"https://catalogue.aodn.org.au/geonetwork/srv/eng/csw"` |  |
+| connector-aodn.config.typeNames | string | `"mdb:MD_Metadata"` |  |
 | connector-aurin.config.id | string | `"aurin"` |  |
 | connector-aurin.config.name | string | `"Australian Urban Research Infrastructure Network"` |  |
 | connector-aurin.config.pageSize | int | `100` |  |
@@ -94,6 +91,7 @@ Kubernetes: `>= 1.14.0-0`
 | connector-ga.config.outputSchema | string | `"http://standards.iso.org/iso/19115/-3/mdb/1.0"` |  |
 | connector-ga.config.pageSize | int | `100` |  |
 | connector-ga.config.sourceUrl | string | `"https://ecat.ga.gov.au/geonetwork/srv/eng/csw"` |  |
+| connector-ga.config.typeNames | string | `"mdb:MD_Metadata"` |  |
 | connector-gbrmpa.config.id | string | `"gbrmpa"` |  |
 | connector-gbrmpa.config.name | string | `"GBRMPA Geoportal"` |  |
 | connector-gbrmpa.config.sourceUrl | string | `"https://geoportal.gbrmpa.gov.au/api/feed/dcat-us/1.1.json"` |  |
@@ -169,6 +167,7 @@ Kubernetes: `>= 1.14.0-0`
 | connector-vic.config.presetRecordAspects[0].id | string | `"organization-details"` |  |
 | connector-vic.config.presetRecordAspects[0].recordType | string | `"Organization"` |  |
 | connector-vic.config.sourceUrl | string | `"https://discover.data.vic.gov.au/"` |  |
+| connector-wa.config.customJsFilterCode | string | `"if(type === \"Dataset\") {\n  return jsonData[\"access_level\"]==\"open\" ? true : false;\n} else {\n  return true;\n}\n"` |  |
 | connector-wa.config.id | string | `"wa"` |  |
 | connector-wa.config.name | string | `"Western Australia Government"` |  |
 | connector-wa.config.pageSize | int | `25` |  |

diff --git a/magda-typescript-common/package.json b/magda-typescript-common/package.json
@@ -59,7 +59,6 @@
     "@magda/esm-utils": "^1.0.1",
     "@magda/tsmonad": "^0.9.0",
     "@types/resolve": "^1.14.0",
-    "@types/vfile-message": "^2.0.0",
     "caller-path": "^4.0.0",
     "cross-fetch": "^4.0.0",
     "crypto-js": "^4.2.0",

diff --git a/yarn.lock b/yarn.lock
@@ -5482,7 +5482,7 @@
   resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3"
   integrity sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg==
 
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
+"@types/unist@*":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
@@ -5502,13 +5502,6 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
   integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
 
-"@types/vfile-message@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5"
-  integrity sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==
-  dependencies:
-    vfile-message "*"
-
 "@types/ws@^6.0.1":
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.4.tgz#7797707c8acce8f76d8c34b370d4645b70421ff1"
@@ -23056,13 +23049,6 @@ unist-util-modify-children@^4.0.0:
     "@types/unist" "^3.0.0"
     array-iterate "^2.0.0"
 
-unist-util-stringify-position@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
-  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
-  dependencies:
-    "@types/unist" "^2.0.2"
-
 unist-util-stringify-position@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
@@ -23363,14 +23349,6 @@ [email protected]:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-message@*:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
-  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
 vfile-message@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"