Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into MWPW-166929
Browse files Browse the repository at this point in the history
  • Loading branch information
Predrag Markovic committed Feb 6, 2025
2 parents 96a01ea + 41e4ae0 commit ede07ec
Show file tree
Hide file tree
Showing 43 changed files with 3,923 additions and 2,211 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
Resolve <JIRA>

Test URLs:
- Before: https://main--mas--adobecom.hlx.live/studio.html
- After: https://<branch>--mas--adobecom.hlx.live/studio.html
- Before: https://main--mas--adobecom.aem.live/studio.html
- After: https://<branch>--mas--adobecom.aem.live/studio.html
16 changes: 16 additions & 0 deletions .github/workflows/ost-products.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Trigger OST Products action

on:
schedule:
- cron: '0 8 * * *' # Daily at 8am UTC (9am CET), triggered on default branch = main
workflow_dispatch: # trigger

jobs:
update-products:
runs-on: ubuntu-latest
steps:
- name: Refresh cache
run: curl $OST_PRODUCTS_URL$OST_WRITE_API_KEY
env:
OST_PRODUCTS_URL: ${{ vars.OST_PRODUCTS_URL }}
OST_WRITE_API_KEY: ${{ secrets.OST_WRITE_API_KEY }}
1 change: 1 addition & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const config = {
'/libs/',
'**/libs/**',
'**/dist/**',
'studio/ost/index.js',
],
...eslintPluginPrettierRecommended,
};
Expand Down
14 changes: 11 additions & 3 deletions io-actions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,21 @@
- install aio cli running `npm install -g @adobe/aio-cli`
- Request access to I/O Runtime in Adobe Corp org (you can do that on #milo-dev)
- navigate to Developer Console https://developer.adobe.com/console
- in Mas HealthCheck project, create a workspace with your ldap
- in 'Merch at Scale' project, create a workspace with your ldap
- in your workspace click on 'Download all' and copy the auth .json in root of this project
- run `aio app use <filename>`
- this should populate the `.env` and the `.aio` file in the project root
- add ODIN_CDN_ENDPOINT,ODIN_ORIGIN_ENDPOINT,WCS_CDN_ENDPOINT,WCS_ORIGIN_ENDPOINT env vars to .env file
- ask a colleague for values:
- for health-check action,
add ODIN_CDN_ENDPOINT,ODIN_ORIGIN_ENDPOINT,WCS_CDN_ENDPOINT,WCS_ORIGIN_ENDPOINT env vars to .env file
- for ost-products, add AOS_URL and AOS_API_KEY env vars to .env file
- run `npm i`
- run `aio where` and verify output is:
```
aio where
You are currently in:
1. Org: Adobe Corp
2. Project: Mas HealthCheck
2. Project: MerchAtScale
3. Workspace: your ldap
```

Expand All @@ -36,6 +39,11 @@ You are currently in:
- `aio app test && aio app deploy` to test, build and deploy all actions on Runtime and static files to CDN
- `aio app undeploy` to undeploy the app

If you need to force re-deploy:
- `aio app deploy --force-deploy --no-publish`
To deploy specific action
- `aio app deploy -a ost-products-read`

## Config

### `.env`
Expand Down
17 changes: 17 additions & 0 deletions io-actions/app.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,21 @@ application:
annotations:
require-adobe-auth: false
final: true
ost-products-write:
function: src/ost-products/write.js
web: 'yes'
runtime: nodejs:22
inputs:
AOS_URL: $AOS_URL
AOS_API_KEY: $AOS_API_KEY
OST_WRITE_API_KEY: $OST_WRITE_API_KEY
annotations:
require-adobe-auth: false
ost-products-read:
function: src/ost-products/read.js
web: 'yes'
runtime: nodejs:22
annotations:
require-adobe-auth: false


Loading

0 comments on commit ede07ec

Please sign in to comment.