Add user group (#421)

* Modify error message * Add users group management * - added database update definition - fixed some tests - fixed headers and style * fixed tests * Implement workaround to get tenants filtered by organization * Fix style checks * - fixed test (temporary hack) - changed copyright header * fixed test * fixed test * fixed configuration endpoint Co-authored-by: Michele Perniola <[email protected]>
indigo-dc · Mar 26, 2021 · f9fd411 · f9fd411
1 parent 8de611e
commit f9fd411
Show file tree

Hide file tree

Showing 377 changed files with 638 additions and 159 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/launch.sh b/docker/launch.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-controller.yaml b/kubernetes/orchestrator-controller.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-database-controller.yaml b/kubernetes/orchestrator-database-controller.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-database-pv.yaml b/kubernetes/orchestrator-database-pv.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-database-pvc.yaml b/kubernetes/orchestrator-database-pvc.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-database-service.yaml b/kubernetes/orchestrator-database-service.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-pv.yaml b/kubernetes/orchestrator-pv.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-pvc.yaml b/kubernetes/orchestrator-pvc.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/orchestrator-service.yaml b/kubernetes/orchestrator-service.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/workflow-database-controller.yaml b/kubernetes/workflow-database-controller.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/workflow-database-pv.yaml b/kubernetes/workflow-database-pv.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/workflow-database-pvc.yaml b/kubernetes/workflow-database-pvc.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/kubernetes/workflow-database-service.yaml b/kubernetes/workflow-database-service.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,7 @@
 <!--
 
-    Copyright © 2015-2021 Santer Reply S.p.A.
+    Copyright © 2015-2021 I.N.F.N.
+    Copyright © 2015-2020 Santer Reply S.p.A.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -47,8 +48,8 @@
   </scm>
 
   <organization>
-    <name>Santer Reply S.p.A.</name>
-    <url>http://www.reply.com</url>
+    <name>I.N.F.N.</name>
+    <url>http://www.infn.it</url>
   </organization>
 
   <inceptionYear>2015</inceptionYear>
@@ -750,57 +751,6 @@
           <excludes>
             <exclude>docker/*.war</exclude>
             <exclude>src/main/java/it/reply/orchestrator/dto/kubernetes/fluxcd/**</exclude>
-            <!-- excluded because I.N.F.N. Copyright -->
-            <exclude>src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/controller/ConfigurationController.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dal/util/ResourceMetadataToJsonConverter.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/SystemEndpoints.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/QcgService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/Tenant.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/deployment/QcgJobsOrderedIterator.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/vault/VaultSecret.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/enums/PrivateNetworkType.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/exception/VaultJwtTokenExpiredException.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/exception/VaultSecretNotFoundException.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/exception/VaultServiceNotAvailableException.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/resource/CloudProviderEndpointResource.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/ConfigurationService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/ConfigurationServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/VaultService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/VaultServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/ProviderTimeout.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/QcgServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/factory/QcgClientFactory.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/utils/OneDataUtils.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/controller/ConfigurationControllerTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/commands/ProviderTimeoutTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/deployment/providers/QcgServiceTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/ConfigurationServiceTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/VaultServiceTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/controller/DeploymentScheduleControllerTest.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/security/IamUserInfo.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/CloudProviderEndpoint.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/workflow/CloudServicesOrderedIterator.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/KubernetesService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/ChronosService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/ComputeService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/MarathonService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/CloudService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/StorageService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/TemplateServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/SlamServiceV1Impl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/security/OAuth2TokenService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/CloudProviderEndpointServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/AbstractCmdbServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/KubernetesServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactory.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/DeleteTempReplicationRule.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/GetSlam.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataUpdate.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/PrefilterCloudProviders.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dal/repository/ReplicationRuleRepository.java</exclude>
           </excludes>
         </configuration>
       </plugin>

diff --git a/src/main/java/it/reply/orchestrator/Application.java b/src/main/java/it/reply/orchestrator/Application.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/annotation/DeploymentProviderQualifier.java b/src/main/java/it/reply/orchestrator/annotation/DeploymentProviderQualifier.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/annotation/ServiceVersion.java b/src/main/java/it/reply/orchestrator/annotation/ServiceVersion.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/annotation/SpringDefaultProfile.java b/src/main/java/it/reply/orchestrator/annotation/SpringDefaultProfile.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/DatasourceConfig.java b/src/main/java/it/reply/orchestrator/config/DatasourceConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/DependenciesConfig.java b/src/main/java/it/reply/orchestrator/config/DependenciesConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/IgniteConfig.java b/src/main/java/it/reply/orchestrator/config/IgniteConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/ReactorConfig.java b/src/main/java/it/reply/orchestrator/config/ReactorConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/WebAppInitializer.java b/src/main/java/it/reply/orchestrator/config/WebAppInitializer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/WebMvcConfig.java b/src/main/java/it/reply/orchestrator/config/WebMvcConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/WorkflowConfig.java b/src/main/java/it/reply/orchestrator/config/WorkflowConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/filters/CustomRequestLoggingFilter.java b/src/main/java/it/reply/orchestrator/config/filters/CustomRequestLoggingFilter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/CmdbProperties.java b/src/main/java/it/reply/orchestrator/config/properties/CmdbProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,6 +56,11 @@ public class CmdbProperties {
   private String tenantsByServiceIdPath =
       "/service/id/{serviceId}/has_many/tenants?include_docs=true";
 
+  @NotNull
+  @NonNull
+  private String tenantsListPath =
+      "/tenant/list?include_docs=true";
+
   @NotNull
   @NonNull
   private String tenantsByOrganizationIdPath =

diff --git a/src/main/java/it/reply/orchestrator/config/properties/CprProperties.java b/src/main/java/it/reply/orchestrator/config/properties/CprProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/ImProperties.java b/src/main/java/it/reply/orchestrator/config/properties/ImProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/OidcProperties.java b/src/main/java/it/reply/orchestrator/config/properties/OidcProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/OneDataProperties.java b/src/main/java/it/reply/orchestrator/config/properties/OneDataProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/OrchestratorProperties.java b/src/main/java/it/reply/orchestrator/config/properties/OrchestratorProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/RucioProperties.java b/src/main/java/it/reply/orchestrator/config/properties/RucioProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/SlamProperties.java b/src/main/java/it/reply/orchestrator/config/properties/SlamProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/ToscaProperties.java b/src/main/java/it/reply/orchestrator/config/properties/ToscaProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java b/src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java b/src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/it/reply/orchestrator/config/security/AnonimousWebSecurityConfig.java b/src/main/java/it/reply/orchestrator/config/security/AnonimousWebSecurityConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/security/AuthenticatedWebSecurityConfig.java b/src/main/java/it/reply/orchestrator/config/security/AuthenticatedWebSecurityConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/config/security/BaseWebSecurityConfig.java b/src/main/java/it/reply/orchestrator/config/security/BaseWebSecurityConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/controller/ConfigurationController.java b/src/main/java/it/reply/orchestrator/controller/ConfigurationController.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/it/reply/orchestrator/controller/DeploymentController.java b/src/main/java/it/reply/orchestrator/controller/DeploymentController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -74,6 +75,8 @@ public class DeploymentController {
    *
    * @param createdBy
    *          created by name
+   * @param userGroup
+   *          user group
    * @param pageable
    *          {@link Pageable}
    * @param pagedAssembler
@@ -85,17 +88,18 @@ public class DeploymentController {
       produces = MediaType.APPLICATION_JSON_VALUE)
   public PagedResources<DeploymentResource> getDeployments(
       @RequestParam(name = "createdBy", required = false) @Nullable String createdBy,
+      @RequestParam(name = "userGroup", required = false) @Nullable String userGroup,
       @PageableDefault(sort = "createdAt", direction = Direction.DESC) Pageable pageable,
       PagedResourcesAssembler<Deployment> pagedAssembler) {
 
-    Page<Deployment> deployments = deploymentService.getDeployments(pageable, createdBy);
+    Page<Deployment> deployments = deploymentService.getDeployments(pageable, createdBy, userGroup);
 
     return pagedAssembler.toResource(deployments, deploymentResourceAssembler,
         ControllerLinkBuilder
             .linkTo(
                 DummyInvocationUtils
                     .methodOn(DeploymentController.class)
-                    .getDeployments(createdBy, pageable, pagedAssembler))
+                    .getDeployments(createdBy, userGroup, pageable, pagedAssembler))
             .withSelfRel());
 
   }

diff --git a/src/main/java/it/reply/orchestrator/controller/DeploymentScheduleController.java b/src/main/java/it/reply/orchestrator/controller/DeploymentScheduleController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/main/java/it/reply/orchestrator/controller/MiscController.java b/src/main/java/it/reply/orchestrator/controller/MiscController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");