SAP · Phil91 · May 14, 2024 · Apr 19, 2024 · Apr 24, 2024 · Apr 24, 2024
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/lint-pull-request.yml b/.github/workflows/lint-pull-request.yml
@@ -1,4 +1,5 @@
 # #############################################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/migrations-docker.yml b/.github/workflows/migrations-docker.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/owasp-zap.yml b/.github/workflows/owasp-zap.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/processes-worker-docker.yml b/.github/workflows/processes-worker-docker.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/service-docker.yml b/.github/workflows/service-docker.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.github/workflows/unit.tests-formatting.yml b/.github/workflows/unit.tests-formatting.yml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -24,6 +24,6 @@ Disclaimer: The code in this project may include calls to APIs ("API Calls") of
  you any rights to use or access any SAP External Product, or provide any third
  parties the right to use of access any SAP External Product, through API Calls.
 
-Files: *
+Files: *.sln *.csproj *.json *.md *.gotmpl *.helmignore .editorconfig .gitignore DEPENDENCIES
 Copyright:  2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors
 License: Apache-2.0
diff --git a/charts/chart-testing-config.yaml b/charts/chart-testing-config.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/charts/dim/Chart.yaml b/charts/dim/Chart.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -20,8 +21,8 @@
 apiVersion: v2
 name: dim
 type: application
-version: 1.0.0
-appVersion: 1.0.0
+version: 1.1.0
+appVersion: 1.1.0
 description: Helm chart for DIM Middle Layer
 home: https://github.com/catenax-ng/dim-repo
 dependencies:

diff --git a/charts/dim/README.md b/charts/dim/README.md
@@ -27,7 +27,7 @@ To use the helm chart as a dependency:
 dependencies:
   - name: dim
     repository: https://sap.github.io/ssi-dim-middle-layer
