Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proxy ElasticSearch service #868

Merged
merged 3 commits into from
Jul 3, 2019
Merged

Proxy ElasticSearch service #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71877a4
Proxy ElasticSearch service
mjgiarlo Jul 2, 2019
bd34a9c
Add the request dependency
mjgiarlo Jul 2, 2019
70232e7
Use babel-node to run Express server
mjgiarlo Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
name: Build & Register Images
command: |
docker build -t ld4p/sinopia_editor:latest .
docker build -t ld4p/sinopia_editor:dev --build-arg TRELLIS_BASE_URL=$TRELLIS_BASE_URL_DEV --build-arg SINOPIA_URI=$SINOPIA_URI_DEV --build-arg AWS_COGNITO_DOMAIN=$AWS_COGNITO_DOMAIN_DEV --build-arg COGNITO_CLIENT_ID=$COGNITO_CLIENT_ID_DEV --build-arg COGNITO_USER_POOL_ID=$COGNITO_USER_POOL_ID_DEV .
docker build -t ld4p/sinopia_editor:stage --build-arg TRELLIS_BASE_URL=$TRELLIS_BASE_URL_STAGE --build-arg SINOPIA_URI=$SINOPIA_URI_STAGE --build-arg AWS_COGNITO_DOMAIN=$AWS_COGNITO_DOMAIN_STAGE --build-arg COGNITO_CLIENT_ID=$COGNITO_CLIENT_ID_STAGE --build-arg COGNITO_USER_POOL_ID=$COGNITO_USER_POOL_ID_STAGE .
docker build -t ld4p/sinopia_editor:prod --build-arg TRELLIS_BASE_URL=$TRELLIS_BASE_URL_PROD --build-arg SINOPIA_URI=$SINOPIA_URI_PROD --build-arg AWS_COGNITO_DOMAIN=$AWS_COGNITO_DOMAIN_PROD --build-arg COGNITO_CLIENT_ID=$COGNITO_CLIENT_ID_PROD --build-arg COGNITO_USER_POOL_ID=$COGNITO_USER_POOL_ID_PROD .
docker build -t ld4p/sinopia_editor:dev --build-arg TRELLIS_BASE_URL=$TRELLIS_BASE_URL_DEV --build-arg SINOPIA_URI=$SINOPIA_URI_DEV --build-arg AWS_COGNITO_DOMAIN=$AWS_COGNITO_DOMAIN_DEV --build-arg COGNITO_CLIENT_ID=$COGNITO_CLIENT_ID_DEV --build-arg COGNITO_USER_POOL_ID=$COGNITO_USER_POOL_ID_DEV --build-arg INDEX_URL=$INDEX_URL_DEV .
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, I have already tracked down these values and added new env-specific variables to the CircleCI build.

docker build -t ld4p/sinopia_editor:stage --build-arg TRELLIS_BASE_URL=$TRELLIS_BASE_URL_STAGE --build-arg SINOPIA_URI=$SINOPIA_URI_STAGE --build-arg AWS_COGNITO_DOMAIN=$AWS_COGNITO_DOMAIN_STAGE --build-arg COGNITO_CLIENT_ID=$COGNITO_CLIENT_ID_STAGE --build-arg COGNITO_USER_POOL_ID=$COGNITO_USER_POOL_ID_STAGE --build-arg INDEX_URL=$INDEX_URL_STAGE .
docker build -t ld4p/sinopia_editor:prod --build-arg TRELLIS_BASE_URL=$TRELLIS_BASE_URL_PROD --build-arg SINOPIA_URI=$SINOPIA_URI_PROD --build-arg AWS_COGNITO_DOMAIN=$AWS_COGNITO_DOMAIN_PROD --build-arg COGNITO_CLIENT_ID=$COGNITO_CLIENT_ID_PROD --build-arg COGNITO_USER_POOL_ID=$COGNITO_USER_POOL_ID_PROD --build-arg INDEX_URL=$INDEX_URL_PROD .
echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
docker push ld4p/sinopia_editor:latest
docker push ld4p/sinopia_editor:dev
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ARG SINOPIA_URI
ARG AWS_COGNITO_DOMAIN
ARG COGNITO_CLIENT_ID
ARG COGNITO_USER_POOL_ID
ARG INDEX_URL

# This is the directory the user in the circleci/node image can write to
WORKDIR /home/circleci
Expand Down
9 changes: 9 additions & 0 deletions __tests__/Config.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ describe('Config', () => {
expect(Config.sinopiaUrl).toEqual('https://sinopia.io')
})

it('index url has static value', () => {
expect(Config.indexUrl).toEqual('http://localhost:9200')
})

it('useResourceTemplateFixtures is false by default', () => {
expect(Config.useResourceTemplateFixtures).toEqual(false)
})
Expand Down Expand Up @@ -77,6 +81,7 @@ describe('Config', () => {
COGNITO_USER_POOL_ID: 'us-west-7_CGd9Wq142',
AWS_COGNITO_DOMAIN: 'https://sinopia-foo.amazoncognito.com',
MAX_RECORDS_FOR_QA_LOOKUPS: 15,
INDEX_URL: 'http://elasticsearch.aws.example.com',
}
})

Expand All @@ -92,6 +97,10 @@ describe('Config', () => {
expect(Config.sinopiaUrl).toEqual('https://sinopia.foo')
})

it('index url overrides static value', () => {
expect(Config.indexUrl).toEqual('http://elasticsearch.aws.example.com')
})

it('sinopia server url overrides static value', () => {
expect(Config.sinopiaServerBase).toEqual('https://sinopia_server.foo')
})
Expand Down
76 changes: 21 additions & 55 deletions package-lock.json
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"eslint-fix-single": "eslint --color -c .eslintrc.js --fix",
"jest-cov": "jest --coverage --colors --silent --runInBand",
"jest-ci": "jest --colors --silent --ci --runInBand --coverage --reporters=default --reporters=jest-junit && cat ./coverage/lcov.info | coveralls",
"start": "npx babel-node server.js",
"test": "jest --colors --silent --runInBand --detectOpenHandles",
"test-verbose": "jest --colors --runInBand"
},
Expand Down Expand Up @@ -116,6 +117,7 @@
"react-router-dom": "^4.3.1",
"redux": "^4.0.1",
"redux-thunk": "^2.3.0",
"request": "^2.88.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems in Javascriptland there are a million options here, and it's not clear to me which is the best fit or the most idiomatic. Happy to consider alternatives.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module request is fine.

"reselect": "^4.0.0",
"shortid": "^2.2.14",
"sinopia_server": "^3.0.0-beta4",
Expand Down