Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into get-credentials-phase2
Browse files Browse the repository at this point in the history
  • Loading branch information
deepessh committed Aug 19, 2024
2 parents 964add6 + 62fad4d commit fef20f8
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 43 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/algolia-indexing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
name: Search Indexing
on:
workflow_dispatch:
inputs:
mode:
description: 'Type of indexing. "index" to push to Algolia, "console" for dry run.'
required: true
default: "index"
type: choice
options:
- console
- index

jobs:
build-and-index:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node v18 for Yarn v4
uses: actions/setup-node@v3
with:
node-version: "18.19.0" # Current LTS version

- name: Enable Corepack for Yarn
run: corepack enable

- name: Install Dependencies
run: yarn install
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: false

- name: Build site
run: yarn build

env:
NODE_OPTIONS: "--max_old_space_size=8192"
PREFIX_PATHS: true # equivalent to --prefix-paths flag for 'gatsby build'
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_OWNER: ${{ github.repository_owner }}
REPO_NAME: ${{ github.event.repository.name }}
REPO_BRANCH: ${{ github.ref_name }}
GATSBY_ALGOLIA_APPLICATION_ID: ${{ secrets.AIO_ALGOLIA_APPLICATION_ID }}
GATSBY_ALGOLIA_SEARCH_API_KEY: ${{ secrets.AIO_ALGOLIA_SEARCH_API_KEY }}
ALGOLIA_WRITE_API_KEY: ${{ secrets.AIO_ALGOLIA_WRITE_API_KEY }}
ALGOLIA_INDEXATION_MODE: ${{ github.event.inputs.mode || 'index' }}
GATSBY_ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME || github.event.repository.name }}
GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
GATSBY_SITE_DOMAIN_URL: https://developer.adobe.com
60 changes: 33 additions & 27 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,25 @@ on:
workflow_dispatch:
inputs:
env:
description: 'Deploy to (dev|prod|dev prod)'
description: "Deploy to (dev|prod|dev prod)"
required: true
default: 'dev'
default: "dev"
clean:
description: 'Clean cache (yes|no)'
description: "Clean cache (yes|no)"
required: true
default: 'no'
default: "no"
excludeSubfolder:
description: 'Exclude a subfolder from deletion'
description: "Exclude a subfolder from deletion"
required: false
default: ''
default: ""
index-mode:
description: 'Type of indexing. "index" to push to Algolia, "console" for dry run.'
required: true
default: "index"
type: choice
options:
- console
- index
jobs:
set-state:
runs-on: ubuntu-latest
Expand All @@ -39,7 +47,7 @@ jobs:
result-encoding: string
- name: Get branch name
shell: bash
run: echo "##[set-output name=branch;]${GITHUB_REF#refs/heads/}"
run: echo "branch=${GITHUB_REF#refs/heads/}" >> "$GITHUB_OUTPUT"
id: get_branch

echo-state:
Expand Down Expand Up @@ -81,7 +89,7 @@ jobs:
- name: Setup Node v16 for Yarn v3
uses: actions/setup-node@v3
with:
node-version: '16.15.0' # Current LTS version
node-version: "16.15.0" # Current LTS version

- name: Enable Corepack for Yarn v3
run: corepack enable
Expand Down Expand Up @@ -123,7 +131,7 @@ jobs:
PATH_PREFIX: ${{ needs.set-state.outputs.path_prefix }}
GATSBY_ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_DEV_SRC }}
GATSBY_ADDITIONAL_ADOBE_ANALYTICS_ACCOUNTS: ${{ secrets.AIO_REPORT_SUITE_DEV}}
GATSBY_ADOBE_ANALYTICS_ENV: 'dev'
GATSBY_ADOBE_ANALYTICS_ENV: "dev"
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_OWNER: ${{ github.event.repository.owner.login }}
REPO_NAME: ${{ github.event.repository.name }}
Expand All @@ -140,25 +148,24 @@ jobs:
GATSBY_ALGOLIA_API_KEY: ${{ secrets.AIO_ALGOLIA_API_KEY }}
GATSBY_ALGOLIA_INDEX_ALL_SRC: ${{ secrets.AIO_ALGOLIA_INDEX_ALL_SRC }}
GATSBY_ALGOLIA_SEARCH_INDEX: ${{ secrets.AIO_ALGOLIA_SEARCH_INDEX }}
GATSBY_ALGOLIA_INDEX_ENV_PREFIX: ${{ secrets.AIO_ALGOLIA_INDEX_ENV_PREFIX }}
GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
GATSBY_SITE_DOMAIN_URL: https://developer-stage.adobe.com