-    version: 1.0.0
+    version: 1.1.0
 ```
 
 ## Requirements

diff --git a/charts/dim/templates/_helpers.tpl b/charts/dim/templates/_helpers.tpl
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.

diff --git a/charts/dim/templates/configmap-postgres-init.yaml b/charts/dim/templates/configmap-postgres-init.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.

diff --git a/charts/dim/templates/cronjob-processes.yaml b/charts/dim/templates/cronjob-processes.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/charts/dim/templates/deployment.yaml b/charts/dim/templates/deployment.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/charts/dim/templates/ingress.yaml b/charts/dim/templates/ingress.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.

diff --git a/charts/dim/templates/job-migrations.yaml b/charts/dim/templates/job-migrations.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/charts/dim/templates/secret-external-db.yaml b/charts/dim/templates/secret-external-db.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.

diff --git a/charts/dim/templates/secret-postgres.yaml b/charts/dim/templates/secret-postgres.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.

diff --git a/charts/dim/templates/secret.yaml b/charts/dim/templates/secret.yaml
@@ -1,5 +1,6 @@
 {{- /*
-* Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
+* Copyright (c) 2024 BMW Group AG
+ * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 *
 * See the NOTICE file(s) distributed with this work for additional
 * information regarding copyright ownership.

diff --git a/charts/dim/templates/service.yaml b/charts/dim/templates/service.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/charts/dim/values.yaml b/charts/dim/values.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/consortia/argocd-app-templates/appsetup-int.yaml b/consortia/argocd-app-templates/appsetup-int.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -28,7 +29,7 @@ spec:
   source:
     path: charts/dim
     repoURL: 'https://github.com/sap/dim-client.git'
-    targetRevision: dim-1.0.0
+    targetRevision: dim-1.1.0
     plugin:
       env:
         - name: AVP_SECRET

diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -76,7 +77,7 @@ processesworker:
     clientSecret: "<path:portal/data/dim/int/callback#clientSecret>"
     tokenAddress: "http://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token"
     # -- Url to the cf service api
-    baseAddress: "https://portal-backend.dev.demo.catena-x.net"
+    baseAddress: "https://portal-backend.int.demo.catena-x.net"
   technicalUserCreation:
     encryptionConfigs:
       index0:

diff --git a/docker/Dockerfile-dim-migrations b/docker/Dockerfile-dim-migrations
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/docker/Dockerfile-dim-processes-worker b/docker/Dockerfile-dim-processes-worker
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/docker/Dockerfile-dim-service b/docker/Dockerfile-dim-service
@@ -1,4 +1,5 @@
 ###############################################################
+# Copyright (c) 2024 BMW Group AG
 # Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 #
 # See the NOTICE file(s) distributed with this work for additional

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,4 +1,5 @@
 <!--
+- Copyright (c) 2024 BMW Group AG
 - Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
 -
 - See the NOTICE file(s) distributed with this work for additional
@@ -19,7 +20,7 @@
 
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs b/src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Cf/CfClient.cs b/src/clients/Dim.Clients/Api/Cf/CfClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -25,6 +26,7 @@
 using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions;
 using System.Net.Http.Json;
 using System.Text.Json;
+using System.Web;
 
 namespace Dim.Clients.Api.Cf;
 
@@ -71,13 +73,13 @@
 
     private static async Task<Guid> GetEnvironmentId(string tenantName, CancellationToken cancellationToken, HttpClient client)
     {
-        var environmentsResponse = await client.GetAsync("/v3/organizations", cancellationToken)
+        var environmentsResponse = await client.GetAsync($"/v3/organizations?names={HttpUtility.UrlEncode(tenantName)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-organizations", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE);
         var environments = await environmentsResponse.Content
             .ReadFromJsonAsync<GetEnvironmentsResponse>(JsonSerializerExtensions.Options, cancellationToken)
            .ConfigureAwait(false);

        var tenantEnvironment = environments.Resources.Where(x => x.Name == tenantName);
        if (tenantEnvironment.Count() > 1)
        {
            throw new ConflictException($"There should only be one cf environment for tenant {tenantName}");
@@ -136,7 +138,7 @@
     {
         var spaceName = $"{tenantName}-space";
         var client = await _basicAuthTokenService.GetBasicAuthorizedLegacyClient<CfClient>(_settings, cancellationToken).ConfigureAwait(false);
-        var result = await client.GetAsync("/v3/spaces", cancellationToken)
+        var result = await client.GetAsync($"/v3/spaces?names={HttpUtility.UrlEncode(spaceName)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-space", HttpAsyncResponseMessageExtension.RecoverOptions.ALLWAYS).ConfigureAwait(false);
         try
         {
@@ -180,8 +182,9 @@
 
     private async Task<Guid> GetServiceInstances(string tenantName, Guid? spaceId, CancellationToken cancellationToken)
     {
+        var name = $"{tenantName}-dim-instance";
         var client = await _basicAuthTokenService.GetBasicAuthorizedLegacyClient<CfClient>(_settings, cancellationToken).ConfigureAwait(false);
-        var result = await client.GetAsync("/v3/service_instances", cancellationToken)
+        var result = await client.GetAsync($"/v3/service_instances?names={HttpUtility.UrlEncode(name)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-si", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
         try
         {
@@ -193,7 +196,6 @@
                 throw new ServiceException("Response must not be null");
             }
 
-            var name = $"{tenantName}-dim-instance";
             var resources = response.Resources.Where(x => x.Name == name && x.Type == "managed" && (spaceId == null || x.Relationships.Space.Data.Id == spaceId.Value) && x.LastOperation.State == "succeeded");
             if (resources.Count() != 1)
             {
@@ -226,7 +228,7 @@
     {
         var client = await _basicAuthTokenService.GetBasicAuthorizedLegacyClient<CfClient>(_settings, cancellationToken).ConfigureAwait(false);
         var serviceInstanceId = await GetServiceInstances(tenantName, spaceId, cancellationToken).ConfigureAwait(false);
-        var result = await client.GetAsync($"/v3/service_credential_bindings?names={bindingName}", cancellationToken)
+        var result = await client.GetAsync($"/v3/service_credential_bindings?names={HttpUtility.UrlEncode(bindingName)}", cancellationToken)
             .CatchingIntoServiceExceptionFor("get-credential-binding", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false);
         try
         {

diff --git a/src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs b/src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs b/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs b/src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Cf/ICfClient.cs b/src/clients/Dim.Clients/Api/Cf/ICfClient.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Cf/ServicePlanResponse.cs b/src/clients/Dim.Clients/Api/Cf/ServicePlanResponse.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Dim/ApplicationResponse.cs b/src/clients/Dim.Clients/Api/Dim/ApplicationResponse.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Dim/CompanyIdentityPatch.cs b/src/clients/Dim.Clients/Api/Dim/CompanyIdentityPatch.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional

diff --git a/src/clients/Dim.Clients/Api/Dim/CreateApplicationRequest.cs b/src/clients/Dim.Clients/Api/Dim/CreateApplicationRequest.cs
@@ -1,4 +1,5 @@
 /********************************************************************************
+ * Copyright (c) 2024 BMW Group AG
  * Copyright 2024 SAP SE or an SAP affiliate company and ssi-dim-middle-layer contributors.
  *
  * See the NOTICE file(s) distributed with this work for additional