diff --git a/Jenkinsfile b/Jenkinsfile index 6a890ee55f9b4da42250a4f8d52df5f4b5754fbb..c7ed6a9769ce1cdb53c35af4e2a103c6b9b39fc5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -173,7 +173,7 @@ pipeline { steps { script { FAILED_STAGE = env.STAGE_NAME - + if (env.BRANCH_NAME == 'master') { tagAndPushDockerImage('snapshot-latest') } @@ -357,7 +357,7 @@ Void setAnsibleKubeConfig() { } } -Void checkoutProvisioningRepo(String stage="") { +Void checkoutProvisioningRepo(String stage="") { withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { dir(stage) { sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/provisioning.git' @@ -469,7 +469,7 @@ Void rolloutKopStack(String bezeichner, String stage) { sh "ansible-playbook playbook/rollout.yml --extra-vars '${ansibleVars}'" } else { - sh "ansible-playbook playbooks/rollout.yml --extra-vars '${ansibleVars}'" + sh "ansible-playbook playbooks/rollout.yml --extra-vars '${ansibleVars}'" } } } @@ -623,7 +623,7 @@ String generateCypressConfig(String stage, String bezeichner, String testFolder) String getKeycloakUuid(realm, userName) { def shScript = """curl -H 'Content-Type: application/json' \ -H 'Authorization: bearer ${getKeycloakAccessToken()}' \ - 'https://sso.dev.ozg-sh.de/auth/admin/realms/${realm}/users' + 'https://sso.dev.ozg-sh.de/admin/realms/${realm}/users' """ def users = readJSON text: sh(script: shScript, returnStdout: true) @@ -637,7 +637,7 @@ String getKeycloakUuid(realm, userName) { String getKeycloakAccessToken() { withCredentials([usernamePassword(credentialsId: 'keycloak-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { - def token = readJSON text: sh (script: 'curl -d "client_id=admin-cli" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=password" "https://sso.dev.ozg-sh.de/auth/realms/master/protocol/openid-connect/token"', returnStdout: true) + def token = readJSON text: sh (script: 'curl -d "client_id=admin-cli" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=password" "https://sso.dev.ozg-sh.de/realms/master/protocol/openid-connect/token"', returnStdout: true) return token.access_token } @@ -689,7 +689,7 @@ Void setNewGoofyProvisioningVersion(String environment) { } Void pushNewProvisioningVersion(String environment) { - withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { + withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { dir('provisioning') { if (env.BRANCH_NAME == 'release') { sh 'git add playbook/inventory/versions/.' diff --git a/goofy-client/apps/goofy-e2e/deployment-values/goofy/ea-values.yaml b/goofy-client/apps/goofy-e2e/deployment-values/goofy/ea-values.yaml index 0f0c380e7742c42c4aac7aa8b20a3bdc2912690c..0f6ecd3614122acd9a52b86a3f1d50ae116d5076 100644 --- a/goofy-client/apps/goofy-e2e/deployment-values/goofy/ea-values.yaml +++ b/goofy-client/apps/goofy-e2e/deployment-values/goofy/ea-values.yaml @@ -1,5 +1,5 @@ sso: - serverUrl: 'https://sso.dev.ozg-sh.de/auth' + serverUrl: 'https://sso.dev.ozg-sh.de' role_einheitlicher_ansprechpartner: true apiPassword: "Goofy1234!" env: diff --git a/goofy-client/apps/goofy-e2e/deployment-values/goofy/values.yaml b/goofy-client/apps/goofy-e2e/deployment-values/goofy/values.yaml index cf6d7c3b88614b1b205cd616a46dc332303752a3..7d0546b348bc8b38f8dcfff86a0c8f9ab2ce40ce 100644 --- a/goofy-client/apps/goofy-e2e/deployment-values/goofy/values.yaml +++ b/goofy-client/apps/goofy-e2e/deployment-values/goofy/values.yaml @@ -1,5 +1,5 @@ sso: - serverUrl: 'https://sso.dev.ozg-sh.de/auth' + serverUrl: 'https://sso.dev.ozg-sh.de' apiPassword: "Goofy1234!" env: overrideSpringProfiles: 'oc, dev, e2e' diff --git a/goofy-client/apps/goofy-e2e/src/support/commands.ts b/goofy-client/apps/goofy-e2e/src/support/commands.ts index a33191831a614397a8a0f9f455f8d521b0accbc7..ba263264874790021ab647175aae78a647ca7172 100644 --- a/goofy-client/apps/goofy-e2e/src/support/commands.ts +++ b/goofy-client/apps/goofy-e2e/src/support/commands.ts @@ -91,5 +91,5 @@ Cypress.Commands.add('logout', () => { }) function getKeycloakBaseRealmUrl(): string { - return `${Cypress.env("keycloakUrl")}auth/realms/${Cypress.env("keycloakRealm")}/protocol/openid-connect`; + return `${Cypress.env("keycloakUrl")}realms/${Cypress.env("keycloakRealm")}/protocol/openid-connect`; } \ No newline at end of file diff --git a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-forwarding/historie-item-forwarding.component.scss b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-forwarding/historie-item-forwarding.component.scss index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..88b4601824135b3300b2d2d2ac6d23d02f2228f1 100644 --- a/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-forwarding/historie-item-forwarding.component.scss +++ b/goofy-client/libs/historie/src/lib/historie-container/historie-list/historie-item-forwarding/historie-item-forwarding.component.scss @@ -0,0 +1 @@ +@import "expansion-panel" \ No newline at end of file diff --git a/goofy-server/src/main/resources/application-dev.yml b/goofy-server/src/main/resources/application-dev.yml index f71d1f347383fc38d3c53afdf364e77620343977..2e7f1d297f8df38f021e38fc122988f2fb8745f5 100644 --- a/goofy-server/src/main/resources/application-dev.yml +++ b/goofy-server/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ goofy: production: false keycloak: - auth-server-url: https://sso.dev.ozg-sh.de/auth + auth-server-url: https://sso.dev.ozg-sh.de realm: sh-kiel-dev resource: sh-kiel-dev-goofy diff --git a/goofy-server/src/main/resources/application-local.yml b/goofy-server/src/main/resources/application-local.yml index e31341b5373e35f978cca6e7c4c24d3ea2bab468..1f643e5040ffad7609a2433621751996291a5ab8 100644 --- a/goofy-server/src/main/resources/application-local.yml +++ b/goofy-server/src/main/resources/application-local.yml @@ -7,7 +7,7 @@ goofy: production: false keycloak: - auth-server-url: http://localhost:8088/auth + auth-server-url: http://localhost:8088 realm: sh-kiel-dev resource: sh-kiel-dev-goofy diff --git a/goofy-server/src/main/resources/application-remotekc.yml b/goofy-server/src/main/resources/application-remotekc.yml index cbb41bc7bb27c0611aaf8ba29b14155d2d856d30..a9c24daa3d8cf653c70c5e9700fae348d1cc5882 100644 --- a/goofy-server/src/main/resources/application-remotekc.yml +++ b/goofy-server/src/main/resources/application-remotekc.yml @@ -1,6 +1,6 @@ -keycloak: - auth-server-url: https://sso.dev.ozg-sh.de/auth +keycloak: realm: sh-kiel-dev resource: sh-kiel-dev-goofy public-client: true - use-resource-role-mappings: true \ No newline at end of file + use-resource-role-mappings: true + auth-server-url: https://sso.dev.ozg-sh.de diff --git a/goofy-server/src/main/resources/application.yml b/goofy-server/src/main/resources/application.yml index d3927e0d996b674e8431d90c8c7d774b2c4d37a4..00842e7511ea9615f6381b0632bf33e64b0f560f 100644 --- a/goofy-server/src/main/resources/application.yml +++ b/goofy-server/src/main/resources/application.yml @@ -52,7 +52,7 @@ goofy: production: true keycloak: - auth-server-url: http://localhost:8088/auth + auth-server-url: http://localhost:8088 realm: sh-kiel-dev resource: sh-kiel-dev-goofy public-client: true