Skip to content

Commit

Permalink
refactor(jans-client-api): remove jans-client-api project #2582 (#2597)
Browse files Browse the repository at this point in the history
* chore(jans-client-api): removed jans-client-api project #2582

#2582

* ci: remove client-api from workflows and automation

* refactor: remove docker-client-api folder(project)

* refactor: remove client api from docker-monolith

* refactor: remove client-api from helm chart

* chore(jans-config-api): removed jans-client-api dependency

* refactor: remove client-api from docker-jans-certmanager

* refactor: remove client-api from docker-jans-configurator

* docs: removed client-api docs files

* docs: removing references to removed client-api

* fix: jans-linux-setup remove Config-API installation

Co-authored-by: moabu <47318409+moabu@users.noreply.github.com>
Co-authored-by: shmorri <sam@gluu.org>
Co-authored-by: Mustafa Baser <mbaser@mail.com>
  • Loading branch information
4 people authored Oct 17, 2022
1 parent 6b82e9a commit e74ea8e
Show file tree
Hide file tree
Showing 506 changed files with 43 additions and 56,521 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
/jans-auth-server/ @yurem @yuriyz
/jans-fido2/ @yurem
/jans-scim/ @jgomer2001
/jans-client-api/ @jmunozherbas @yuriyz
/jans-config-api/ @pujavs @yuriyz
/jans-cli/ @devrimyatar
/jans-linux-setup/ @devrimyatar @smansoft @yuriyz
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build-wars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- 'jans-notify/**'
- 'jans-orm/**'
- 'jans-scim/**'
- 'jans-client-api/**'

