diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index f4c04213..8020600c 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -14,23 +14,21 @@ jobs: runs-on: ubuntu-latest services: localstack: - image: localstack/localstack:3 - env: - SERVICES: s3,sns,sqs + image: localstack/localstack:4 ports: - 4566:4566 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version-file: ".nvmrc" cache: npm cache-dependency-path: package.json - uses: ankane/setup-opensearch@v1 with: - opensearch-version: 2.13 + opensearch-version: 2.17 - name: Upgrade npm - run: npm install -g npm@8.19.4 + run: npm install -g npm@10 - name: Install dependencies run: npm install - name: Eslint diff --git a/README.md b/README.md index c3ba069d..82fb81de 100644 --- a/README.md +++ b/README.md @@ -1237,12 +1237,19 @@ npm run test npm run build-api-docs # TODO: this fails ``` +[npm-check-updates](https://www.npmjs.com/package/npm-check-updates) can be used for +updating version dependencies to newer ones. Run: + +```commandline +ncu -i +``` + ### Running Locally -Before the API can be run, OpenSearch and Localstack need to be running. There is a `docker-compose.yml` file to simplify running OpenSearch locally: +Before the API can be run, OpenSearch and Localstack need to be running. There is a `compose.yml` file to simplify running OpenSearch locally: ```shell -docker-compose up -d +docker compose up -d ``` The API can then be run with: diff --git a/docker-compose.yml b/compose.yml similarity index 70% rename from docker-compose.yml rename to compose.yml index 983afee6..37d4e490 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -1,16 +1,13 @@ -version: "3.8" services: opensearch: - image: opensearchproject/opensearch:2.13.0 + image: opensearchproject/opensearch:2.17.1 ports: - "127.0.0.1:9200:9200" - "127.0.0.1:9300:9300" volumes: - ./opensearch/config/opensearch.yml:/usr/share/opensearch/config/opensearch.yml localstack: - image: localstack/localstack:3 + image: localstack/localstack:4 ports: - "127.0.0.1:4566:4566" # LocalStack Gateway - "127.0.0.1:4510-4559:4510-4559" # external services port range - environment: - - SERVICES=s3,sns,sqs diff --git a/package-lock.json b/package-lock.json index 127f99be..1f8a6945 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@aws-sdk/credential-provider-node": "^3.575.0", "@aws-sdk/s3-request-presigner": "^3.575.0", "@mapbox/extent": "^0.4.0", - "@opensearch-project/opensearch": "^2.8.0", + "@opensearch-project/opensearch": "^2.13.0", "@redocly/cli": "^1.12.2", "cors": "^2.8.5", "express": "^4.19.2", @@ -10529,13 +10529,15 @@ } }, "node_modules/@opensearch-project/opensearch": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@opensearch-project/opensearch/-/opensearch-2.8.0.tgz", - "integrity": "sha512-VgYq5WQCHHotUlk8fUXAkisCjeiw6eNKg/z9elBHuFnNVEUEhSzl3UAuPS3Y9TUd9uTvUbAZ8kkuA5y3Te9rsw==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/@opensearch-project/opensearch/-/opensearch-2.13.0.tgz", + "integrity": "sha512-Bu3jJ7pKzumbMMeefu7/npAWAvFu5W9SlbBow1ulhluqUpqc7QoXe0KidDrMy7Dy3BQrkI6llR3cWL4lQTZOFw==", + "license": "Apache-2.0", "dependencies": { "aws4": "^1.11.0", "debug": "^4.3.1", "hpagent": "^1.2.0", + "json11": "^2.0.0", "ms": "^2.1.3", "secure-json-parse": "^2.4.0" }, @@ -20659,6 +20661,15 @@ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", "dev": true }, + "node_modules/json11": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/json11/-/json11-2.0.2.tgz", + "integrity": "sha512-HIrd50UPYmP6sqLuLbFVm75g16o0oZrVfxrsY0EEys22klz8mRoWlX9KAEDOSOR9Q34rcxsyC8oDveGrCz5uLQ==", + "license": "MIT", + "bin": { + "json11": "dist/cli.mjs" + } + }, "node_modules/json5": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", diff --git a/package.json b/package.json index 0d9b9b1f..5416d97a 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "test:unit": "ava tests/unit/*.[tj]s", "typecheck": "tsc", "audit-prod": "npx better-npm-audit audit --production", + "audit": "npx better-npm-audit audit", "deploy": "sls deploy", "sls-remove": "sls remove", "package": "sls package", @@ -68,7 +69,7 @@ "@aws-sdk/credential-provider-node": "^3.575.0", "@aws-sdk/s3-request-presigner": "^3.575.0", "@mapbox/extent": "^0.4.0", - "@opensearch-project/opensearch": "^2.8.0", + "@opensearch-project/opensearch": "^2.13.0", "@redocly/cli": "^1.12.2", "cors": "^2.8.5", "express": "^4.19.2", diff --git a/serverless.example.yml b/serverless.example.yml index 9b336466..a34e2011 100644 --- a/serverless.example.yml +++ b/serverless.example.yml @@ -184,7 +184,7 @@ resources: InstanceCount: 1 DedicatedMasterEnabled: false ZoneAwarenessEnabled: false - EngineVersion: OpenSearch_2.13 + EngineVersion: OpenSearch_2.17 DomainEndpointOptions: EnforceHTTPS: true NodeToNodeEncryptionOptions: