Skip to content
This repository has been archived by the owner on Jan 11, 2022. It is now read-only.

Commit

Permalink
feat: move to /helix/helix-observation
Browse files Browse the repository at this point in the history
fixes #8
  • Loading branch information
tripodsan committed Jul 6, 2020
1 parent f301f9f commit 8ebf88a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 27 deletions.
24 changes: 5 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,7 @@ jobs:
name: revert changes to package-lock.json
command: git checkout -- package-lock.json
- helix-post-deploy/config-env
- run:
name: Configure OpenWhisk
command: echo -e "APIHOST=https://adobeioruntime.net\nNAMESPACE=helix-index\nAUTH=$WSK_AUTH_INDEX\n" > ~/.wskprops
- run:
name: Configure Environment (wsk_auth)
command: echo -e "WSK_AUTH=$WSK_AUTH_INDEX\n" >> .env
- run:
name: Configure Environment (wsk_namespace)
command: echo -e "WSK_NAMESPACE=helix-index\n" >> .env
- helix-post-deploy/config-wsk
- run:
name: Semantic Release
command: npm run semantic-release
Expand All @@ -79,9 +71,10 @@ jobs:
path: junit
- run:
name: Link Sequences
command: WSK_AUTH="$WSK_AUTH_INDEX" npm run deploy-sequences
command: npm run deploy-sequences
# see https://circleci.com/orbs/registry/orb/adobe/helix-post-deploy
# for more available parameters
# currently disabled until monitory script supports non-web actions
# - helix-post-deploy/monitoring:
# statuspage_name: Helix Cache Flush Service
# statuspage_group: Delivery
Expand All @@ -95,15 +88,7 @@ jobs:
- run:
name: revert changes to package-lock.json
command: git checkout -- package-lock.json
- run:
name: Configure OpenWhisk
command: echo -e "APIHOST=https://adobeioruntime.net\nNAMESPACE=helix-index\nAUTH=$WSK_AUTH_INDEX\n" > ~/.wskprops
- run:
name: Configure Environment (wsk_auth)
command: echo -e "WSK_AUTH=$WSK_AUTH_INDEX\n" >> .env
- run:
name: Configure Environment (wsk_namespace)
command: echo -e "WSK_NAMESPACE=helix-index\n" >> .env
- helix-post-deploy/config-wsk
- run:
name: Branch Deployment
command: npm run deploy-ci
Expand All @@ -119,6 +104,7 @@ workflows:
jobs:
- build
- branch-deploy:
context: Project Helix
requires:
- build
filters:
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
## Usage

```bash
curl https://adobeioruntime.net/api/v1/web/helix/helix-services/cache-flush@v1
curl https://adobeioruntime.net/api/v1/web/helix/helix-observation/cache-flush@v1
```

For more, see the [API documentation](docs/API.md).

## Development

### Deploying Helix Cache Flush Service

Deploying Helix Cache Flush Service requires the `wsk` command line client, authenticated to a namespace of your choice. For Project Helix, we use the `helix` namespace.

All commits to master that pass the testing will be deployed automatically. All commits to branches that will pass the testing will get commited as `/helix-services/cache-flush@ci<num>` and tagged with the CI build number.
All commits to master that pass the testing will be deployed automatically. All commits to branches that will pass the testing will get deployed as `/helix/helix-observation/cache-flush@ci<num>` and tagged with the CI build number.
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@
"test-postdeploy": "mocha --reporter xunit --reporter-options output=./junit/test-results.xml -g 'Post-Deploy'",
"lint": "./node_modules/.bin/eslint .",
"semantic-release": "semantic-release",
"docs": "npx jsdoc2md -c .jsdoc.json --files 'src/*.js' > docs/API.md",
"commit": "git-cz",
"build": "wsk-builder -v",
"deploy": "wsk-builder -v --deploy --test-params __ow_path=/_status_check/healthcheck.json",
"deploy-sequences": "wsk-builder --no-build -no-hints -l latest -l major -l minor",
"deploy-ci": "wsk-builder -v --deploy --test-params __ow_path=/_status_check/healthcheck.json --pkgVersion=ci$CIRCLE_BUILD_NUM -l ci"
},
"wsk": {
"__TODO__": "It must be possible to run this in the customers namespace.",
"namespace": "helix-index",
"name": "helix-services/cache-flush@${version}",
"namespace": "helix",
"name": "helix-observation/cache-flush@${version}",
"web-export": false
},
"repository": {
Expand Down

0 comments on commit 8ebf88a

Please sign in to comment.