Merge branch 'OZG-6305-AnzeigeOrganisationsEinheit' of...

Merge branch 'OZG-6305-AnzeigeOrganisationsEinheit' of git.ozg-sh.de:ozgcloud-app/alfa into OZG-6305-AnzeigeOrganisationsEinheit

alfa-client/apps/admin/src/test/helm/deployment_env_test.yaml

@@ -73,3 +73,4 @@ tests:
           content:
             name: my_test_environment_name
             value: "A test value"
+

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.ts

 import { CommandResource } from '@alfa-client/command-shared';
-import { AbstractFormService, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
+import { AbstractFormService, StateResource } from '@alfa-client/tech-shared';
 import { Injectable } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { ResourceUri } from '@ngxp/rest';
@@ -11,6 +11,8 @@ export class CollaborationRequestFormService extends AbstractFormService {
   public static readonly FIELD_TITLE: string = 'titel';
   public static readonly FIELD_NACHRICHT: string = 'nachricht';
 
+  private static readonly PATH_PREFIX: string = 'command.body';
+
   constructor(formBuilder: FormBuilder) {
     super(formBuilder);
   }
@@ -31,6 +33,6 @@ export class CollaborationRequestFormService extends AbstractFormService {
   }
 
   protected getPathPrefix(): string {
-    return EMPTY_STRING;
+    return CollaborationRequestFormService.PATH_PREFIX;
   }
 }

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.spec.ts

@@ -25,22 +25,22 @@ describe('OrganisationsEinheitComponent', () => {
   });
 
   describe('set organisationsEinheit', () => {
-    it('should call handle organisationsEinehit', () => {
-      component.handleOrganisationsEinheit = jest.fn();
+    it('should call update by organisationsEinehit', () => {
+      component.updateByOrganisationsEinheit = jest.fn();
 
       component.organisationsEinheitResource = organisationsEinheitResource;
 
-      expect(component.handleOrganisationsEinheit).toHaveBeenCalledWith(
+      expect(component.updateByOrganisationsEinheit).toHaveBeenCalledWith(
         organisationsEinheitResource,
       );
     });
   });
 
-  describe('handle organisationsEinheit', () => {
+  describe('update by organisationsEinheit', () => {
     it('should set name', () => {
       component.name = null;
 
-      component.handleOrganisationsEinheit(organisationsEinheitResource);
+      component.updateByOrganisationsEinheit(organisationsEinheitResource);
 
       expect(component.name).toEqual(organisationsEinheitResource.name);
     });
@@ -48,7 +48,7 @@ describe('OrganisationsEinheitComponent', () => {
     it('should set address', () => {
       component.address = null;
 
-      component.handleOrganisationsEinheit(organisationsEinheitResource);
+      component.updateByOrganisationsEinheit(organisationsEinheitResource);
 
       expect(component.address).toEqual(
         `${organisationsEinheitResource.anschrift.strasse} ${organisationsEinheitResource.anschrift.hausnummer}, ${organisationsEinheitResource.anschrift.plz} ${organisationsEinheitResource.anschrift.ort}`,

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.ts

@@ -9,13 +9,13 @@ export class OrganisationsEinheitComponent {
   @Input() public set organisationsEinheitResource(
     organisationsEinheit: OrganisationsEinheitResource,
   ) {
-    this.handleOrganisationsEinheit(organisationsEinheit);
+    this.updateByOrganisationsEinheit(organisationsEinheit);
   }
 
   public name: string;
   public address: string;
 
-  handleOrganisationsEinheit(organisationsEinheit: OrganisationsEinheitResource): void {
+  updateByOrganisationsEinheit(organisationsEinheit: OrganisationsEinheitResource): void {
     this.name = organisationsEinheit.name;
     this.address = this.buildAddress(organisationsEinheit.anschrift);
   }

src/main/helm/templates/deployment.yaml

@@ -109,6 +109,10 @@ spec:
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
         - name: ozgcloud_xdomea_behoerdenschluesselVersion
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
+        {{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
+        - name: ozgcloud_feature_collaborationEnabled
+          value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}
+        {{- end }}
 
         image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
         imagePullPolicy: Always

src/main/helm/templates/network_policy.yaml

@@ -21,6 +21,18 @@ spec:
 {{ toYaml . | indent 2 }}
 {{- end }}
   egress:
+{{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
+  - to:
+    - namespaceSelector:
+        matchLabels:
+          kubernetes.io/metadata.name: {{ required "zufiManager.namespace must be set if zufiManager server is enabled" (.Values.zufiManager).namespace }}
+      podSelector: 
+        matchLabels:
+          component: zufi-server
+    ports:
+      - port: 9090
+        protocol: TCP
+{{- end }}
   - to:
     - podSelector: 
         matchLabels:

src/test/helm/deployment_collaboration_env_test.yaml

+suite: deployment collaboration env
+release:
+  name: alfa
+  namespace: sh-helm-test
+templates:
+  - templates/deployment.yaml
+set:
+  baseUrl: test.company.local
+  ozgcloud:
+    environment: test
+    bundesland: sh
+    bezeichner: helm
+  sso:
+    serverUrl: https://sso.company.local
+  imagePullSecret: image-pull-secret
+tests:
+  - it: should enable collaboration
+    set:
+      ozgcloud:
+        feature:
+          collaborationEnabled: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_feature_collaborationEnabled
+            value: "true"
+  - it: should not enable collaboration
+    set:
+      ozgcloud:
+        feature:
+          collaborationEnabled: false
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_feature_collaborationEnabled
+          any: true
\ No newline at end of file

src/test/helm/network_policy_test.yaml

@@ -224,3 +224,39 @@ tests:
     asserts:
       - hasDocuments:
           count: 1
+
+  - it: should set egress for zufi if configured
+    set:
+      networkPolicy:
+        ssoPublicIp: 1.1.1.1
+        dnsServerNamespace: test-dns-server-namespace
+      ozgcloud:
+        feature:
+          collaborationEnabled: true
+      zufiManager:
+        namespace: by-zufi-dev
+    asserts:
+      - contains:
+          path: spec.egress
+          content:
+            to:
+              - podSelector:
+                  matchLabels:
+                    component: zufi-server
+                namespaceSelector:
+                  matchLabels:
+                    kubernetes.io/metadata.name: by-zufi-dev
+            ports:
+              - port: 9090
+                protocol: TCP
+  - it: should fail to set egress for zufi if namespace is missing
+    set:
+      networkPolicy:
+        ssoPublicIp: 1.1.1.1
+        dnsServerNamespace: test-dns-server-namespace
+      ozgcloud:
+        feature:
+          collaborationEnabled: true
+    asserts:
+      - failedTemplate:
+          errorMessage: zufiManager.namespace must be set if zufiManager server is enabled
\ No newline at end of file