Skip to content

Commit 378332f

Browse files
SoLetsDevSoLetsDev
committed
fix merge conflicts to master. Ran early bound generator and gen-api
2 parents 0ed9f93 + 6cb29cf commit 378332f

File tree

371 files changed

+41390
-2204
lines changed

Some content is hidden

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

371 files changed

+41390
-2204
lines changed

‎.github/workflows/api-build.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ on:
1010
- src/**
1111
- "!src/ECER.Clients.RegistryPortal/**"
1212
- "!src/ECER.Clients.E2ETestData/**"
13+
- "!src/ECER.Clients.PSPPortal/**"
1314
- "!src/registry-portal.Dockerfile"
1415
- "!src/e2e-test-data.Dockerfile"
16+
- "!src/psp-portal.Dockerfile"
1517
- .github/workflows/api-build.yml
1618
- .github/workflows/build-template.yml
1719

@@ -20,8 +22,10 @@ on:
2022
- src/**
2123
- "!src/ECER.Clients.RegistryPortal/**"
2224
- "!src/ECER.Clients.E2ETestData/**"
23-
- "!src/registry-portal.Dockerfile"
25+
- "!src/ECER.Clients.PSPPortal/**"
26+
- "!src/registry-portal.Dockerfile"
2427
- "!src/e2e-test-data.Dockerfile"
28+
- "!src/psp-portal.Dockerfile"
2529
- .github/workflows/api-build.yml
2630
- .github/workflows/build-template.yml
2731

‎.github/workflows/build-template.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# https://github.com/aquasecurity/trivy-action
8181
- name: Run Trivy vulnerability scanner in repo mode
8282
if: github.event_name == 'pull_request'
83-
uses: aquasecurity/trivy-action@0.32.0
83+
uses: aquasecurity/trivy-action@0.33.1
8484
with:
8585
scan-type: "fs"
8686
ignore-unfixed: true
@@ -98,7 +98,7 @@ jobs:
9898
# https://github.com/aquasecurity/trivy-action
9999
- name: Run Trivy Scan on the created container
100100
if: github.event_name != 'pull_request'
101-
uses: aquasecurity/trivy-action@0.32.0
101+
uses: aquasecurity/trivy-action@0.33.1
102102
with:
103103
image-ref: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
104104
format: "sarif"

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
# Add any setup steps before running the `github/codeql-action/init` action.
4848
# This includes steps like installing compilers or runtimes (`actions/setup-node`
@@ -51,7 +51,7 @@ jobs:
5151
# uses: actions/setup-example@v1
5252

5353
- name: Initialize CodeQL
54-
uses: github/codeql-action/init@v3
54+
uses: github/codeql-action/init@v4
5555
with:
5656
languages: ${{ matrix.language }}
5757
build-mode: ${{ matrix.build-mode }}
@@ -79,6 +79,6 @@ jobs:
7979
exit 1
8080
8181
- name: Perform CodeQL Analysis
82-
uses: github/codeql-action/analyze@v3
82+
uses: github/codeql-action/analyze@v4
8383
with:
8484
category: "/language:${{matrix.language}}"

‎.github/workflows/deploy-to-dev.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
exit 1
4040
fi
4141
- name: Check out repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343
- name: Install oc
4444
uses: redhat-actions/openshift-tools-installer@v1
4545
with:
@@ -58,6 +58,7 @@ jobs:
5858
5959
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} --alias=true registry-portal:${{github.event.inputs.version}} registry-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
6060
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} --alias=true api:${{github.event.inputs.version}} api:${{env.APP_ENVIRONMENT_DESTINATION}}
61+
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} --alias=true psp-portal:${{github.event.inputs.version}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
6162
6263
# E2ETestData only exists in Dev and is used for automation testing, this will not exist in higher environments.
6364
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} --alias=true e2e-test-data:${{github.event.inputs.version}} e2e-test-data:${{env.APP_ENVIRONMENT_DESTINATION}}

‎.github/workflows/deploy-to-efxdev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
exit 1
4040
fi
4141
- name: Check out repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343
- name: Install oc
4444
uses: redhat-actions/openshift-tools-installer@v1
4545
with:

‎.github/workflows/deploy-to-efxtest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Check out repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
- name: Install oc
3131
uses: redhat-actions/openshift-tools-installer@v1
3232
with:

‎.github/workflows/deploy-to-prod.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Check out repository
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
- name: Install oc
3838
uses: redhat-actions/openshift-tools-installer@v1
3939
with:
@@ -52,9 +52,12 @@ jobs:
5252
#grabs the image sha for our input environments using jq
5353
API_IMAGE_SHA=$(oc get is api -o json | jq -r '.spec.tags[] | select(.name == "${{inputs.app_environment_source}}").from.name')
5454
REGISTRY_PORTAL_IMAGE_SHA=$(oc get is registry-portal -o json | jq -r '.spec.tags[] | select(.name == "${{inputs.app_environment_source}}").from.name')
55+
# PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{inputs.app_environment_source}}").from.name')
5556
5657
echo registry-portal image sha being promoted: $REGISTRY_PORTAL_IMAGE_SHA
5758
echo api image sha being promoted: $API_IMAGE_SHA
59+
# echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
5860
5961
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} registry-portal:${{inputs.app_environment_source}} registry-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
6062
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} api:${{inputs.app_environment_source}} api:${{env.APP_ENVIRONMENT_DESTINATION}}
63+
# oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{inputs.app_environment_source}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}

‎.github/workflows/deploy-to-test.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Check out repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
- name: Install oc
3131
uses: redhat-actions/openshift-tools-installer@v1
3232
with:
@@ -45,9 +45,12 @@ jobs:
4545
#grabs the image sha for our input environments using jq
4646
API_IMAGE_SHA=$(oc get is api -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
4747
REGISTRY_PORTAL_IMAGE_SHA=$(oc get is registry-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
48+
PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{inputs.app_environment_source}}").from.name')
4849
4950
echo registry-portal image sha being promoted: $REGISTRY_PORTAL_IMAGE_SHA
5051
echo api image sha being promoted: $API_IMAGE_SHA
52+
echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
5153
5254
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} registry-portal:${{env.APP_ENVIRONMENT_SOURCE}} registry-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
5355
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} api:${{env.APP_ENVIRONMENT_SOURCE}} api:${{env.APP_ENVIRONMENT_DESTINATION}}
56+
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{env.APP_ENVIRONMENT_SOURCE}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}

‎.github/workflows/deploy-to-uat.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Check out repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
- name: Install oc
3131
uses: redhat-actions/openshift-tools-installer@v1
3232
with:
@@ -45,9 +45,12 @@ jobs:
4545
#grabs the image sha for our input environments using jq
4646
API_IMAGE_SHA=$(oc get is api -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
4747
REGISTRY_PORTAL_IMAGE_SHA=$(oc get is registry-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
48+
PSP_PORTAL_IMAGE_SHA=$(oc get is psp-portal -o json | jq -r '.spec.tags[] | select(.name == "${{env.APP_ENVIRONMENT_SOURCE}}").from.name')
4849
4950
echo registry-portal image sha being promoted: $REGISTRY_PORTAL_IMAGE_SHA
5051
echo api image sha being promoted: $API_IMAGE_SHA
52+
echo psp-portal image sha being promoted: $PSP_PORTAL_IMAGE_SHA
5153
5254
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} registry-portal:${{env.APP_ENVIRONMENT_SOURCE}} registry-portal:${{env.APP_ENVIRONMENT_DESTINATION}}
5355
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} api:${{env.APP_ENVIRONMENT_SOURCE}} api:${{env.APP_ENVIRONMENT_DESTINATION}}
56+
oc tag -n ${{env.OPENSHIFT_NAMESPACE}} psp-portal:${{env.APP_ENVIRONMENT_SOURCE}} psp-portal:${{env.APP_ENVIRONMENT_DESTINATION}}

‎.github/workflows/e2e-test-data-build.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ on:
1010
- src/**
1111
- "!src/ECER.Clients.RegistryPortal/**"
1212
- "!src/ECER.Clients.Api/**"
13+
- "!src/ECER.Clients.PSPPortal/**"
1314
- "!src/registry-portal.Dockerfile"
1415
- "!src/api.Dockerfile"
16+
- "!src/psp-portal.Dockerfile"
1517
- .github/workflows/e2e-test-data-build.yml
1618
- .github/workflows/build-template.yml
1719

@@ -20,9 +22,11 @@ on:
2022
- src/**
2123
- "!src/ECER.Clients.RegistryPortal/**"
2224
- "!src/ECER.Clients.Api/**"
25+
- "!src/ECER.Clients.PSPPortal/**"
2326
- "!src/registry-portal.Dockerfile"
2427
- "!src/api.Dockerfile"
25-
- .github/workflows/e2e-test-data-build.yml
28+
- "!src/psp-portal.Dockerfile"
29+
- .github/workflows/e2e-test-build.yml
2630
- .github/workflows/build-template.yml
2731

2832
jobs:

0 commit comments

Comments
 (0)