push:
branches:
Expand All @@ -31,7 +30,6 @@ on:
- 'jans-notify/**'
- 'jans-orm/**'
- 'jans-scim/**'
- 'jans-client-api/**'
jobs:
build:
name: Build wars
Expand All @@ -40,7 +38,7 @@ jobs:
strategy:
max-parallel: 11
matrix:
fldrpath: ['jans-bom','agama','jans-fido2','jans-core','jans-eleven','jans-notify','jans-auth-server','jans-orm','jans-config-api','jans-scim','jans-client-api']
fldrpath: ['jans-bom','agama','jans-fido2','jans-core','jans-eleven','jans-notify','jans-auth-server','jans-orm','jans-config-api','jans-scim']
steps:
- name : Variables
run: |
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/central_code_quality_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:
- 'jans-auth-server/**'
- 'jans-orm/**'
- 'jans-config-api/**'
- 'jans-client-api/**'
- 'jans-scim/**'
- 'jans-core/**'
- 'jans-notify/**'
Expand All @@ -36,7 +35,6 @@ on:
- 'jans-auth-server/**'
- 'jans-orm/**'
- 'jans-config-api/**'
- 'jans-client-api/**'
- 'jans-scim/**'
- 'jans-core/**'
- 'jans-notify/**'
Expand All @@ -58,13 +56,12 @@ jobs:
strategy:
fail-fast: false
matrix:
module: [jans-auth-server, agama, jans-config-api, jans-core, jans-linux-setup, jans-cli, jans-client-api, jans-fido2, jans-notify, jans-orm, jans-scim, jans-eleven, jans-pycloudlib]
module: [jans-auth-server, agama, jans-config-api, jans-core, jans-linux-setup, jans-cli, jans-fido2, jans-notify, jans-orm, jans-scim, jans-eleven, jans-pycloudlib]
env:
JVM_PROJECTS: |
jans-auth-server
jans-orm
jans-config-api
jans-client-api
jans-scim
jans-core
jans-notify
Expand Down Expand Up @@ -142,8 +139,6 @@ jobs:
case ${{ matrix.module }} in
"jans-auth-server")
;&
"jans-client-api")
;&
"jans-scim")
;&
"jans-eleven")
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker_build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ on:
workflow_dispatch:
inputs:
services:
description: 'One or set of the docker images. Format as following: "docker-jans-auth-server docker-jans-certmanager docker-jans-client-api docker-jans-config-api docker-jans-configurator docker-jans-fido2 docker-jans-persistence-loader docker-jans-scim docker-jans-monolith"'
description: 'One or set of the docker images. Format as following: "docker-jans-auth-server docker-jans-certmanager docker-jans-config-api docker-jans-configurator docker-jans-fido2 docker-jans-persistence-loader docker-jans-scim docker-jans-monolith"'
required: true
default: 'docker-jans-auth-server docker-jans-certmanager docker-jans-client-api docker-jans-config-api docker-jans-configurator docker-jans-fido2 docker-jans-persistence-loader docker-jans-scim docker-jans-monolith'
default: 'docker-jans-auth-server docker-jans-certmanager docker-jans-config-api docker-jans-configurator docker-jans-fido2 docker-jans-persistence-loader docker-jans-scim docker-jans-monolith'
cn_version:
description: 'The war version to build the image off'
required: false
Expand All @@ -49,7 +49,7 @@ jobs:
strategy:
max-parallel: 8
matrix:
docker-images: ["auth-server", "certmanager", "config-api", "client-api", "configurator", "fido2", "persistence-loader", "scim", "monolith"]
docker-images: ["auth-server", "certmanager", "config-api", "configurator", "fido2", "persistence-loader", "scim", "monolith"]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -63,7 +63,7 @@ jobs:
DEFAULT_ALL=${{ github.event.inputs.services }}
if [ -z "$DEFAULT_ALL" ]
then
DEFAULT_ALL="docker-jans-auth-server docker-jans-certmanager docker-jans-client-api docker-jans-config-api docker-jans-configurator docker-jans-fido2 docker-jans-persistence-loader docker-jans-scim docker-jans-monolith"
DEFAULT_ALL="docker-jans-auth-server docker-jans-certmanager docker-jans-config-api docker-jans-configurator docker-jans-fido2 docker-jans-persistence-loader docker-jans-scim docker-jans-monolith"
else
echo "$DEFAULT_ALL"
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_imagescan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
docker-images: ["auth-server", "certmanager", "config-api", "client-api", "configurator", "fido2", "persistence-loader", "scim", "monolith"]
docker-images: ["auth-server", "certmanager", "config-api", "configurator", "fido2", "persistence-loader", "scim", "monolith"]
steps:
- uses: actions/checkout@v3
- name: Build the Container image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jans_pycloud_build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
if: github.actor != 'mo-auto'
id: build_stable_reqs
run: |
dockerimages="auth-server certmanager client-api config-api configurator fido2 persistence-loader scim"
dockerimages="auth-server certmanager config-api configurator fido2 persistence-loader scim"
for image in $dockerimages; do
sed -i '/git+https/c\git+https://github.com/${{ github.repository }}@${{ github.sha }}#egg=jans-pycloudlib&subdirectory=jans-pycloudlib' ./docker-jans-$image/requirements.txt
done
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
#max-parallel: 1
fail-fast: false
matrix:
maven: [ "jans-scim", "jans-orm", "jans-notify", "jans-fido2", "jans-eleven", "jans-core", "jans-config-api", "jans-client-api", "jans-bom", "jans-auth-server", "agama" ]
maven: [ "jans-scim", "jans-orm", "jans-notify", "jans-fido2", "jans-eleven", "jans-core", "jans-config-api", "jans-bom", "jans-auth-server", "agama" ]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
#max-parallel: 1
fail-fast: false
matrix:
simple: [ "docker-jans-auth-server", "docker-jans-certmanager", "docker-jans-config-api", "docker-jans-client-api", "docker-jans-configurator", "docker-jans-fido2", "docker-jans-persistence-loader", "docker-jans-scim", "docker-jans-monolith" ]
simple: [ "docker-jans-auth-server", "docker-jans-certmanager", "docker-jans-config-api", "docker-jans-configurator", "docker-jans-fido2", "docker-jans-persistence-loader", "docker-jans-scim", "docker-jans-monolith" ]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
8 changes: 2 additions & 6 deletions automation/analyze_test_microk8s_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ collect_logs() {
echo "Found $POD_NAME built on $BUILD"
t=0
while true; do
if [[ $SERVICE == "client-api" ]];then
kubectl cp -n jans "$POD_NAME":opt/client-api/logs/ jans-"$SERVICE"-logs && zip -r jans-"$SERVICE"-logs-"$DATE".zip jans-"$SERVICE"-logs && rm -rf jans-"$SERVICE"-logs/ && t=120 || t=$(( t + 60 ))
else
kubectl cp -n jans "$POD_NAME":opt/jans/jetty/jans-"$SERVICE"/logs jans-"$SERVICE"-logs && zip -r jans-"$SERVICE"-logs-"$DATE".zip jans-"$SERVICE"-logs && rm -rf jans-"$SERVICE"-logs/ && t=120 || t=$(( t + 60 ))
fi
kubectl cp -n jans "$POD_NAME":opt/jans/jetty/jans-"$SERVICE"/logs jans-"$SERVICE"-logs && zip -r jans-"$SERVICE"-logs-"$DATE".zip jans-"$SERVICE"-logs && rm -rf jans-"$SERVICE"-logs/ && t=120 || t=$(( t + 60 ))
if [[ $t == 120 ]];then
break
else
Expand All @@ -46,7 +42,7 @@ echo "--------------------------------------Outputting configurator logs--------
kubectl logs -l APP_NAME=configurator -c config -n jans
echo "--------------------------------------------------------------------------------------------------------------"

SERVICES="auth-server client-api fido2 scim"
SERVICES="auth-server fido2 scim"
for SERVICE in $SERVICES; do
kubectl -n jans wait --for=condition=available --timeout=30s deploy/janssen-"$SERVICE" || collect_logs "${SERVICE%-server}" "$1" "$2" "$3"
done
18 changes: 0 additions & 18 deletions automation/github-labels/labels-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@
"title-prefixes": []
}
},
"comp-docker-jans-client-api": {
"color": "0052CC",
"description": "Touching folder /docker-jans-client-api",
"auto-label": {
"branch": "",
"paths": ["docker-jans-client-api"],
"title-prefixes": []
}
},
"comp-docker-jans-config-api": {
"color": "0052CC",
"description": "Touching folder /docker-jans-config-api",
Expand Down Expand Up @@ -170,15 +161,6 @@
"title-prefixes": []
}
},
"comp-jans-client-api": {
"color": "0052CC",
"description": "Touching folder /jans-client-api",
"auto-label": {
"branch": "",
"paths": ["jans-client-api"],
"title-prefixes": []
}
},
"comp-jans-config-api": {
"color": "0052CC",
"description": "Touching folder /jans-config-api",
Expand Down
52 changes: 0 additions & 52 deletions automation/rancher-partner-charts/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,6 @@ questions:
required: true
label: Enable SCIM
description: "System for Cross-domain Identity Management (SCIM) version 2.0"
- variable: global.client-api.enabled
default: false
type: boolean
group: "Optional Services"
required: true
label: Enable ClientAPI
description: "Middleware API to help application developers call an OAuth, OpenID or UMA server. You may wonder why this is necessary. It makes it easier for client developers to use OpenID signing and encryption features, without becoming crypto experts. This API provides some high level endpoints to do some of the heavy lifting."
show_subquestion_if: true
subquestions:
- variable: config.configmap.cnClientApiCertCn
default: "client-api"
description: "Client API CommonName value for certificate subject"
type: string
label: Client API certificate CommonName (CN)

# ======================
# Test environment group
Expand Down Expand Up @@ -574,35 +560,6 @@ questions:
label: Auth Server KeyRotation image tag
group: "Images"
show_if: "global.auth-server-key-rotation.enabled=true"
# ClientAPI
- variable: client-api.image.repository
required: true
type: string
default: "janssenproject/client-api"
description: "The ClientAPI Image repository"
label: ClientAPI image repo
group: "Images"
show_if: "global.client-api.enabled=true"
- variable: client-api.image.pullPolicy
required: true
type: enum
group: "Images"
default: IfNotPresent
description: "The ClientAPI Image pull policy"
label: ClientAPI imagePullPolicy
options:
- "Always"
- "IfNotPresent"
- "Never"
show_if: "global.client-api.enabled=true"
- variable: client-api.image.tag
required: true
type: string
default: "1.0.1-1"
description: "The ClientAPI Image tag"
label: ClientAPI image tag
group: "Images"
show_if: "global.client-api.enabled=true"
# Configurator
- variable: config.image.repository
required: true
Expand Down Expand Up @@ -790,15 +747,6 @@ questions:
label: Auth-server Replicas
description: "Service replica number."
show_if: "global.auth-server.enabled=true"
# ClientAPI
- variable: client-api.replicas
default: 1
required: false
type: int
group: "Replicas"
label: ClientAPI Replicas
description: "Service replica number."
show_if: "global.client-api.enabled=true"
# ConfigAPI
- variable: config-api.replicas
default: 1
Expand Down
5 changes: 0 additions & 5 deletions automation/startjanssendemo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ global:
scriptLogLevel: "$LOG_LEVEL"
auditStatsLogTarget: "$LOG_TARGET"
auditStatsLogLevel: "$LOG_LEVEL"
client-api:
enabled: true
appLoggers:
clientApiLogTarget: "$LOG_TARGET"
clientApiLogLevel: "$LOG_LEVEL"
config-api:
enabled: true
appLoggers:
Expand Down
3 changes: 0 additions & 3 deletions charts/janssen/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ dependencies:
- name: auth-server-key-rotation
condition: global.auth-server-key-rotation.enabled
version: 1.0.3-dev
- name: client-api
condition: global.client-api.enabled
version: 1.0.3-dev
- name: persistence
condition: global.persistence.enabled
version: 1.0.3-dev
Loading

0 comments on commit e74ea8e

Please sign in to comment.