Skip to content

Commit ce2f479

Browse files
author
Ole Martin Handeland
committed
Merge branch 'main' into bug/feedback-step
# Conflicts: # src/features/datamodel/DataModelsProvider.tsx # src/features/receipt/ReceiptContainer.tsx # src/hooks/navigation.ts # src/layout/Subform/SubformWrapper.tsx
2 parents 23221ca + 3c71375 commit ce2f479

File tree

117 files changed

+2974
-3815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2974
-3815
lines changed

‎.github/scripts/release.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ while [[ $# -gt 0 ]]; do
1717
shift # pop option
1818
shift # pop option
1919
;;
20-
--azure-sa-token)
21-
AZURE_STORAGE_ACCOUNT_TOKEN="$2"
22-
shift # pop option
23-
shift # pop option
24-
;;
2520
--azure-sync-cdn )
2621
SYNC_AZURE_CDN=yes
2722
shift #pop option
@@ -128,7 +123,7 @@ else
128123
else
129124
echo "Publishing files to azure cdn"
130125
fi
131-
azcopy sync "$TARGET" "$AZURE_TARGET_URI/toolkits${AZURE_STORAGE_ACCOUNT_TOKEN}" "${AZCOPY_TOOLKITS_OPTS[@]}" "${AZCOPY_ADDITIONAL_OPTS[@]}"
126+
azcopy sync "$TARGET" "$AZURE_TARGET_URI/toolkits" "${AZCOPY_TOOLKITS_OPTS[@]}" "${AZCOPY_ADDITIONAL_OPTS[@]}"
132127
echo "-------------------------------------"
133128
if [[ "$SYNC_AZURE_CDN" == "yes" && "$PRE_RELEASE" == "no" ]]; then
134129
bash ".github/scripts/purge-frontdoor-cache.sh" --path "/toolkits/altinn-app-frontend/$APP_MAJOR/*" --path "/toolkits/altinn-app-frontend/$APP_MAJOR_MINOR/*"

‎.github/scripts/revert.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ while [[ $# -gt 0 ]]; do
1717
shift # pop option
1818
shift # pop option
1919
;;
20-
--azure-sa-token)
21-
AZURE_STORAGE_ACCOUNT_TOKEN="$2"
22-
shift # pop option
23-
shift # pop option
24-
;;
2520
--azure-sync-cdn )
2621
SYNC_AZURE_CDN=yes
2722
shift #pop option
@@ -73,8 +68,8 @@ else
7368
else
7469
echo "Publishing files to azure cdn"
7570
fi
76-
azcopy sync "$AZURE_TARGET_URI/toolkits/$APP_FULL/${AZURE_STORAGE_ACCOUNT_TOKEN}" "$AZURE_TARGET_URI/toolkits/$APP_MAJOR/${AZURE_STORAGE_ACCOUNT_TOKEN}" "${AZCOPY_OPTS[@]}"
77-
azcopy sync "$AZURE_TARGET_URI/toolkits/$APP_FULL/${AZURE_STORAGE_ACCOUNT_TOKEN}" "$AZURE_TARGET_URI/toolkits/$APP_MAJOR_MINOR/${AZURE_STORAGE_ACCOUNT_TOKEN}" "${AZCOPY_OPTS[@]}"
71+
azcopy sync "$AZURE_TARGET_URI/toolkits/$APP_FULL/" "$AZURE_TARGET_URI/toolkits/$APP_MAJOR/" "${AZCOPY_OPTS[@]}"
72+
azcopy sync "$AZURE_TARGET_URI/toolkits/$APP_FULL/" "$AZURE_TARGET_URI/toolkits/$APP_MAJOR_MINOR/" "${AZCOPY_OPTS[@]}"
7873
echo "-------------------------------------"
7974
if [[ "$SYNC_AZURE_CDN" != "no" ]]; then
8075
bash ".github/scripts/purge-frontdoor-cache.sh" --path "/toolkits/altinn-app-frontend/$APP_MAJOR/*" --path "/toolkits/altinn-app-frontend/$APP_MAJOR_MINOR/*"

‎.github/scripts/sync-index.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ while [[ $# -gt 0 ]]; do
1212
shift # pop option
1313
shift # pop option
1414
;;
15-
--azure-sa-token)
16-
AZURE_STORAGE_ACCOUNT_TOKEN="$2"
17-
shift # pop option
18-
shift # pop option
19-
;;
2015
--azure-sync-cdn )
2116
SYNC_AZURE_CDN=yes
2217
shift #pop option
@@ -39,7 +34,7 @@ VERSION_REGEX="^[\d\.]+((?:-|.)[a-z0-9.\-]+)?$"
3934
mkdir -p "$TARGET"
4035

