Skip to content

Commit 4847387

Browse files
dlabrecqdlabrecq
committed
Merge remote-tracking branch 'origin/stage-hccm' into prod-hccm
2 parents 97d1800 + 6b81f04 commit 4847387

Some content is hidden

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

62 files changed

+576
-363
lines changed

‎.tekton/koku-ui-hccm-pull-request.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ spec:
175175
- name: name
176176
value: prefetch-dependencies
177177
- name: bundle
178-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:67b7b22cdc39f91d3c10979c6131de45680e7415fc86560f467332726a5fb9d2
178+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:873eddaa2dc612d86be4cb5559a4d3df6355054fc2b4e19351794be186824480
179179
- name: kind
180180
value: task
181181
resolver: bundles
@@ -220,7 +220,7 @@ spec:
220220
- name: name
221221
value: buildah
222222
- name: bundle
223-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:3979b5092fcd70598324b6d831024011ce3aa689d7cbd2bb94eddc1a3d539ea5
223+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:2fc54e80298db82e158f25acd6426d61d57da552bfb0d73507c9872cbc6250f0
224224
- name: kind
225225
value: task
226226
resolver: bundles
@@ -254,7 +254,7 @@ spec:
254254
- name: name
255255
value: build-image-index
256256
- name: bundle
257-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3411aeecdf045f8e61532abb88c28b7479cb8372420ac713f1f6756aa8fa843a
257+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
258258
- name: kind
259259
value: task
260260
resolver: bundles
@@ -572,7 +572,7 @@ spec:
572572
- name: name
573573
value: rpms-signature-scan
574574
- name: bundle
575-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:da66f14b1a3f2c2ec1e02a3183941ee4230ea4ac4a36515342c97bdb2fe905e0
575+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
576576
- name: kind
577577
value: task
578578
resolver: bundles

‎.tekton/koku-ui-hccm-push.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ spec:
172172
- name: name
173173
value: prefetch-dependencies
174174
- name: bundle
175-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:67b7b22cdc39f91d3c10979c6131de45680e7415fc86560f467332726a5fb9d2
175+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:873eddaa2dc612d86be4cb5559a4d3df6355054fc2b4e19351794be186824480
176176
- name: kind
177177
value: task
178178
resolver: bundles
@@ -217,7 +217,7 @@ spec:
217217
- name: name
218218
value: buildah
219219
- name: bundle
220-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:3979b5092fcd70598324b6d831024011ce3aa689d7cbd2bb94eddc1a3d539ea5
220+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:2fc54e80298db82e158f25acd6426d61d57da552bfb0d73507c9872cbc6250f0
221221
- name: kind
222222
value: task
223223
resolver: bundles
@@ -251,7 +251,7 @@ spec:
251251
- name: name
252252
value: build-image-index
253253
- name: bundle
254-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3411aeecdf045f8e61532abb88c28b7479cb8372420ac713f1f6756aa8fa843a
254+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
255255
- name: kind
256256
value: task
257257
resolver: bundles
@@ -569,7 +569,7 @@ spec:
569569
- name: name
570570
value: rpms-signature-scan
571571
- name: bundle
572-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:da66f14b1a3f2c2ec1e02a3183941ee4230ea4ac4a36515342c97bdb2fe905e0
572+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
573573
- name: kind
574574
value: task
575575
resolver: bundles

‎.tekton/koku-ui-ros-pull-request.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ spec:
175175
- name: name
176176
value: prefetch-dependencies
177177
- name: bundle
178-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:67b7b22cdc39f91d3c10979c6131de45680e7415fc86560f467332726a5fb9d2
178+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:873eddaa2dc612d86be4cb5559a4d3df6355054fc2b4e19351794be186824480
179179
- name: kind
180180
value: task
181181
resolver: bundles
@@ -220,7 +220,7 @@ spec:
220220
- name: name
221221
value: buildah
222222
- name: bundle
223-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:3979b5092fcd70598324b6d831024011ce3aa689d7cbd2bb94eddc1a3d539ea5
223+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:2fc54e80298db82e158f25acd6426d61d57da552bfb0d73507c9872cbc6250f0
224224
- name: kind
225225
value: task
226226
resolver: bundles
@@ -254,7 +254,7 @@ spec:
254254
- name: name
255255
value: build-image-index
256256
- name: bundle
257-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3411aeecdf045f8e61532abb88c28b7479cb8372420ac713f1f6756aa8fa843a
257+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
258258
- name: kind
259259
value: task
260260
resolver: bundles
@@ -572,7 +572,7 @@ spec:
572572
- name: name
573573
value: rpms-signature-scan
574574
- name: bundle
575-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:da66f14b1a3f2c2ec1e02a3183941ee4230ea4ac4a36515342c97bdb2fe905e0
575+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
576576
- name: kind
577577
value: task
578578
resolver: bundles

