Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(technicalUser): add technical user creation #18

Merged
merged 10 commits into from
May 14, 2024
Merged

feat(technicalUser): add technical user creation #18

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34dd40c
feat(ci): adjust company identity creation (#36)
Phil91 Apr 19, 2024
2a3a199
fix(env): adjust callback environment
Phil91 Apr 24, 2024
c3db60b
build: release v0.0.4
Phil91 Apr 24, 2024
50320b9
fix(technicalUser): fix callback url for technical user
Phil91 Apr 25, 2024
f92a926
Merge remote-tracking branch 'dim/main'
Phil91 Apr 26, 2024
4762a50
chore: adjust get queries to filter for name (#43)
Phil91 Apr 30, 2024
3308287
fix: add url encoding to get endpoints (#44)
Phil91 Apr 30, 2024
456b426
Merge remote-tracking branch 'dim/main' into feature/add-technical-user
Phil91 May 8, 2024
a5e74d6
revert version bump
Phil91 May 8, 2024
242234a
adjust copyright header
Phil91 May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
evegufy marked this conversation as resolved.
Show resolved Hide resolved
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/chart-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/kics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/lint-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/migrations-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/owasp-zap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/processes-worker-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/service-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sonarcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/trivy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/unit.tests-formatting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .reuse/dep5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion charts/chart-testing-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/configmap-postgres-init.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/cronjob-processes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/job-migrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/secret-external-db.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/secret-postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion charts/dim/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion consortia/argocd-app-templates/appsetup-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion consortia/argocd-app-templates/appsetup-int.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion consortia/environments/values-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
5 changes: 3 additions & 2 deletions consortia/environments/values-int.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile-dim-migrations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile-dim-processes-worker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile-dim-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/clients/Dim.Clients/Api/Cf/AddSpaceRoleToUserRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 7 additions & 5 deletions src/clients/Dim.Clients/Api/Cf/CfClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down Expand Up @@ -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);

Check warning on line 82 in src/clients/Dim.Clients/Api/Cf/CfClient.cs

View workflow job for this annotation

GitHub Actions / build (8.0) 

Dereference of a possibly null reference.

Check warning on line 82 in src/clients/Dim.Clients/Api/Cf/CfClient.cs

View workflow job for this annotation

GitHub Actions / build (8.0) 

Dereference of a possibly null reference.
if (tenantEnvironment.Count() > 1)
{
throw new ConflictException($"There should only be one cf environment for tenant {tenantName}");
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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
{
Expand All @@ -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)
{
Expand Down Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions src/clients/Dim.Clients/Api/Cf/CreateCfeRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfClientServiceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions src/clients/Dim.Clients/Api/Cf/DependencyInjection/CfSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading