diff --git a/group_vars/all/management.yml b/group_vars/all/management.yml index d17fa07..740e55f 100644 --- a/group_vars/all/management.yml +++ b/group_vars/all/management.yml @@ -14,6 +14,13 @@ management_configurations: - backup - provisioning # legacy +connect_workflow_env: + - "stage:{{ stage }}" + - "managementHostname:{{ shared_service_host_management }}" + - "kibanaHostname:{{ shared_service_hostname_kibana }}" + - "keycloakHostname:{{ shared_service_hostname_keycloak }}" + - "smardigoUserToken:{{ smardigo_auth_token_value }}" + connect_connection_teams_url: "{{ netgo_msteams_hook_cd }}" connect_connection_awx_url: "{{ shared_service_kube_url_awx }}/" connect_connection_harbor_url: "{{ shared_service_url_harbor }}/v2/" diff --git a/roles/connect/tasks/main.yml b/roles/connect/tasks/main.yml index 0cabeb4..c409489 100644 --- a/roles/connect/tasks/main.yml +++ b/roles/connect/tasks/main.yml @@ -56,6 +56,8 @@ current_owner: "{{ docker_owner }}" current_group: "{{ docker_group }}" current_docker: "{{ connect_docker }}" + tags: + - update_deployment - name: "Deploy service templates for {{ connect_id }}" include_role: @@ -67,6 +69,8 @@ current_destination: "{{ connect_id }}" current_owner: "{{ docker_owner }}" current_group: "{{ docker_group }}" + tags: + - update_deployment - name: "Deploy certificate templates for {{ connect_id }}" include_role: diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml index 28796b5..23c1722 100644 --- a/roles/connect/vars/main.yml +++ b/roles/connect/vars/main.yml @@ -86,7 +86,7 @@ connect_environment: [ "ELASTIC_MESSAGE_INDEX: \"{{ connect_elastic_message_index | default('message') }}\"", "ELASTIC_ANALYSIS_INDEX: \"{{ connect_elastic_analysis_index | default('analysis') }}\"", - "WORKFLOW_ENV: \"{{ connect_workflow_env | default('') }}\"", + "WORKFLOW_ENV: \"{{ (connect_workflow_env | default([])) | join(';') }}\"", "CONFIG_DELETE_SCOPE_ENABLED: \"{{ connect_config_delete_scope_enabled }}\"", "CONFIG_LOCAL_IMPORT_ENABLED: \"{{ connect_config_local_import_enabled }}\"", diff --git a/roles/management/tasks/main.yaml b/roles/management/tasks/main.yaml index 489459b..f39eab8 100644 --- a/roles/management/tasks/main.yaml +++ b/roles/management/tasks/main.yaml @@ -30,7 +30,6 @@ cluster_name: "{{ management_oidc_client_id }}" connect_oidc_client_secret: "{{ management_oidc_client_secret }}" connect_postgres_database: "{{ stage_database_management_connect_name }}" - connect_workflow_env: "baseUrl:{{ connect_base_url }};stage:{{ stage }};smardigoUserToken:{{ smardigo_auth_token_value }}" connect_config_delete_scope_enabled: true connect_datasource_action_enabled: true connect_element_template_enabled: true diff --git a/smardigo/pmci/datasource/whitelabel-docker-image-tags.json b/smardigo/pmci/datasource/whitelabel-docker-image-tags.json index 9307b6e..857ef48 100644 --- a/smardigo/pmci/datasource/whitelabel-docker-image-tags.json +++ b/smardigo/pmci/datasource/whitelabel-docker-image-tags.json @@ -1,16 +1,18 @@ { - "name" : "whitelabel-docker-image-tags", - "restApi" : true, - "configKey" : "whitelabel-docker-image-tags", - "payloadType" : "POST_PROCESSING", - "config" : [ { - "name" : "datasource_key", - "type" : "STRING", - "value" : "whitelabel-docker-image-tags-plain" + "name": "whitelabel-docker-image-tags", + "restApi": true, + "configKey": "whitelabel-docker-image-tags", + "payloadType": "POST_PROCESSING", + "config": [ + { + "name": "datasource_key", + "type": "STRING", + "value": "whitelabel-docker-image-tags-plain" }, { - "name" : "groovy_script", - "type" : "STRING", - "value" : "def result = []\ndata.each{values ->\n values.tags.each{ value ->\n result.add([value: value, label: value])\n }\n}\nresult" - } ] + "name": "groovy_script", + "type": "STRING", + "value": "def result = []\ndata.each{values ->\n values.tags.each{ value -> {\n def name = value;\n if (!name.contains(\"SNAPSHOT\")) {\n result.add([value: value, label: value])\n }\n }\n }\n}\nresult" + } + ] } diff --git a/smardigo/pmci/filter/service-change.json b/smardigo/pmci/filter/service-change.json index cf17a6c..7558704 100644 --- a/smardigo/pmci/filter/service-change.json +++ b/smardigo/pmci/filter/service-change.json @@ -5,7 +5,7 @@ "dossiers" : [ { "configKey" : "vorgang", "currentUserConfig" : [ [ { - "key" : "data.filterTenantId", + "key" : "filterTenantId", "operation" : "in", "value" : "${currentUserAttributes.tenantIds}" } ] ], diff --git a/smardigo/pmci/filter/service-create.json b/smardigo/pmci/filter/service-create.json index a0376fe..8590501 100644 --- a/smardigo/pmci/filter/service-create.json +++ b/smardigo/pmci/filter/service-create.json @@ -5,7 +5,7 @@ "dossiers" : [ { "configKey" : "vorgang", "currentUserConfig" : [ [ { - "key" : "data.filterTenantId", + "key" : "filterTenantId", "operation" : "in", "value" : "${currentUserAttributes.tenantIds}" } ] ], diff --git a/smardigo/pmci/filter/service-delete.json b/smardigo/pmci/filter/service-delete.json index 09860f1..0eed37c 100644 --- a/smardigo/pmci/filter/service-delete.json +++ b/smardigo/pmci/filter/service-delete.json @@ -5,7 +5,7 @@ "dossiers" : [ { "configKey" : "vorgang", "currentUserConfig" : [ [ { - "key" : "data.filterTenantId", + "key" : "filterTenantId", "operation" : "in", "value" : "${currentUserAttributes.tenantIds}" } ] ], diff --git a/smardigo/pmci/filter/service-replay-setup.json b/smardigo/pmci/filter/service-replay-setup.json index 9ca16e4..b02fffb 100644 --- a/smardigo/pmci/filter/service-replay-setup.json +++ b/smardigo/pmci/filter/service-replay-setup.json @@ -5,7 +5,7 @@ "dossiers" : [ { "configKey" : "vorgang", "currentUserConfig" : [ [ { - "key" : "data.filterTenantId", + "key" : "filterTenantId", "operation" : "in", "value" : "${currentUserAttributes.tenantIds}" } ] ], diff --git a/smardigo/pmci/filter/service-search.json b/smardigo/pmci/filter/service-search.json index 9ca4938..caa5c0f 100644 --- a/smardigo/pmci/filter/service-search.json +++ b/smardigo/pmci/filter/service-search.json @@ -5,7 +5,7 @@ "dossiers" : [ { "configKey" : "vorgang", "currentUserConfig" : [ [ { - "key" : "data.filterTenantId", + "key" : "filterTenantId", "operation" : "in", "value" : "${currentUserAttributes.tenantIds}" } ] ], diff --git a/smardigo/pmci/form/confirm-delete-service.json b/smardigo/pmci/form/confirm-delete-service.json new file mode 100644 index 0000000..0b737d1 --- /dev/null +++ b/smardigo/pmci/form/confirm-delete-service.json @@ -0,0 +1,37 @@ +{ + "display" : "form", + "configKey" : "confirm-delete-service", + "name" : "confirm-delete-service", + "components" : [ { + "label" : "HTML", + "className" : "", + "attrs" : [ { + "attr" : "", + "value" : "" + } ], + "content" : "
\n
\n
Sind Sie sich sicher, dass die Instanz gelöscht werden soll?
\n