- name: Deploy
uses: AdobeDocs/static-website-deploy@master
with:
enabled-static-website: 'true'
source: 'public'
enabled-static-website: "true"
source: "public"
target: ${{ needs.set-state.outputs.path_prefix }}
connection-string: ${{ secrets.AIO_AZURE_DEV_CONNECTION_STRING }}
remove-existing-files: 'true'
remove-existing-files: "true"
exclude-subfolder: ${{ needs.set-state.outputs.exclude_subfolder }}
- name: Delay purge
run: sleep 60s
shell: bash
- name: Purge Fastly Cache
uses: AdobeDocs/gatsby-fastly-purge-action@master
with:
fastly-token: ${{ secrets.AIO_FASTLY_TOKEN }}
fastly-url: '${{ secrets.AIO_FASTLY_DEV_URL}}${{ needs.set-state.outputs.path_prefix }}'
fastly-url: "${{ secrets.AIO_FASTLY_DEV_URL}}${{ needs.set-state.outputs.path_prefix }}"

pre-build-production:
needs: [set-state]
Expand Down Expand Up @@ -186,7 +193,7 @@ jobs:
- name: Setup Node v16 for Yarn v3
uses: actions/setup-node@v3
with:
node-version: '16.15.0' # Current LTS version
node-version: "16.15.0" # Current LTS version

