From a5bc7c4ce4aa7b36e12125e6f0c5019c734b3fcb Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 11:52:19 +0200 Subject: [PATCH 1/8] token change --- .github/workflows/publish-backstage-plugin-package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index 5cbd4a0..1a2f6e2 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -57,7 +57,7 @@ jobs: yarn version --new-version ${{ steps.gitversion.outputs.fullSemVer }} --no-git-tag-version yarn publish --non-interactive --tag pr env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Publish to GHCR if: github.event_name == 'release' @@ -67,4 +67,4 @@ jobs: sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn publish --non-interactive env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From 5538f2d852c0af8a5365b95a17638738be3e2799 Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 11:55:45 +0200 Subject: [PATCH 2/8] token update --- .github/workflows/publish-backstage-plugin-package.yaml | 4 ++-- .../components/DashboardComponent/BenchmarkGridItem.test.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index 1a2f6e2..64bf487 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -57,7 +57,7 @@ jobs: yarn version --new-version ${{ steps.gitversion.outputs.fullSemVer }} --no-git-tag-version yarn publish --non-interactive --tag pr env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} - name: Publish to GHCR if: github.event_name == 'release' @@ -67,4 +67,4 @@ jobs: sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn publish --non-interactive env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} diff --git a/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx b/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx index 8d0d8ff..ec6967a 100644 --- a/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx +++ b/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx @@ -38,7 +38,7 @@ describe('BenchmarkGridItem', () => { expect(queryByText('3 deployment days per week(elite)')).not.toBeNull(); }); - it('should show the error returned from the service', async () => { + it('should show the error returned from the services', async () => { server.use( rest.get(benchmarkUrl, (_, res, ctx) => { return res(ctx.status(401)); From 7fe4734e333468c129ddb4d7f70eed422e531085 Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 11:58:51 +0200 Subject: [PATCH 3/8] Revert --- .github/workflows/publish-backstage-plugin-package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index 64bf487..eb87fa7 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -57,7 +57,7 @@ jobs: yarn version --new-version ${{ steps.gitversion.outputs.fullSemVer }} --no-git-tag-version yarn publish --non-interactive --tag pr env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Publish to GHCR if: github.event_name == 'release' @@ -67,4 +67,4 @@ jobs: sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn publish --non-interactive env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 8dc4e660c50cf785b05d42fe88a68ce173e6ab4c Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 12:05:25 +0200 Subject: [PATCH 4/8] Testing new token --- .github/workflows/publish-backstage-plugin-package.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index eb87fa7..50ad13e 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -24,7 +24,7 @@ jobs: node-version: 18.x cache: "yarn" cache-dependency-path: backstage-plugin/yarn.lock - registry-url: https://npm.pkg.github.com/ + registry-url: https://registry.npmjs.org always-auth: true - name: Install dependencies @@ -57,7 +57,7 @@ jobs: yarn version --new-version ${{ steps.gitversion.outputs.fullSemVer }} --no-git-tag-version yarn publish --non-interactive --tag pr env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Publish to GHCR if: github.event_name == 'release' @@ -67,4 +67,4 @@ jobs: sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn publish --non-interactive env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From eb13f3b842ef9dffc28c626537b167afdd8469e5 Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 12:08:24 +0200 Subject: [PATCH 5/8] new token --- .github/workflows/publish-backstage-plugin-package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index 50ad13e..92a941e 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -57,7 +57,7 @@ jobs: yarn version --new-version ${{ steps.gitversion.outputs.fullSemVer }} --no-git-tag-version yarn publish --non-interactive --tag pr env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} - name: Publish to GHCR if: github.event_name == 'release' @@ -67,4 +67,4 @@ jobs: sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn publish --non-interactive env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} From ec7e7b07eb3c26f6932b34b9d17ebb935684f070 Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 12:10:42 +0200 Subject: [PATCH 6/8] removign dash --- .github/workflows/publish-backstage-plugin-package.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index 92a941e..56d0ab4 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -53,7 +53,6 @@ jobs: working-directory: backstage-plugin/plugins/open-dora run: | # Replace the @devoteam-nl with @devoteamnl in package.json - sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn version --new-version ${{ steps.gitversion.outputs.fullSemVer }} --no-git-tag-version yarn publish --non-interactive --tag pr env: @@ -64,7 +63,6 @@ jobs: working-directory: backstage-plugin/plugins/open-dora run: | # Replace the @devoteam-nl with @devoteamnl in package.json - sed -i 's/"@devoteam-nl\//"@devoteamnl\//g' package.json yarn publish --non-interactive env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_APR_2024 }} From d02e5ea534dfb000677b2d5fe24d15ef191dea7b Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 12:19:22 +0200 Subject: [PATCH 7/8] adding scope --- .github/workflows/publish-backstage-plugin-package.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-backstage-plugin-package.yaml b/.github/workflows/publish-backstage-plugin-package.yaml index 56d0ab4..a66c653 100644 --- a/.github/workflows/publish-backstage-plugin-package.yaml +++ b/.github/workflows/publish-backstage-plugin-package.yaml @@ -26,6 +26,7 @@ jobs: cache-dependency-path: backstage-plugin/yarn.lock registry-url: https://registry.npmjs.org always-auth: true + scope: "@devoteam-nl" - name: Install dependencies run: yarn install --frozen-lockfile From f9130304ab69b72e140fdc83d16ef9032b9d59ed Mon Sep 17 00:00:00 2001 From: DJ Date: Fri, 19 Apr 2024 12:23:09 +0200 Subject: [PATCH 8/8] Cache test --- .../components/DashboardComponent/BenchmarkGridItem.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx b/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx index ec6967a..6efb245 100644 --- a/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx +++ b/backstage-plugin/plugins/open-dora/src/components/DashboardComponent/BenchmarkGridItem.test.tsx @@ -38,7 +38,7 @@ describe('BenchmarkGridItem', () => { expect(queryByText('3 deployment days per week(elite)')).not.toBeNull(); }); - it('should show the error returned from the services', async () => { + it('should show the error returned from the servicess', async () => { server.use( rest.get(benchmarkUrl, (_, res, ctx) => { return res(ctx.status(401));