Skip to content

Commit

Permalink
updates to build (#828)
Browse files Browse the repository at this point in the history
* updates to build

* update changelog
  • Loading branch information
philvarner authored Jan 24, 2025
1 parent c692a0a commit dbde4a3
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 20 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

### Changed

- Update to default to OpenSearch 2.17

### Added

- Minimum implementation (basic-cql2 conformance class) of the filter extension for the
Expand Down
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 2 additions & 5 deletions docker-compose.yml → compose.yml
Original file line number Diff line number Diff line change
@@ -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
19 changes: 15 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion serverless.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ resources:
InstanceCount: 1
DedicatedMasterEnabled: false
ZoneAwarenessEnabled: false
EngineVersion: OpenSearch_2.13
EngineVersion: OpenSearch_2.17
DomainEndpointOptions:
EnforceHTTPS: true
NodeToNodeEncryptionOptions:
Expand Down

0 comments on commit dbde4a3

Please sign in to comment.