4136
echo "Updating index.json"
42-
azcopy ls "$AZURE_TARGET_URI/toolkits/${AZURE_STORAGE_ACCOUNT_TOKEN}" | \
37+
azcopy ls "$AZURE_TARGET_URI/toolkits/" | \
4338
cut -d/ -f 1 | \
4439
grep --perl-regexp "$VERSION_REGEX" | \
4540
sort --version-sort | \
@@ -53,7 +48,7 @@ if [[ "$SYNC_AZURE_CDN" == "no" ]]; then
5348
else
5449
echo "Publishing index to azure cdn"
5550
fi
56-
azcopy sync "$TARGET/index.json" "$AZURE_TARGET_URI/toolkits/index.json${AZURE_STORAGE_ACCOUNT_TOKEN}" "${AZCOPY_OPTS[@]}"
51+
azcopy sync "$TARGET/index.json" "$AZURE_TARGET_URI/toolkits/index.json" "${AZCOPY_OPTS[@]}"
5752
if [[ "$SYNC_AZURE_CDN" == "yes" ]]; then
5853
bash ".github/scripts/purge-frontdoor-cache.sh" --path "/toolkits/altinn-app-frontend/index.json"
5954
fi

‎.github/workflows/auto-backport.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
121121
- name: Create backport PR
122122
if: steps.cherry-pick.outputs.success == 'true'
123-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
123+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
124124
with:
125125
script: |
126126
const prNumber = context.payload.pull_request.number;
@@ -192,7 +192,7 @@ jobs:
192192
193193
- name: Comment on original PR (success)
194194
if: steps.cherry-pick.outputs.success == 'true'
195-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
195+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
196196
with:
197197
script: |
198198
const releaseBranch = '${{ steps.find-release-branch.outputs.release_branch }}';
@@ -220,7 +220,7 @@ jobs:
220220
221221
- name: Comment on original PR (conflicts)
222222
if: steps.cherry-pick.outputs.success == 'false'
223-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
223+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
224224
with:
225225
script: |
226226
const releaseBranch = '${{ steps.find-release-branch.outputs.release_branch }}';

‎.github/workflows/check-label-added.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check labels
11-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
11+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
1212
with:
1313
script: |
1414
const labels = context.payload.pull_request.labels;

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2727

2828
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
29+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3
3030
with:
3131
languages: ${{ matrix.language }}
3232
queries: +security-and-quality
3333

3434
- name: Autobuild
35-
uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
35+
uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3
3636

3737
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3
38+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3
3939
with:
4040
category: "/language:${{ matrix.language }}"

‎.github/workflows/pr-actions.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
publish:
77
name: Publish PR packages
88
runs-on: ubuntu-latest
9+
environment: test
910
if: github.event.issue.pull_request && contains(github.event.comment.body, '/publish')
1011
permissions:
1112
id-token: write
@@ -34,7 +35,7 @@ jobs:
3435
fetch-depth: 0
3536

3637
- name: install node
37-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
38+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3839
with:
3940
node-version: '22'
4041

@@ -93,6 +94,8 @@ jobs:
9394
working-directory: app-frontend
9495
if: '!env.ACT'
9596
env:
97+
AZCOPY_AUTO_LOGIN_TYPE: AZCLI
98+
AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID_FC }}
9699
FD_DOMAIN: ${{ vars.AZURE_DOMAIN_FC }}
97100
FD_ENDPOINT: ${{ vars.AZURE_ENDPOINT_FC }}
98101
FD_PROFILE: ${{ vars.AZURE_PROFILE_FC }}
@@ -102,12 +105,13 @@ jobs:
102105
--pre-release \
103106
--azure-sync-cdn \
104107
--azure-sa-name "${{ secrets.PRODUCTION_STORAGEACCOUNT_NAME }}" \
105-
--azure-sa-token "${{ secrets.PRODUCTION_ALTINN_CDN_SAS_TOKEN }}"
106108
107109
- name: Run sync-index script
108110
working-directory: app-frontend
109111
if: '!env.ACT'
110112
env:
113+
AZCOPY_AUTO_LOGIN_TYPE: AZCLI
114+
AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID_FC }}
111115
FD_DOMAIN: ${{ vars.AZURE_DOMAIN_FC }}
112116
FD_ENDPOINT: ${{ vars.AZURE_ENDPOINT_FC }}
113117
FD_PROFILE: ${{ vars.AZURE_PROFILE_FC }}
@@ -116,7 +120,6 @@ jobs:
116120
bash .github/scripts/sync-index.sh \
117121
--azure-sync-cdn \
118122
--azure-sa-name "${{ secrets.PRODUCTION_STORAGEACCOUNT_NAME }}" \
119-
--azure-sa-token "${{ secrets.PRODUCTION_ALTINN_CDN_SAS_TOKEN }}"
120123
121124
- name: Update PR comment - failure
122125
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3232

