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: Fix handling unavailable services #3879

Merged
merged 54 commits into from
Nov 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2c5b153
draft of fixes (except evaluation of client certificate in the ZAAS)
pj892031 Oct 25, 2024
0c1ffe2
Merge remote-tracking branch 'origin/v3.x.x' into reboot/fix-zaas-res…
achmelo Oct 30, 2024
7d56ab9
handle exceptions in zaas and unexpected status codes in gateway
achmelo Oct 31, 2024
dfcf766
align passticket tests with updated status codes, remove invalid test
achmelo Oct 31, 2024
abf06aa
handle safid exceptions in the same way as passticket
achmelo Oct 31, 2024
1bedafd
when content type is omitted
achmelo Oct 31, 2024
a1a2c03
remove nested structure
achmelo Oct 31, 2024
92baceb
remove error controller
achmelo Oct 31, 2024
71a694c
return not_found handler
achmelo Nov 1, 2024
d5a1e89
test endpoint not_found
achmelo Nov 1, 2024
89d5fe7
add unit tests
achmelo Nov 1, 2024
cdcbb7c
test internal error and not found exception
achmelo Nov 1, 2024
e4491ef
Merge remote-tracking branch 'origin/v3.x.x' into reboot/fix-zaas-res…
achmelo Nov 1, 2024
326f337
remove duplicated exception handler for access denied
achmelo Nov 1, 2024
f9feac7
code review comments
achmelo Nov 1, 2024
4266392
include zaas IT in jacoco
achmelo Nov 1, 2024
5c3bb34
revert unauth handler
achmelo Nov 4, 2024
66af2e4
zaas debug level
achmelo Nov 4, 2024
93494eb
enabled debug logs
achmelo Nov 4, 2024
3487912
revert spring config location
achmelo Nov 4, 2024
fea3565
move profiles to jvm flags
achmelo Nov 4, 2024
1b2368a
don't need specific for package
achmelo Nov 4, 2024
3392030
use the same method for cert PK encoding
achmelo Nov 5, 2024
9c98390
test / code coverage
pj892031 Nov 5, 2024
8ce39c3
test / code coverage - 403
pj892031 Nov 5, 2024
147248d
tests / code coverage
pj892031 Nov 5, 2024
9ec6eb2
Merge branch 'v3.x.x' into reboot/fix-zaas-responses
pj892031 Nov 5, 2024
d9fa345
sonar
pj892031 Nov 5, 2024
f5c7881
remove unused field
pj892031 Nov 5, 2024
5922b66
javax x jakarta + replace missing error with an internal error
pj892031 Nov 5, 2024
037fdfe
fix + test misconfigured service
pj892031 Nov 5, 2024
506e5eb
consider server cert only
achmelo Nov 5, 2024
22bfbae
Merge remote-tracking branch 'origin/reboot/fix-zaas-responses' into …
achmelo Nov 5, 2024
6297bbe
check apiml cert in header too
achmelo Nov 5, 2024
3aae107
return sooner, mode info in the logs
achmelo Nov 5, 2024
cb811da
static definition for GitHub action
pj892031 Nov 6, 2024
7edf24d
styles and imports
achmelo Nov 6, 2024
29206be
update number of registered services in catalog
achmelo Nov 6, 2024
0bf4ac6
fix
pj892031 Nov 6, 2024
99989b6
Merge branch 'v3.x.x' into reboot/fix-unavailable-services
pj892031 Nov 6, 2024
c72d6e5
test fixes
pj892031 Nov 6, 2024
5c0ccac
fixes
pj892031 Nov 6, 2024
f99f74c
Merge branch 'v3.x.x' into reboot/fix-unavailable-services
pj892031 Nov 6, 2024
b71d3e7
fix ZAAS tests names
pj892031 Nov 6, 2024
7d1e3e7
fix test
pj892031 Nov 7, 2024
be8bcab
Merge branch 'v3.x.x' into reboot/fix-unavailable-services
pj892031 Nov 7, 2024
5111773
sonar - multiple times same message
pj892031 Nov 7, 2024
7b735d4
sonar - do not use non-serialized values
pj892031 Nov 7, 2024
a0ba2b8
Merge branch 'v3.x.x' into reboot/fix-unavailable-services
pj892031 Nov 7, 2024
37fe756
Merge branch 'v3.x.x' into reboot/fix-unavailable-services
pj892031 Nov 12, 2024
26710ec
Merge branch 'v3.x.x' into reboot/fix-unavailable-services
pj892031 Nov 13, 2024
21b0976
log messages to analyze error
pj892031 Nov 13, 2024
7b4952b
fix missing command curl
pj892031 Nov 13, 2024
a65e937
use curl just on failure and remove non-working service name in LogBack
pj892031 Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
enabled debug logs
Signed-off-by: ac892247 <[email protected]>
  • Loading branch information
achmelo committed Nov 4, 2024
commit 93494eb97493445c6a47910d0d0f664dd31dd138
6 changes: 3 additions & 3 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1487,8 +1487,8 @@ jobs:
path: GatewayProxy
- uses: actions/download-artifact@v4
with:
name: CITestsZaas-${{ env.JOB_ID }}
path: CITestsZaas
name: ContainerCITestsZaas-${{ env.JOB_ID }}
path: ContainerCITestsZaas
- uses: actions/download-artifact@v4
with:
name: CITestsWebSocketChaoticHA-${{ env.JOB_ID }}
@@ -1500,7 +1500,7 @@ jobs:

- name: Code coverage and publish results
run: >
./gradlew --info coverage sonar -Dresults="containercitests/results,citestswithinfinispan/results,GatewayProxy/results,citestswebsocketchaoticha/results,GatewayServiceRouting/results,CITestsZaas/results"
./gradlew --info coverage sonar -Dresults="containercitests/results,citestswithinfinispan/results,GatewayProxy/results,citestswebsocketchaoticha/results,GatewayServiceRouting/results,ContainerCITestsZaas/results"
-Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
env:
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
2 changes: 1 addition & 1 deletion gradle/jib.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ def setJib(componentName, javaAgentPort, debugPort) {
jib.to.image = imageName
jib.to.auth.username = project.hasProperty("zowe.docker.username") ? project.getProperty("zowe.docker.username") : ""
jib.to.auth.password = project.hasProperty("zowe.docker.password") ? project.getProperty("zowe.docker.password") : ""
jib.container.args = ['--spring.config.additional-location=file:/docker/' + componentName + '.yml', '--spring.profiles.include=dev,debug']
jib.container.args = ['-Dspring.config.additional-location=file:/docker/' + componentName + '.yml', '-Dspring.profiles.include=dev,debug']
jib.container.jvmFlags = javaAgentOptions + addOpensOptions
jib.extraDirectories.paths = ['../config', '../keystore', '../scripts']
}
Loading