...
 
Commits (2)
......@@ -69,9 +69,9 @@ include:
- "RDS/circle1_adapters_and_ports/port_zenodo/.gitlab-ci.yml"
- "RDS/circle1_adapters_and_ports/port_owncloud/.gitlab-ci.yml"
- "RDS/circle2_use_cases/exporter/.gitlab-ci.yml"
- "RDS/circle2_use_cases/token_service/.gitlab-ci.yml"
- "RDS/circle2_use_cases/port_service/.gitlab-ci.yml"
- "RDS/circle2_use_cases/metadata/.gitlab-ci.yml"
- "RDS/circle3_central_services/token_service/.gitlab-ci.yml"
- "RDS/circle3_central_services/port_service/.gitlab-ci.yml"
- "RDS/circle3_central_services/research_manager/.gitlab-ci.yml"
# All available Hugo versions are listed here: https://gitlab.com/pages/hugo/container_registry
......
......@@ -8,7 +8,7 @@ logger = logging.getLogger()
def loadAccessToken(userId: str, service: str):
tokenStorageURL = os.getenv(
"USE_CASE_SERVICE_TOKEN_SERVICE", "http://localhost:3000")
"USE_CASE_SERVICE_PORT_SERVICE", "http://localhost:3000")
# load access token from token-storage
result = requests.get(
f"{tokenStorageURL}/user/{userId}/service/{service}")
......
......@@ -26,5 +26,5 @@ loc: dev
doc: dev
pydocmd build
mv _build/pydocmd/token-service.md ../../../docs/content/doc/impl/use-cases/token-service-docstring.md
mv _build/pydocmd/port-service.md ../../../docs/content/doc/impl/use-cases/port-service-docstring.md
rm -r _build
\ No newline at end of file
......@@ -11,7 +11,7 @@ logger = logging.getLogger()
def loadAccessToken(userId: str, service: str) -> str:
# FIXME make localhost dynamic for pactman
tokenStorageURL = os.getenv(
"USE_CASE_SERVICE_TOKEN_SERVICE", "http://localhost:3000")
"USE_CASE_SERVICE_PORT_SERVICE", "http://localhost:3000")
# load access token from token-storage
result = requests.get(
f"{tokenStorageURL}/user/{userId}/service/{service}")
......
......@@ -26,7 +26,7 @@ loc: dev
doc: dev
pydocmd build
mv _build/pydocmd/token-service.md ../../../docs/content/doc/impl/use-cases/token-service-docstring.md
mv _build/pydocmd/port-service.md ../../../docs/content/doc/impl/use-cases/port-service-docstring.md
rm -r _build
......@@ -6,7 +6,7 @@ logger = logging.getLogger()
def loadAccessToken(userId: str, service: str):
tokenStorageURL = os.getenv(
"USE_CASE_SERVICE_TOKEN_SERVICE", "http://localhost:3000")
"USE_CASE_SERVICE_PORT_SERVICE", "http://localhost:3000")
# load access token from token-storage
result = requests.get(
f"{tokenStorageURL}/user/{userId}/service/{service}")
......
.use_case_port_service:
variables:
FOLDER: RDS/circle2_use_cases/port_service
.tests_use_case_port_service:
extends:
- .tests
- .use_case_port_service
test:use_case_port_service3.6:
image: python:3.6
extends: .tests_use_case_port_service
test:use_case_port_service3.7:
image: python:3.7
extends: .tests_use_case_port_service
test:use_case_port_service3.8:
image: python:3.8
extends: .tests_use_case_port_service
build:use_case_port_service:
extends:
- .builds
- .use_case_port_service
only:
changes:
- RDS/circle2_use_cases/port_service/*
- RDS/circle2_use_cases/port_service/**/*
......@@ -26,7 +26,7 @@ loc: dev
doc: dev
pydocmd build
mv _build/pydocmd/token-service.md ../../../docs/content/doc/impl/central/token-service-docstring.md
mv _build/pydocmd/port-service.md ../../../docs/content/doc/impl/use-cases/port-service-docstring.md
rm -r _build
......@@ -10,7 +10,7 @@ RUN pip install -r requirements.txt
ENV CENTRAL-SERVICE_TOKEN-STORAGE "http://circle3-token-storage"
ADD "https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle2_use_cases/token_service/use-case_token-storage.yml" ./
ADD "https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle2_use_cases/port_service/use-case_token-storage.yml" ./
# now add everything else, which changes often
ADD src ./
......
......@@ -5,7 +5,7 @@ site_name: "My Documentation"
# is a tree of Python member names (modules, classes, etc.) that should be
# documented. Higher indentation leads to smaller header size.
generate:
- token-service.md:
- port-service.md:
- TokenService:
- lib.User++
- lib.Token++
......@@ -18,7 +18,7 @@ generate:
# that allows you to use an external Markdown file (eg. your project's README)
# in the documentation. The path must be relative to current working directory.
pages:
- Home: token-service.md
- Home: port-service.md
headers: markdown
......
......@@ -22,7 +22,7 @@ def bootstrap(name='MicroService', *args, **kwargs):
from lib.TokenService import TokenService
list_openapi = Util.load_oai("use-case_token-storage.yml")
list_openapi = Util.load_oai("use-case_port.yml")
if "testing" in kwargs:
ServerUtil.tokenService = TokenService(kwargs["testing"])
......
......@@ -30,7 +30,7 @@ def index():
# state is base64 for dict:
# {
# "user": <user id for logged user account in interface>,
# "jwt": <state jwt from token-service system>
# "jwt": <state jwt from port-service system>
# }
if code is None or state is None:
......
......@@ -74,7 +74,7 @@ class Test_TokenServiceServer(unittest.TestCase):
) .will_respond_with(200, body=service.to_json())
response = self.client.get(
f"/token-service/service/{service.servicename}")
f"/port-service/service/{service.servicename}")
self.assertEqual(response.status_code, 200,
msg=response.get_data(as_text=True))
......@@ -89,7 +89,7 @@ class Test_TokenServiceServer(unittest.TestCase):
# following request should not be needed a new pact, because its cached and date shuld be the same.
response = self.client.get(
f"/token-service/service/{service.servicename}")
f"/port-service/service/{service.servicename}")
self.assertEqual(response.status_code, 200,
msg=response.get_data(as_text=True))
......@@ -147,11 +147,11 @@ class Test_TokenServiceServer(unittest.TestCase):
with pact:
response = self.client.get(
"/token-service/redirect", query_string={"code": code, "state": state})
"/port-service/redirect", query_string={"code": code, "state": state})
self.assertEqual(response.status_code, 302, msg=response.get_data())
self.assertEqual(
response.headers["location"], "http://localhost/token-service/authorization-success", msg=response.get_data())
response.headers["location"], "http://localhost/port-service/authorization-success", msg=response.get_data())
# TODO: add tests here for redirects to cancel page
# test for no service found
......@@ -211,7 +211,7 @@ class Test_TokenServiceServer(unittest.TestCase):
with pact:
code = self.client.post(
"/token-service/user/{}/service/{}/projects".format(userId, servicename)).status_code
"/port-service/user/{}/service/{}/projects".format(userId, servicename)).status_code
self.assertEqual(code, 204)
......@@ -233,7 +233,7 @@ class Test_TokenServiceServer(unittest.TestCase):
with pact:
code = self.client.post(
"/token-service/user/{}/service/{}/projects".format(userId, servicename)).status_code
"/port-service/user/{}/service/{}/projects".format(userId, servicename)).status_code
self.assertEqual(code, 500)
......@@ -261,7 +261,7 @@ class Test_TokenServiceServer(unittest.TestCase):
with pact:
code = self.client.delete(
"/token-service/user/{}/service/{}/projects/{}".format(userId, servicename, proj1["projectId"])).status_code
"/port-service/user/{}/service/{}/projects/{}".format(userId, servicename, proj1["projectId"])).status_code
self.assertGreaterEqual(code, 404)
......@@ -283,7 +283,7 @@ class Test_TokenServiceServer(unittest.TestCase):
with pact:
code = self.client.delete(
"/token-service/user/{}/service/{}/projects/{}".format(userId, servicename, proj1["projectId"])).status_code
"/port-service/user/{}/service/{}/projects/{}".format(userId, servicename, proj1["projectId"])).status_code
self.assertEqual(code, 204)
......
......@@ -7,7 +7,7 @@ info:
email: peter.heiss@uni-muenster.de
description: 'This file describes a service, which takes oauth2 flow for rds. This is a extra layer for the central service.'
servers:
- url: 'http://use-case_token-storage/token-service'
- url: 'http://use-case_token-storage/port-service'
paths:
/redirect:
get:
......
.use_case_token_service:
variables:
FOLDER: RDS/circle2_use_cases/token_service
.tests_use_case_token_service:
extends:
- .tests
- .use_case_token_service
test:use_case_token_service3.6:
image: python:3.6
extends: .tests_use_case_token_service
test:use_case_token_service3.7:
image: python:3.7
extends: .tests_use_case_token_service
test:use_case_token_service3.8:
image: python:3.8
extends: .tests_use_case_token_service
build:use_case_token_service:
extends:
- .builds
- .use_case_token_service
only:
changes:
- RDS/circle2_use_cases/token_service/*
- RDS/circle2_use_cases/token_service/**/*
.central_service_token_service:
.central_service_port_service:
variables:
FOLDER: RDS/circle3_central_services/token_service
FOLDER: RDS/circle3_central_services/token_storage
.tests_central_service_token_service:
.tests_central_service_token_storage:
extends:
- .tests
- .central_service_token_service
- .central_service_port_service
artifacts:
untracked: true
......@@ -17,33 +17,33 @@
- name: selenium/standalone-firefox
alias: selenium
test:central_service_token_service3.6:
test:central_service_port_service3.6:
image: python:3.6
extends: .tests_central_service_token_service
extends: .tests_central_service_token_storage
test:central_service_token_service3.7:
test:central_service_port_service3.7:
image: python:3.7
extends: .tests_central_service_token_service
extends: .tests_central_service_token_storage
test:central_service_token_service3.8:
test:central_service_port_service3.8:
image: python:3.8
extends: .tests_central_service_token_service
extends: .tests_central_service_token_storage
build:central_service_token_service:
build:central_service_port_service:
extends:
- .builds
- .central_service_token_service
- .central_service_port_service
only:
changes:
- RDS/circle3_central_services/token_service/*
- RDS/circle3_central_services/token_service/**/*
- RDS/circle3_central_services/token_storage/*
- RDS/circle3_central_services/token_storage/**/*
doc:central_service_token_service:
doc:central_service_port_service:
image: python:3.8
extends:
- .documentation
- .central_service_token_service
- .central_service_port_service
script:
- cd $FOLDER
......
......@@ -26,7 +26,7 @@ loc: dev
doc: dev
pydocmd build
mv _build/pydocmd/token-service.md ../../../docs/content/doc/impl/use-cases/token-service-docstring.md
mv _build/pydocmd/port-service.md ../../../docs/content/doc/impl/central/port-service-docstring.md
rm -r _build
......@@ -8,7 +8,7 @@ WORKDIR /app
ADD ./requirements.txt ./
RUN pip install -r requirements.txt
ADD "https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle3_central_services/token_service/central-service_token-storage.yml" ./
ADD "https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle3_central_services/port_service/central-service_token-storage.yml" ./
# now add everything else, which changes often
ADD src ./
......
......@@ -5,7 +5,7 @@ site_name: "My Documentation"
# is a tree of Python member names (modules, classes, etc.) that should be
# documented. Higher indentation leads to smaller header size.
generate:
- token-service.md:
- port-service.md:
- Storage:
- lib.User++
- lib.Token++
......@@ -19,7 +19,7 @@ generate:
# that allows you to use an external Markdown file (eg. your project's README)
# in the documentation. The path must be relative to current working directory.
pages:
- Home: token-service.md
- Home: port-service.md
headers: markdown
......
......@@ -23,7 +23,7 @@ service_exporter:
helm upgrade circle2-exporter-service circle2_exporter_service --install
service_token:
helm upgrade circle2-token-service circle2_token_service --install
helm upgrade circle2-port-service circle2_port_service --install
service_metadata:
helm upgrade circle2-metadata-service circle2_metadata_service --install
......@@ -56,7 +56,7 @@ remove_service_exporter:
helm delete --purge circle2-exporter-service || true
remove_service_token:
helm delete --purge circle2-token-service || true
helm delete --purge circle2-port-service || true
remove_service_metadata:
helm delete --purge circle2-metadata-service || true
......
......@@ -45,11 +45,11 @@ spec:
configMapKeyRef:
name: mservice
key: OWNCLOUD_INSTALLATION_URL
- name: USE_CASE_SERVICE_TOKEN_SERVICE
- name: USE_CASE_SERVICE_PORT_SERVICE
valueFrom:
configMapKeyRef:
name: mservice
key: USE_CASE_SERVICE_TOKEN_SERVICE
key: USE_CASE_SERVICE_PORT_SERVICE
- name: HTTP_PROXY
valueFrom:
configMapKeyRef:
......
......@@ -54,6 +54,6 @@ tolerations: []
affinity: {}
environment:
OWNCLOUD_OAUTH_AUTHORIZE_URL: http://10.14.28.90/owncloud/index.php/apps/oauth2/authorize?redirect_uri=https://sciebords-dev.uni-muenster.de/token-service/redirect&response_type=code&client_id=MmzzkOuIdUaEAZ839FM4vxK52YsRf6snK76jFAQHx63LtVDPuEybEUNYvquBmr8I
OWNCLOUD_OAUTH_AUTHORIZE_URL: http://10.14.28.90/owncloud/index.php/apps/oauth2/authorize?redirect_uri=https://sciebords-dev.uni-muenster.de/port-service/redirect&response_type=code&client_id=MmzzkOuIdUaEAZ839FM4vxK52YsRf6snK76jFAQHx63LtVDPuEybEUNYvquBmr8I
OWNCLOUD_OAUTH_ACCESS_TOKEN_URL: http://10.14.28.90/owncloud/index.php/apps/oauth2/api/v1/token
OWNCLOUD_OAUTH_CLIEND_ID: MmzzkOuIdUaEAZ839FM4vxK52YsRf6snK76jFAQHx63LtVDPuEybEUNYvquBmr8I
......@@ -42,11 +42,11 @@ spec:
secretKeyRef:
name: zenodo-oauth-client-secret
key: secret
- name: USE_CASE_SERVICE_TOKEN_SERVICE
- name: USE_CASE_SERVICE_PORT_SERVICE
valueFrom:
configMapKeyRef:
name: mservice
key: USE_CASE_SERVICE_TOKEN_SERVICE
key: USE_CASE_SERVICE_PORT_SERVICE
- name: HTTP_PROXY
valueFrom:
configMapKeyRef:
......
......@@ -54,7 +54,7 @@ tolerations: []
affinity: {}
environment:
ZENODO_OAUTH_AUTHORIZE_URL: https://sandbox.zenodo.org%2Foauth%2Fauthorize%3Fscope%3Ddeposit%253Awrite%2520deposit%253Aactions%26redirect_uri%3Dhttps%253A%252F%252Fsciebords-dev.uni-muenster.de%252Ftoken-service%252Fredirect%26response_type%3Dcode%26client_id%3DfeYfqBVCfNDJTQyQRXWiJ8eoga99GxKzXYAZXvbm
ZENODO_OAUTH_AUTHORIZE_URL: https://sandbox.zenodo.org%2Foauth%2Fauthorize%3Fscope%3Ddeposit%253Awrite%2520deposit%253Aactions%26redirect_uri%3Dhttps%253A%252F%252Fsciebords-dev.uni-muenster.de%252Fport-service%252Fredirect%26response_type%3Dcode%26client_id%3DfeYfqBVCfNDJTQyQRXWiJ8eoga99GxKzXYAZXvbm
ZENODO_OAUTH_ACCESS_TOKEN_URL: https://sandbox.zenodo.org/oauth/token
ZENODO_OAUTH_CLIEND_ID: feYfqBVCfNDJTQyQRXWiJ8eoga99GxKzXYAZXvbm
# FIXME: secret needs to be set manually
......
......@@ -6,16 +6,16 @@
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "circle2_token_service.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "circle2_port_service.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "circle2_token_service.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "circle2_token_service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "circle2_port_service.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "circle2_port_service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "circle2_token_service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "circle2_port_service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80
{{- end }}
......@@ -32,11 +32,11 @@ spec:
configMapKeyRef:
name: mservice
key: CENTRAL_SERVICE_TOKEN_STORAGE
- name: USE_CASE_SERVICE_TOKEN_SERVICE
- name: USE_CASE_SERVICE_PORT_SERVICE
valueFrom:
configMapKeyRef:
name: mservice
key: USE_CASE_SERVICE_TOKEN_SERVICE
key: USE_CASE_SERVICE_PORT_SERVICE
- name: HTTP_PROXY
valueFrom:
configMapKeyRef:
......
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: circle2-token-service
name: circle2-port-service
version: 0.1.0
......@@ -6,16 +6,16 @@
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "circle2_token_service.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "circle2_port_service.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "circle2_token_service.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "circle2_token_service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "circle2_port_service.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "circle2_port_service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "circle2_token_service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "circle2_port_service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80
{{- end }}
......@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "circle2_token_service.name" -}}
{{- define "circle2_port_service.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
......@@ -11,7 +11,7 @@ Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "circle2_token_service.fullname" -}}
{{- define "circle2_port_service.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
......@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "circle2_token_service.chart" -}}
{{- define "circle2_port_service.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "circle2_token_service.labels" -}}
app.kubernetes.io/name: {{ include "circle2_token_service.name" . }}
helm.sh/chart: {{ include "circle2_token_service.chart" . }}
{{- define "circle2_port_service.labels" -}}
app.kubernetes.io/name: {{ include "circle2_port_service.name" . }}
helm.sh/chart: {{ include "circle2_port_service.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
......
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "circle2_token_service.fullname" . }}
name: {{ include "circle2_port_service.fullname" . }}
labels:
{{ include "circle2_token_service.labels" . | indent 4 }}
{{ include "circle2_port_service.labels" . | indent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "circle2_token_service.name" . }}
app.kubernetes.io/name: {{ include "circle2_port_service.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "circle2_token_service.name" . }}
app.kubernetes.io/name: {{ include "circle2_port_service.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
initContainers:
......
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "circle2_token_service.fullname" . -}}
{{- $fullName := include "circle2_port_service.fullname" . -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{ include "circle2_token_service.labels" . | indent 4 }}
{{ include "circle2_port_service.labels" . | indent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
......
......@@ -5,9 +5,9 @@ metadata:
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
name: {{ include "circle2_token_service.fullname" . }}
name: {{ include "circle2_port_service.fullname" . }}
labels:
{{ include "circle2_token_service.labels" . | indent 4 }}
{{ include "circle2_port_service.labels" . | indent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
......@@ -16,5 +16,5 @@ spec:
protocol: TCP
name: http
selector:
app.kubernetes.io/name: {{ include "circle2_token_service.name" . }}
app.kubernetes.io/name: {{ include "circle2_port_service.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
apiVersion: v1
kind: Pod
metadata:
name: "{{ include "circle2_token_service.fullname" . }}-test-research"
name: "{{ include "circle2_port_service.fullname" . }}-test-research"
labels:
{{ include "circle2_token_service.labels" . | indent 4 }}
{{ include "circle2_port_service.labels" . | indent 4 }}
annotations:
"helm.sh/hook": test-success
spec:
......@@ -11,5 +11,5 @@ spec:
- name: wget
image: busybox
command: ['wget']
args: ['{{ include "circle2_token_service.fullname" . }}:{{ .Values.service.port }}']
args: ['{{ include "circle2_port_service.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never
......@@ -5,7 +5,7 @@
replicaCount: 1
image:
repository: zivgitlab.wwu.io/sciebo-rds/sciebo-rds/use_case_token_service
repository: zivgitlab.wwu.io/sciebo-rds/sciebo-rds/use_case_port_service
tag: connnectUI
pullPolicy: Always
......@@ -29,7 +29,7 @@ ingress:
hosts:
- host: sciebords-dev.uni-muenster.de
paths:
- /token-service
- /port-service
tls:
- secretName: sciebords-tls-public
......@@ -55,4 +55,4 @@ tolerations: []
affinity: {}
environment:
FLASK_HOST_ADDRESS: https://sciebords-dev.uni-muenster.de/token-service
\ No newline at end of file
FLASK_HOST_ADDRESS: https://sciebords-dev.uni-muenster.de/port-service
\ No newline at end of file
......@@ -5,7 +5,7 @@
replicaCount: 1
image:
repository: zivgitlab.wwu.io/sciebo-rds/sciebo-rds/central_service_token_service
repository: zivgitlab.wwu.io/sciebo-rds/sciebo-rds/central_service_token_storage
tag: connnectUI
pullPolicy: Always
......@@ -54,4 +54,4 @@ tolerations: []
affinity: {}
environment:
FLASK_HOST_ADDRESS: https://sciebords-dev.uni-muenster.de/token-service
\ No newline at end of file
FLASK_HOST_ADDRESS: https://sciebords-dev.uni-muenster.de/port-service
\ No newline at end of file
......@@ -4,4 +4,4 @@ metadata:
name: proxy
data:
http: http://wwwproxy.uni-muenster.de:3128
no_http_proxy: "10.14.28.90,circle1-port-owncloud,circle1-port-zenodo,circle2-token-service,circle3-token-storage,circle3-research-manager"
\ No newline at end of file
no_http_proxy: "10.14.28.90,circle1-port-owncloud,circle1-port-zenodo,circle2-port-service,circle3-token-storage,circle3-research-manager"
\ No newline at end of file
......@@ -4,6 +4,6 @@ metadata:
name: mservice
data:
OWNCLOUD_INSTALLATION_URL: "http://10.14.28.90/owncloud"
USE_CASE_SERVICE_TOKEN_SERVICE: "http://circle2-token-service/token-service"
USE_CASE_SERVICE_PORT_SERVICE: "http://circle2-port-service/port-service"
CENTRAL_SERVICE_TOKEN_STORAGE: "http://circle3-token-storage"
CENTRAL_SERVICE_RESEARCH_MANAGER: "http://circle3-research-manager"
......@@ -49,7 +49,7 @@ graph TD;
click SPAEx "/de/doc/impl/adapters/spa-exporter/"
click SPATS "/de/doc/impl/adapters/spa-token-storage"
click UCExporter "/de/doc/impl/use-cases/exporter"
click UCToken "/de/doc/impl/use-cases/token-service"
click UCToken "/de/doc/impl/use-cases/port-service"
click CSProject "/de/doc/impl/central/research-manager"
click PInvenio "/de/doc/impl/ports/port-invenio"
click POwncloud "/de/doc/impl/ports/port-storage"
......
......@@ -48,7 +48,7 @@ graph TD;
click SPAEx "/doc/impl/adapters/spa-exporter/"
click SPATS "/doc/impl/adapters/spa-token-storage"
click UCExporter "/doc/impl/use-cases/exporter"
click UCToken "/doc/impl/use-cases/token-service"
click UCToken "/doc/impl/use-cases/port-service"
click CSToken "/doc/impl/central/token-storage"
click CSProject "/doc/impl/central/research-manager"
click PInvenio "/doc/impl/ports/port-invenio"
......
......@@ -85,6 +85,6 @@ Durch die einfachere Handhabung werden aktuell die Daten nur im Speicher abgeleg
# OpenAPI v3
{{< swagger-spec url="https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle3_central_services/token_service/central-service_token-storage.yml" >}}
{{< swagger-spec url="https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle3_central_services/port_service/central-service_token-storage.yml" >}}
{{% code file="doc/impl/central/token-service-docstring.md" %}}
{{% code file="doc/impl/central/port-service-docstring.md" %}}
......@@ -11,6 +11,6 @@ mermaid: true
# OpenAPI v3
{{< swagger-spec url="https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle3_central_services/token_service/central-service_token-storage.yml" >}}
{{< swagger-spec url="https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle3_central_services/port_service/central-service_token-storage.yml" >}}
{{% code file="doc/impl/central/token-service-docstring.md" %}}
{{% code file="doc/impl/central/port-service-docstring.md" %}}
......@@ -56,7 +56,7 @@ stateDiagram
### Verweis auf Token Service auf Ebene 2
Der hintergründige Ablauf der Eingabemasken wird stark durch den entsprechenden Use-Case Dienst beeinflusst. Dafür muss man auf jedenfall die Seite des [Token Services](/de/doc/impl/use-cases/token-service/#kommunikation-mit-den-plugins) betrachten.
Der hintergründige Ablauf der Eingabemasken wird stark durch den entsprechenden Use-Case Dienst beeinflusst. Dafür muss man auf jedenfall die Seite des [Token Services](/de/doc/impl/use-cases/port-service/#kommunikation-mit-den-plugins) betrachten.
Notiz: Dieser Verweis wird in Zukunft verschwinden, da der Token Service entfernt wird und die Aufgabe vom Token Storage auf Ebene 3 übernommen wird, um klarere Aufgabenbereiche abzustecken.
......
......@@ -62,6 +62,6 @@ Bei einem Blick in die OpenAPI-Spezifikation ist ersichtlich, dass es keinen End
## OpenAPI
{{< swagger-spec url="https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle2_use_cases/token_service/use-case_token-storage.yml" >}}
{{< swagger-spec url="https://raw.githubusercontent.com/Sciebo-RDS/Sciebo-RDS/connnectUI/RDS/circle2_use_cases/port_service/use-case_token-storage.yml" >}}
{{% code file="doc/impl/use-cases/token-service-docstring.md" %}}
{{% code file="doc/impl/use-cases/port-service-docstring.md" %}}
This diff is collapsed.
This diff is collapsed.