Diese Aktion kann nicht Rückgängig gemacht werden. Hierdurch werden alle Daten gelöscht.

\n
\n
", + "refreshOnChange" : false, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "htmlelement", + "input" : false, + "key" : "html", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : null, + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ] +} \ No newline at end of file diff --git a/smardigo/pmci/form/confirm-delete-tenant.json b/smardigo/pmci/form/confirm-delete-tenant.json index 53917f8..38e14c9 100644 --- a/smardigo/pmci/form/confirm-delete-tenant.json +++ b/smardigo/pmci/form/confirm-delete-tenant.json @@ -1,4 +1,7 @@ { + "display" : "form", + "configKey" : "confirm-delete-tenant", + "name" : "confirm-delete-tenant", "components" : [ { "label" : "HTML", "className" : "", @@ -6,7 +9,7 @@ "attr" : "", "value" : "" } ], - "content" : "

Sind Sie sich sicher, dass der Mandant gelöscht werden soll?

", + "content" : "
\n
\n
Sind Sie sich sicher, dass der Mandant gelöscht werden soll?
\n

Diese Aktion kann nicht Rückgängig gemacht werden. Hierdurch werden alle Daten gelöscht.

\n
\n
", "refreshOnChange" : false, "mask" : false, "tableView" : true, @@ -30,8 +33,5 @@ "customConditional" : "", "logic" : [ ], "reorder" : false - } ], - "display" : "form", - "configKey" : "confirm-delete-tenant", - "name" : "confirm-delete-tenant" + } ] } \ No newline at end of file diff --git a/smardigo/pmci/mail-template/service-created.html b/smardigo/pmci/mail-template/service-created.html index 64c6c36..82031c4 100644 --- a/smardigo/pmci/mail-template/service-created.html +++ b/smardigo/pmci/mail-template/service-created.html @@ -44,7 +44,7 @@ Kibana some-username some-password - some-link + some-link