- name: Enable Corepack for Yarn v3
run: corepack enable
Expand Down Expand Up @@ -228,7 +235,7 @@ jobs:
PATH_PREFIX: ${{ needs.set-state.outputs.path_prefix }}
GATSBY_ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_PROD_SRC }}
GATSBY_ADDITIONAL_ADOBE_ANALYTICS_ACCOUNTS: ${{ secrets.AIO_REPORT_SUITE_PROD }}
GATSBY_ADOBE_ANALYTICS_ENV: 'production'
GATSBY_ADOBE_ANALYTICS_ENV: "production"
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_OWNER: ${{ github.event.repository.owner.login }}
REPO_NAME: ${{ github.event.repository.name }}
Expand All @@ -244,25 +251,24 @@ jobs:
GATSBY_ALGOLIA_APP_ID: ${{ secrets.AIO_ALGOLIA_APP_ID }}
GATSBY_ALGOLIA_API_KEY: ${{ secrets.AIO_ALGOLIA_API_KEY }}
ALGOLIA_WRITE_API_KEY: ${{ secrets.AIO_ALGOLIA_WRITE_API_KEY }}
ALGOLIA_INDEXATION_MODE: ${{ secrets.AIO_ALGOLIA_INDEXATION_MODE }}
ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME || github.event.repository.name }}
ALGOLIA_INDEXATION_MODE: ${{ github.event.inputs.index-mode || 'index' }}
GATSBY_ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME || github.event.repository.name }}
GATSBY_ALGOLIA_INDEX_ALL_SRC: ${{ secrets.AIO_ALGOLIA_INDEX_ALL_SRC }}
GATSBY_ALGOLIA_SEARCH_INDEX: ${{ secrets.AIO_ALGOLIA_SEARCH_INDEX }}
GATSBY_ALGOLIA_INDEX_ENV_PREFIX: ${{ secrets.AIO_ALGOLIA_INDEX_ENV_PREFIX }}
GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
GATSBY_SITE_DOMAIN_URL: https://developer.adobe.com
- name: Deploy
uses: AdobeDocs/static-website-deploy@master
with:
enabled-static-website: 'true'
source: 'public'
enabled-static-website: "true"
source: "public"
target: ${{ needs.set-state.outputs.path_prefix }}
connection-string: ${{ secrets.AIO_AZURE_PROD_CONNECTION_STRING }}
remove-existing-files: 'true'
remove-existing-files: "true"
exclude-subfolder: ${{ needs.set-state.outputs.exclude_subfolder }}
- name: Delay purge
run: sleep 60s
shell: bash
- name: Purge Fastly Cache
uses: AdobeDocs/gatsby-fastly-purge-action@master
with:
fastly-token: ${{ secrets.AIO_FASTLY_TOKEN }}
fastly-url: '${{ secrets.AIO_FASTLY_PROD_URL }}${{ needs.set-state.outputs.path_prefix }}'
fastly-url: "${{ secrets.AIO_FASTLY_PROD_URL }}${{ needs.set-state.outputs.path_prefix }}"
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"url": "https://github.com/icaraps"
},
"dependencies": {
"@adobe/gatsby-theme-aio": "4.14.0-rc2",
"@adobe/react-spectrum": "^3.35.1",
"@adobe/gatsby-theme-aio": "^4.14.4",
"gatsby": "4.22.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/guides/authentication/UserAuthentication/IMS.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Parameters can be sent in the body or as query parameters. Passing parameters in

|Parameter|Mandatory|Description|
|---|---|---|
|`authorization_code`|Yes|The value of the `code` query/fragment parameter returned in the callback request from the autorize step |
|`code`|Yes|The value of the `code` query/fragment parameter returned in the callback request from the autorize step |
|`grant_type`|Yes|Value should always be `authorization_code`|
|`authorization`| Required for confidential clients|Basic Authorization header.<br/><br/>`Authorization: Basic Base64(clientId:clientSecret)`|
|`client_id`|Required for PUBLIC clients|The Client ID obtained from the [Adobe Developer Console](/console)|
Expand Down
2 changes: 1 addition & 1 deletion src/pages/guides/projects/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Furthermore, you can sort the Projects based on created date, last modified date

You can filter down the list of Projects to find your Projects quickly. You can filter the list of Projects using the following filters:

1. By Text: You can filter Projects by ID, title, description, workspace, IMS client ID, technical account ID, event registration id, plugin id, or Runtime namespace.
1. By Text: You can filter Projects by ID, title, description, workspace, IMS client ID, technical account ID or email, event registration id, plugin id, or Runtime namespace.
2. By who created or modified the Project
3. By what a Project Contains (APIs, Event Providers, and Plugins)
4. By whether a Project requires your attention
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ __metadata:
languageName: node
linkType: hard

"@adobe/gatsby-theme-aio@npm:4.14.0-rc2":
version: 4.14.0-rc2
resolution: "@adobe/gatsby-theme-aio@npm:4.14.0-rc2"
"@adobe/gatsby-theme-aio@npm:^4.14.4":
version: 4.14.4
resolution: "@adobe/gatsby-theme-aio@npm:4.14.4"
dependencies:
"@adobe/focus-ring-polyfill": ^0.1.5
"@adobe/gatsby-source-github-file-contributors": ^0.3.1
"@adobe/prism-adobe": ^1.0.3
"@adobe/react-spectrum": ^3.35.1
"@emotion/react": ^11.10.4
"@loadable/component": ^5.15.2
"@mdx-js/mdx": 1.6.22
Expand Down Expand Up @@ -138,7 +139,7 @@ __metadata:
gatsby: ^4.22.0
react: ^17.0.2
react-dom: ^17.0.2
checksum: f2f1650b837c113b67ae3ed03053e953096fffe018cfec3294189436daaaf552803b7d251c4027443b7940f7060be9af0843c2a94a989d9e8e2fd14cc60a302c
checksum: 846ee1128ccfee37bb36313ee594349369bba472f93ca7f6b6142b7ede79842f808f3458659abbbe7972171166a14674aa1860b8ca7539c1300a804f3794b54d
languageName: node
linkType: hard

Expand Down Expand Up @@ -1991,11 +1992,11 @@ __metadata:
linkType: hard

"@babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
version: 7.24.6
resolution: "@babel/runtime@npm:7.24.6"
version: 7.24.8
resolution: "@babel/runtime@npm:7.24.8"
dependencies:
regenerator-runtime: ^0.14.0
checksum: 44d95ca743898fed31b4cefef31de6fd3cf7906e94493368e9d6538289cc52c6c46185205d9c01d38466a5b3f673550f80892d30b1ed02a2c13e704863a8cc48
checksum: 6b1e4230580f67a807ad054720812bbefbb024cc2adc1159d050acbb764c4c81c7ac5f7a042c48f578987c5edc2453c71039268df059058e9501fa6023d764b0
languageName: node
linkType: hard

Expand Down Expand Up @@ -7535,11 +7536,11 @@ __metadata:
linkType: hard

"@swc/helpers@npm:^0.5.0":
version: 0.5.11
resolution: "@swc/helpers@npm:0.5.11"
version: 0.5.12
resolution: "@swc/helpers@npm:0.5.12"
dependencies:
tslib: ^2.4.0
checksum: 5d85e641d993264f38871bf53e7509da959cdff7646a40d876153291146b9d0aa701518546e5bfef18fa17c5944333bbeb66c2f0d7a570e8c5535d0937d76bd9
checksum: 293c0cb8f41804f94beb04a764bbcfaf316707ec43947713154ac66311590299446bf9b96ab253ce59ce9e435a0edc8cc2bf93f88dc3989f9241271507dd5fe9
languageName: node
linkType: hard

Expand Down Expand Up @@ -8407,8 +8408,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "adobe-dev-console@workspace:."
dependencies:
"@adobe/gatsby-theme-aio": 4.14.0-rc2
"@adobe/react-spectrum": ^3.35.1
"@adobe/gatsby-theme-aio": ^4.14.4
gatsby: 4.22.0
react: ^17.0.2
react-dom: ^17.0.2
Expand Down

0 comments on commit fef20f8

Please sign in to comment.