‎.tekton/koku-ui-ros-push.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ spec:
172172
- name: name
173173
value: prefetch-dependencies
174174
- name: bundle
175-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:67b7b22cdc39f91d3c10979c6131de45680e7415fc86560f467332726a5fb9d2
175+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:873eddaa2dc612d86be4cb5559a4d3df6355054fc2b4e19351794be186824480
176176
- name: kind
177177
value: task
178178
resolver: bundles
@@ -217,7 +217,7 @@ spec:
217217
- name: name
218218
value: buildah
219219
- name: bundle
220-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:3979b5092fcd70598324b6d831024011ce3aa689d7cbd2bb94eddc1a3d539ea5
220+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.6@sha256:2fc54e80298db82e158f25acd6426d61d57da552bfb0d73507c9872cbc6250f0
221221
- name: kind
222222
value: task
223223
resolver: bundles
@@ -251,7 +251,7 @@ spec:
251251
- name: name
252252
value: build-image-index
253253
- name: bundle
254-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3411aeecdf045f8e61532abb88c28b7479cb8372420ac713f1f6756aa8fa843a
254+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
255255
- name: kind
256256
value: task
257257
resolver: bundles
@@ -569,7 +569,7 @@ spec:
569569
- name: name
570570
value: rpms-signature-scan
571571
- name: bundle
572-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:da66f14b1a3f2c2ec1e02a3183941ee4230ea4ac4a36515342c97bdb2fe905e0
572+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
573573
- name: kind
574574
value: task
575575
resolver: bundles

‎apps/koku-ui-hccm/RELEASE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The release script will update app-interface with the latest SHA refs from the k
4747
### Release to app-interface
4848

4949
```
50-
sh ../../scripts/release-app-interface.sh -<p|s>
50+
sh ../../scripts/release-app-interface.sh [-p|-s]
5151
```
5252

5353
### Wrapper for all release and deployment functionality

‎apps/koku-ui-hccm/jest.config.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ const baseConfig = require('../../jest.config.base');
44
module.exports = {
55
...baseConfig,
66
roots: ['<rootDir>/src'],
7-
setupFiles: ['<rootDir>/test/testEnv.ts'],
7+
setupFiles: ['<rootDir>/test/testEnv.js'],
88
setupFilesAfterEnv: ['<rootDir>/test/jest.setup.js'],
9+
// Ensure no experimental SWC plugins break setup files
10+
transform: {
11+
'^.+\\.svg$': 'jest-transform-stub',
12+
'^.+\\.(ts|js)x?$': [
13+
'@swc/jest',
14+
{
15+
$schema: 'http://json.schemastore.org/swcrc',
16+
jsc: {
17+
parser: { jsx: true, syntax: 'typescript', tsx: true },
18+
transform: { react: { runtime: 'automatic' } },
19+
},
20+
},
21+
],
22+
},
923
};

‎apps/koku-ui-hccm/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
"@patternfly/react-icons": "6.4.0",
5959
"@patternfly/react-table": "6.4.0",
6060
"@patternfly/react-tokens": "6.4.0",
61-
"@redhat-cloud-services/frontend-components": "^7.0.12",
62-
"@redhat-cloud-services/frontend-components-notifications": "^6.1.13",
61+
"@redhat-cloud-services/frontend-components": "^7.0.13",
62+
"@redhat-cloud-services/frontend-components-notifications": "^6.1.14",
6363
"@redhat-cloud-services/frontend-components-translations": "^4.0.16",
6464
"@redhat-cloud-services/frontend-components-utilities": "^7.0.9",
6565
"@redhat-cloud-services/rbac-client": "^4.2.5",

‎apps/koku-ui-hccm/src/api/export/exportUtils.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
jest.mock('./exportUtils', () => ({
2+
__esModule: true,
3+
runExport: jest.fn(),
4+
}));
15
import { waitFor } from '@testing-library/react';
26
import { ReportPathsType, ReportType } from 'api/reports/report';
37

48
import * as exportUtils from './exportUtils';
59

6-
jest.spyOn(exportUtils, 'runExport');
10+
// runExport is a mocked function via jest.mock above
711

812
test('runExport API request for AWS', async () => {
913
exportUtils.runExport(ReportPathsType.aws, ReportType.cost, '');

‎apps/koku-ui-hccm/src/api/forecasts/forecastUtils.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
jest.mock('./forecastUtils', () => ({
2+
__esModule: true,
3+
runForecast: jest.fn(),
4+
}));
15
import { waitFor } from '@testing-library/react';
26

37
import { ForecastPathsType, ForecastType } from './forecast';
48
import * as forecastUtils from './forecastUtils';
59

6-
jest.spyOn(forecastUtils, 'runForecast');
10+
// runForecast is a mocked function via jest.mock above
711

812
test('runForecast API request for AWS', async () => {
913
forecastUtils.runForecast(ForecastPathsType.aws, ForecastType.cost, '');

‎apps/koku-ui-hccm/src/api/reports/reportUtils.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
jest.mock('./reportUtils', () => ({
2+
__esModule: true,
3+
runReport: jest.fn(),
4+
}));
15
import { waitFor } from '@testing-library/react';
26

37
import { ReportPathsType, ReportType } from './report';
48
import * as reportUtils from './reportUtils';
59

6-
jest.spyOn(reportUtils, 'runReport');
10+
// runReport is a mocked function via jest.mock above
711

812
test('runReport API request for AWS', async () => {
913
reportUtils.runReport(ReportPathsType.aws, ReportType.cost, '');

0 commit comments

Comments
 (0)