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.

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

fix affected #2444

Closed
wants to merge 62 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
1ec2099
feat(orchestrator): backport use v2 endpoints (#2119)
gciavarrini Sep 2, 2024
6ad3a1b
feat(orchestrator): add open api documentation (#2142)
ydayagi Sep 9, 2024
78c8cdd
experimental change for RHIDP-4031 RHIDP-1720 to see if we can use MS…
nickboldt Sep 17, 2024
0051b90
experimental change for RHIDP-4031 RHIDP-1720 to see if we can use MS…
nickboldt Sep 17, 2024
0487d42
experimental change for RHIDP-4031 RHIDP-1720 to see if we can use MS…
nickboldt Sep 17, 2024
9e25d07
Revert "experimental change for RHIDP-4031 RHIDP-1720 to see if we ca…
nickboldt Sep 17, 2024
43eb4db
fix(deps): [1.3.x] update dependency express to v4.20.0 [security] (…
openshift-cherrypick-robot Sep 17, 2024
b436bd8
chore(release): catch shared react 1.3.x up with showcase 1.3.x (#2206)
PatAKnight Sep 18, 2024
72dcbd2
chore: [1.3.x] update keycloak version (#2193)
kim-tsao Sep 18, 2024
73f8c90
chore(deps): [1.3.x] manual cherrypick of 2162 (#2195)
kim-tsao Sep 18, 2024
81bdf35
chore(release): catch scaffolder annotator 1.3.x up with showcase 1.3…
PatAKnight Sep 18, 2024
a5af0ed
chore(release): catch ocm 1.3.x up with showcase 1.3.x (#2203)
PatAKnight Sep 18, 2024
a10a452
chore(release): catch quay 1.3.x up with showcase 1.3.x (#2202)
PatAKnight Sep 18, 2024
c218dde
chore(release): catch tekton 1.3.x up with showcase 1.3.x (#2199)
PatAKnight Sep 18, 2024
769cac1
chore(release): catch topology 1.3.x up with showcase 1.3.x (#2198)
PatAKnight Sep 18, 2024
3c3037a
chore(release): catch bulk import 1.3.x up with showcase 1.3.x (#2204)
PatAKnight Sep 18, 2024
70e78c1
chore(release): catch rbac 1.3.x up with showcase 1.3.x (#2201)
PatAKnight Sep 18, 2024
448e5cc
fix(cli): add additional shared frontend packages [release-1.3] (#2215)
openshift-cherrypick-robot Sep 19, 2024
0b5c39a
chore(deps): bump all plugins up to use @janus-idp/cli/-/cli-1.13.2 (…
nickboldt Sep 20, 2024
d31ed05
chore(deps): [release-1.3] bump @backstage/plugin-catalog-backend to …
coreydaley Oct 1, 2024
585f806
chore(msr): enable MSR on release-1.3 branch (RHIDP-4120) (#2213)
nickboldt Oct 5, 2024
321f374
chore: lint (#2304)
nickboldt Oct 5, 2024
2106104
chore(release): 1.0.5 [skip ci]
semantic-release-bot Oct 5, 2024
e42c263
chore: bump version of... (#2306)
nickboldt Oct 6, 2024
4e5e054
chore: bump all the orchestrator plugins to... (#2308)
nickboldt Oct 6, 2024
f172df3
chore(release): 1.0.5 [skip ci]
semantic-release-bot Oct 6, 2024
dab3f46
fix(orchestrator): revert MSR downversioning; add changelogs (#2309)
nickboldt Oct 7, 2024
60cda2e
chore(release): 1.0.5 [skip ci]
semantic-release-bot Oct 7, 2024
6afdb43
manually push the orchestrator plugins to npmjs.com because MSR keeps…
nickboldt Oct 7, 2024
daa14e3
chore(release): 1.0.5 [skip ci]
semantic-release-bot Oct 7, 2024
4d52721
chore: tagRelease.sh: bump to 3.3.1 in release-1.3 branch + regen yar…
nickboldt Oct 7, 2024
f4673e7
chore: mark the 5 orchestrator plugins PRIVATE so MSR stops trying to…
nickboldt Oct 7, 2024
06e48f6
yarn lock regen (#2321)
nickboldt Oct 8, 2024
edec3b5
chore(release): 1.3.1 [skip ci]
semantic-release-bot Oct 8, 2024
b57aaef
chore(release): [1.3.x] revert unexpected downgrade of bulk-import-ba…
kim-tsao Oct 14, 2024
720dc3d
chore(release): 1.3.1 [skip ci]
semantic-release-bot Oct 14, 2024
bcb83ac
chore(deps): release 1.3 rebase to latest patch versions (#2354)
kim-tsao Oct 15, 2024
836f867
rregen yarn lock
nickboldt Oct 15, 2024
8a94055
chore(release): 1.3.1 [skip ci]
semantic-release-bot Oct 15, 2024
ba3380f
chore(ci): remove msr (#2364)
schultzp2020 Oct 15, 2024
91ba24d
refactor(cli): better `gitignore` management to make it easier when r…
davidfestal Oct 8, 2024
cb0071c
chore(ci): fix git merge issue
schultzp2020 Oct 15, 2024
1dbbf08
fix(scripts): revert to old export-dynamic script (#2371)
schultzp2020 Oct 16, 2024
99dd186
[release-1.3] chore(release): only the release action should be gated…
openshift-cherrypick-robot Oct 16, 2024
4da8a80
[release-1.3] chore(config): update changeset config (#2377)
openshift-cherrypick-robot Oct 17, 2024
72de84f
[release-1.3] chore(ci): ensure changeset PR has an update to date ya…
openshift-cherrypick-robot Oct 17, 2024
4040161
[release-1.3] chore(gh): fix release action priorities (#2385)
openshift-cherrypick-robot Oct 17, 2024
85357f8
[release-1.3] chore(changeset): add branch name on PR title (#2388)
openshift-cherrypick-robot Oct 17, 2024
da1677f
[release-1.3] chore(scripts): add packages:* scripts to the root pack…
openshift-cherrypick-robot Oct 18, 2024
68bcdb7
[release-1.3] chore(release): add lockfiles in release (#2395)
openshift-cherrypick-robot Oct 18, 2024
d573a77
chore(script): add export-dynamic:clean script
schultzp2020 Oct 18, 2024
e34db48
chore(deps): fix cli, bulk-import-backend and orchestrator-backend v…
kim-tsao Oct 22, 2024
4ad206e
fix(janus-idp/cli): [release-1.3] fixes issue with missing configSche…
openshift-cherrypick-robot Oct 22, 2024
9601b0a
chore(ci): backport ci changes to 1.3 (#2425)
schultzp2020 Oct 22, 2024
a47a45e
chore(release): version packages on release-1.3 branch (#2426)
janus-idp[bot] Oct 22, 2024
3bc6cc8
chore(ci): fix the issue where an argument for concurrency is supplie…
PatAKnight Oct 23, 2024
e02e4d5
chore(release): update RBAC to delivery bug fixes for RHDH 1.3.1 (#2375)
AndrienkoAleksandr Oct 23, 2024
1650b05
chore(release): backport keycloak fixes but without upgrade keycloak …
AndrienkoAleksandr Oct 23, 2024
067a744
[release-1.3] chore(gh): fix changeset version check (#2435)
openshift-cherrypick-robot Oct 23, 2024
6382e18
chore(release): version packages on release-1.3 branch (#2432)
janus-idp[bot] Oct 23, 2024
ed96bea
chore(release): revert the major update so that we can release under …
PatAKnight Oct 23, 2024
202e39a
chore(gh): add env vars to fix --affected
schultzp2020 Oct 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
15 changes: 15 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [],
"privatePackages": {
"tag": false,
"version": false
}
}
9 changes: 9 additions & 0 deletions .changeset/odd-onions-sort.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@janus-idp/backstage-plugin-keycloak-backend': patch
---

Provide keycloak-backend fixes:

- avoid undefined values for keycloak group members
- retrieve full list group members using pagination
- revert unexpected major upgrade of the keycloak backend plugin
2 changes: 2 additions & 0 deletions .changeset/unlucky-rings-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
37 changes: 7 additions & 30 deletions .github/actions/build/action.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,14 @@
name: Build all packages
description: Build all packages
name: Build packages
description: Build packages
inputs:
args:
description: Backstage CLI repo build arguments
default: '@janus-idp/*'
node-version:
description: Node.js version
required: true
default: '20'
default: --filter=@janus-idp/*

runs:
using: 'composite'
steps:
- name: Setup Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
with:
node-version: ${{ inputs.node-version }}
cache: 'yarn'

# already done when calling the actions/test/ action.
# - name: Setup local Turbo cache
# uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1

# already done when calling the actions/test/ action.
# - name: Install dependencies
# shell: bash
# run: |
# yarn install
# if [[ $(git diff --name-only . || true) ]]; then
# echo "After 'yarn install', workspace is dirty! The following files have changed:"
# echo
# git diff --name-only . || true
# fi

- name: Build all packages
- name: Build packages
shell: bash
run: yarn build --filter=${{ inputs.args }} --concurrency=1
run: |
yarn run build --concurrency=75% ${{ inputs.args }}
26 changes: 6 additions & 20 deletions .github/actions/test/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,14 @@ description: Test Node.js package
inputs:
args:
description: Backstage CLI repo build arguments
default: '@janus-idp/*'
node-version:
description: Node.js version
required: true
default: '20'
default: --filter=@janus-idp/*

runs:
using: 'composite'
steps:
- name: Setup Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
with:
node-version: ${{ inputs.node-version }}
cache: 'yarn'

- name: Setup local Turbo cache
uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1

- name: Install dependencies
- name: Check if workspace is dirty
shell: bash
run: |
yarn install
changed_files="$(git diff --name-only . || true)"
if [[ $changed_files ]]; then
echo "After 'yarn install', workspace is dirty! The following files have changed:"
Expand All @@ -35,15 +22,14 @@ runs:
echo
exit 42
fi

- name: Run prettier
shell: bash
run: yarn prettier:check
run: yarn prettier:check --concurrency=75% ${{ inputs.args }}

- name: Run lint
shell: bash
run: yarn lint --filter=${{ inputs.args }}
run: yarn run lint:check --concurrency=75% ${{ inputs.args }}

- name: Run tests
shell: bash
run: yarn test --filter=${{ inputs.args }}
run: yarn run test --concurrency=75% ${{ inputs.args }}
3 changes: 2 additions & 1 deletion .github/workflows/pr-playwright.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Playwright tests

on:
pull_request:
branches: [main]
branches:
- release-1.3

jobs:
changes:
Expand Down
69 changes: 61 additions & 8 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
name: Pull request
name: Pull Request

on: pull_request

env:
TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha }}
TURBO_SCM_HEAD: ${{ github.sha }}

# enforce only one action can run at a time for a given PR, and
# when updating a PR, actions in progress will be cancelled to start a fresh one
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Test-build with Node.js ${{ matrix.node-version }}
build:
name: Build with Node.js ${{ matrix.node-version }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -15,14 +25,57 @@ jobs:
with:
fetch-depth: 0

- name: Test
uses: ./.github/actions/test
- name: Setup Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
with:
args: '[HEAD^1]'
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'

- name: Build all packages
- name: Setup local Turbo cache
uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1

- name: Install dependencies
run: |
yarn install --frozen-lockfile

- name: Build packages
uses: ./.github/actions/build
with:
args: '[HEAD^1]'
args: --affected

test:
name: Test with Node.js ${{ matrix.node-version }}
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20]
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'

- name: Setup local Turbo cache
uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1

- name: Install dependencies
run: |
yarn install --frozen-lockfile

- name: Verify changesets
if: ${{ !(github.actor == 'janus-idp[bot]' || github.actor == 'github-actions[bot]') }}
run: |
yarn changeset status --since=${{ github.event.pull_request.base.sha }}

- name: Test packages
uses: ./.github/actions/test
with:
args: --affected
59 changes: 0 additions & 59 deletions .github/workflows/push.yaml

This file was deleted.

70 changes: 70 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Release Packages

on:
push:
branches:
- main
# TODO: Remove once 1.2.x is deprecated
- 1.2.x
- release-[0-9].[0-9]*

env:
TURBO_SCM_BASE: ${{ github.event.before }}
TURBO_SCM_HEAD: ${{ github.sha }}

# enforce only one release action per release branch at a time
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false

jobs:
release:
name: Release Packages
runs-on: ubuntu-latest
steps:
- name: Generate token
id: generate-token
uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
with:
app-id: ${{ vars.JANUS_IDP_GITHUB_APP_ID }}
private-key: ${{ secrets.JANUS_IDP_GITHUB_APP_PRIVATE_KEY }}

- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
token: ${{ steps.generate-token.outputs.token }}

- name: Setup Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
with:
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
shell: bash
run: |
yarn install --frozen-lockfile

- name: Creating .npmrc
run: |
cat << EOF > "$HOME/.npmrc"
//registry.npmjs.org/:_authToken=$NPM_TOKEN
EOF
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Create Release PR or Publish to NPM
id: changesets
uses: changesets/action@v1
with:
title: 'chore(release): version packages on ${{ github.ref_name }} branch'
commit: 'chore(release): version packages on ${{ github.ref_name }} branch'
version: yarn run packages:version
publish: yarn run packages:publish
env:
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
# we used to set 8G here but since the process often craps out, let's try 14G!
# https://stackoverflow.com/questions/48387040/how-do-i-determine-the-correct-max-old-space-size-for-node-js
NODE_OPTIONS: '--max-old-space-size=14336'
Loading
Loading