diff --git a/smardigo/pmci/mail-template/tenant-created.html b/smardigo/pmci/mail-template/tenant-created.html index ab7946c..7b06fbd 100644 --- a/smardigo/pmci/mail-template/tenant-created.html +++ b/smardigo/pmci/mail-template/tenant-created.html @@ -40,7 +40,7 @@ Keycloak some-username some-password - some-link + some-link

diff --git a/smardigo/pmci/process-variable-declaration/service-change.json b/smardigo/pmci/process-variable-declaration/service-change.json index cca8f4f..3fcfc77 100644 --- a/smardigo/pmci/process-variable-declaration/service-change.json +++ b/smardigo/pmci/process-variable-declaration/service-change.json @@ -26,11 +26,21 @@ "classification" : "PRIVATE", "label" : "jobs" }, + "keycloakHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "kibanaHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, "maintenance_topic" : { "type" : "string", - "classification" : "PRIVATE", - "searchable" : true, - "label" : "Topic" + "classification" : "PRIVATE" + }, + "managementHostname" : { + "type" : "string", + "classification" : "PRIVATE" }, "process_definition_key" : { "type" : "string", diff --git a/smardigo/pmci/process-variable-declaration/service-create.json b/smardigo/pmci/process-variable-declaration/service-create.json index 885204e..6053464 100644 --- a/smardigo/pmci/process-variable-declaration/service-create.json +++ b/smardigo/pmci/process-variable-declaration/service-create.json @@ -40,6 +40,18 @@ "classification" : "PRIVATE", "label" : "jobs" }, + "keycloakHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "kibanaHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "managementHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, "process_definition_key" : { "type" : "string", "classification" : "PRIVATE", diff --git a/smardigo/pmci/process-variable-declaration/service-delete.json b/smardigo/pmci/process-variable-declaration/service-delete.json index 17d0af7..dfa5bd6 100644 --- a/smardigo/pmci/process-variable-declaration/service-delete.json +++ b/smardigo/pmci/process-variable-declaration/service-delete.json @@ -26,6 +26,18 @@ "classification" : "PRIVATE", "label" : "jobs" }, + "keycloakHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "kibanaHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "managementHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, "process_definition_key" : { "type" : "string", "classification" : "PRIVATE", diff --git a/smardigo/pmci/process-variable-declaration/service-replay-setup.json b/smardigo/pmci/process-variable-declaration/service-replay-setup.json index 1242ca7..ebe5e6a 100644 --- a/smardigo/pmci/process-variable-declaration/service-replay-setup.json +++ b/smardigo/pmci/process-variable-declaration/service-replay-setup.json @@ -40,6 +40,18 @@ "classification" : "PRIVATE", "label" : "jobs" }, + "keycloakHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "kibanaHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "managementHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, "process_definition_key" : { "type" : "string", "classification" : "PRIVATE", diff --git a/smardigo/pmci/process-variable-declaration/service-setup.json b/smardigo/pmci/process-variable-declaration/service-setup.json index 68550fe..2b22f2e 100644 --- a/smardigo/pmci/process-variable-declaration/service-setup.json +++ b/smardigo/pmci/process-variable-declaration/service-setup.json @@ -45,6 +45,18 @@ "classification" : "PRIVATE", "label" : "jobs" }, + "keycloakHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "kibanaHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, + "managementHostname" : { + "type" : "string", + "classification" : "PRIVATE" + }, "progress_current" : { "type" : "integer", "classification" : "PRIVATE", diff --git a/smardigo/pmci/process/service-change.bpmn b/smardigo/pmci/process/service-change.bpmn index a15994d..e3975ab 100644 --- a/smardigo/pmci/process/service-change.bpmn +++ b/smardigo/pmci/process/service-change.bpmn @@ -120,13 +120,16 @@ + ${envStage} + ${envManagementHostname} + ${envKibanaHostname} + ${envKeycloakHostname} + ${false} ${0} ${1} - ${false} - ${envStage} Flow_0v9fn99 diff --git a/smardigo/pmci/process/service-create.bpmn b/smardigo/pmci/process/service-create.bpmn index 5f0a3bd..f57c697 100644 --- a/smardigo/pmci/process/service-create.bpmn +++ b/smardigo/pmci/process/service-create.bpmn @@ -44,6 +44,11 @@ ${envStage} + ${envStage} + ${envManagementHostname} + ${envKibanaHostname} + ${envKeycloakHostname} + ${false} ${in_connect_features} @@ -51,8 +56,6 @@ ${tenant.id} - ${envStage} - ${false} @@ -144,7 +147,7 @@ - + Flow_13jykf9 @@ -246,21 +249,11 @@ service Flow_08cfi9d - Flow_03gesid Flow_0o7a7fg Flow_1s9e7ku + Flow_02b97mw - - - - ${200} - created - - - Flow_08cfi9d - Flow_03gesid - @@ -461,6 +454,27 @@ Variables.userId(authenticatedUserId) ${vorgang_status == 401} + + + + ${200} + created + + + Flow_08cfi9d + Flow_03gesid + + + + + + ${300} + creation completed + + + Flow_03gesid + Flow_02b97mw + Den Antrag überprüfen und freigeben oder ablehnen. @@ -479,14 +493,6 @@ Variables.userId(authenticatedUserId) - - - - - - - - @@ -530,62 +536,6 @@ Variables.userId(authenticatedUserId) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -601,20 +551,16 @@ Variables.userId(authenticatedUserId) - - - - - - - - - + + + + + - - + + - + @@ -651,6 +597,56 @@ Variables.userId(authenticatedUserId) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -756,6 +752,22 @@ Variables.userId(authenticatedUserId) + + + + + + + + + + + + + + + + @@ -779,27 +791,24 @@ Variables.userId(authenticatedUserId) - - - - - - - - - - + + + - - + + + + + + - + - - + + - + @@ -808,18 +817,21 @@ Variables.userId(authenticatedUserId) - - + + - + - - + + - + + + + @@ -932,7 +944,7 @@ Variables.userId(authenticatedUserId) - + @@ -943,8 +955,8 @@ Variables.userId(authenticatedUserId) - - + + @@ -980,6 +992,18 @@ Variables.userId(authenticatedUserId) + + + + + + + + + + + + diff --git a/smardigo/pmci/process/service-delete.bpmn b/smardigo/pmci/process/service-delete.bpmn index 60c4338..4ff80ae 100644 --- a/smardigo/pmci/process/service-delete.bpmn +++ b/smardigo/pmci/process/service-delete.bpmn @@ -60,13 +60,16 @@ + ${envStage} + ${envManagementHostname} + ${envKibanaHostname} + ${envKeycloakHostname} + ${false} ${0} ${1} - ${envStage} - ${false} Flow_0v9fn99 @@ -132,7 +135,7 @@ Flow_0a1iw3h Flow_029ur97 - + Flow_029ur97 Flow_0xb2q5c diff --git a/smardigo/pmci/process/service-replay-setup.bpmn b/smardigo/pmci/process/service-replay-setup.bpmn index 1e43375..9ff7b1c 100644 --- a/smardigo/pmci/process/service-replay-setup.bpmn +++ b/smardigo/pmci/process/service-replay-setup.bpmn @@ -31,14 +31,17 @@ + ${envStage} + ${envManagementHostname} + ${envKibanaHostname} + ${envKeycloakHostname} + ${false} ${service.tenant_id} ${service.tenant_key} - ${envStage} - ${false} diff --git a/smardigo/pmci/process/service-setup.bpmn b/smardigo/pmci/process/service-setup.bpmn index ad955fb..aae741e 100644 --- a/smardigo/pmci/process/service-setup.bpmn +++ b/smardigo/pmci/process/service-setup.bpmn @@ -23,6 +23,9 @@ ${envStage} + ${envManagementHostname} + ${envKibanaHostname} + ${envKeycloakHostname} diff --git a/smardigo/pmci/script/create-teams-message.groovy b/smardigo/pmci/script/create-teams-message.groovy index f88cbca..1ffd7f1 100644 --- a/smardigo/pmci/script/create-teams-message.groovy +++ b/smardigo/pmci/script/create-teams-message.groovy @@ -1,5 +1,5 @@ -def smardigoUrl = "https://" + envBaseUrl + "/api/redirect/process/" + contextScopeId + "/dossier/" + process_definition_key + "/" + execution.getProcessInstanceId() -def smardigoMessageUrl = "https://" + envBaseUrl + "/api/v1/scopes/" + contextScopeId + "/processes/" + execution.getProcessInstanceId() + "/messages" +def smardigoUrl = "https://" + envManagementHostname + "/api/redirect/process/" + contextScopeId + "/dossier/" + process_definition_key + "/" + execution.getProcessInstanceId() +def smardigoMessageUrl = "https://" + envManagementHostname + "/api/v1/scopes/" + contextScopeId + "/processes/" + execution.getProcessInstanceId() + "/messages" def message = [:] message["@type"] = "MessageCard"