3333
- name: install node
34-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
34+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3535
with:
3636
node-version: '22'
3737

@@ -55,6 +55,8 @@ jobs:
5555
working-directory: app-frontend
5656
if: '!env.ACT && !github.event.release.prerelease'
5757
env:
58+
AZCOPY_AUTO_LOGIN_TYPE: AZCLI
59+
AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID_FC }}
5860
FD_DOMAIN: ${{ vars.AZURE_DOMAIN_FC }}
5961
FD_ENDPOINT: ${{ vars.AZURE_ENDPOINT_FC }}
6062
FD_PROFILE: ${{ vars.AZURE_PROFILE_FC }}
@@ -63,12 +65,13 @@ jobs:
6365
bash .github/scripts/release.sh \
6466
--azure-sync-cdn \
6567
--azure-sa-name "${{ secrets.PRODUCTION_STORAGEACCOUNT_NAME }}" \
66-
--azure-sa-token "${{ secrets.PRODUCTION_ALTINN_CDN_SAS_TOKEN }}"
6768
6869
- name: Run release script (pre-release)
6970
working-directory: app-frontend
7071
if: '!env.ACT && github.event.release.prerelease'
7172
env:
73+
AZCOPY_AUTO_LOGIN_TYPE: AZCLI
74+
AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID_FC }}
7275
FD_DOMAIN: ${{ vars.AZURE_DOMAIN_FC }}
7376
FD_ENDPOINT: ${{ vars.AZURE_ENDPOINT_FC }}
7477
FD_PROFILE: ${{ vars.AZURE_PROFILE_FC }}
@@ -78,12 +81,13 @@ jobs:
7881
--pre-release \
7982
--azure-sync-cdn \
8083
--azure-sa-name "${{ secrets.PRODUCTION_STORAGEACCOUNT_NAME }}" \
81-
--azure-sa-token "${{ secrets.PRODUCTION_ALTINN_CDN_SAS_TOKEN }}"
8284
8385
- name: Run sync-index script
8486
working-directory: app-frontend
8587
if: '!env.ACT'
8688
env:
89+
AZCOPY_AUTO_LOGIN_TYPE: AZCLI
90+
AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID_FC }}
8791
FD_DOMAIN: ${{ vars.AZURE_DOMAIN_FC }}
8892
FD_ENDPOINT: ${{ vars.AZURE_ENDPOINT_FC }}
8993
FD_PROFILE: ${{ vars.AZURE_PROFILE_FC }}
@@ -92,4 +96,3 @@ jobs:
9296
bash .github/scripts/sync-index.sh \
9397
--azure-sync-cdn \
9498
--azure-sa-name "${{ secrets.PRODUCTION_STORAGEACCOUNT_NAME }}" \
95-
--azure-sa-token "${{ secrets.PRODUCTION_ALTINN_CDN_SAS_TOKEN }}"

‎.github/workflows/revert.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
- name: Run roll back script
4444
working-directory: app-frontend
4545
env:
46+
AZCOPY_AUTO_LOGIN_TYPE: AZCLI
47+
AZCOPY_TENANT_ID: ${{ secrets.AZURE_TENANT_ID_FC }}
4648
FD_DOMAIN: ${{ vars.AZURE_DOMAIN_FC }}
4749
FD_ENDPOINT: ${{ vars.AZURE_ENDPOINT_FC }}
4850
FD_PROFILE: ${{ vars.AZURE_PROFILE_FC }}
@@ -52,4 +54,3 @@ jobs:
5254
--tag "${{ inputs.tag }}" \
5355
--azure-sync-cdn \
5456
--azure-sa-name "${{ secrets.PRODUCTION_STORAGEACCOUNT_NAME }}" \
55-
--azure-sa-token "${{ secrets.PRODUCTION_ALTINN_CDN_SAS_TOKEN }}"

‎.github/workflows/unit-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2727

2828
- name: install node
29-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
29+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3030
with:
3131
node-version: '22'
3232

@@ -66,7 +66,7 @@ jobs:
6666
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false)
6767
with:
6868
projectBaseDir: app-frontend
69-
uses: SonarSource/sonarqube-scan-action@8c71dc039c2dd71d3821e89a2b58ecc7fee6ced9 # v5.3.0
69+
uses: SonarSource/sonarqube-scan-action@1a6d90ebcb0e6a6b1d87e37ba693fe453195ae25 # v5.3.1
7070
env:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

0 commit comments

Comments
 (0)