From cfaf8f26050a6a19855f4b5ccf4ca1df8cdbad70 Mon Sep 17 00:00:00 2001 From: Vicente Pinto Date: Fri, 22 Dec 2023 16:03:18 +0000 Subject: [PATCH] Fix object storage credential custom endpoint and resource manager regex commnet (#178) --- .../internal/services/objectstorage/credential/resource.go | 4 ++-- stackit/internal/services/resourcemanager/project/resource.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stackit/internal/services/objectstorage/credential/resource.go b/stackit/internal/services/objectstorage/credential/resource.go index 5163dd75..05fd0062 100644 --- a/stackit/internal/services/objectstorage/credential/resource.go +++ b/stackit/internal/services/objectstorage/credential/resource.go @@ -70,10 +70,10 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu var apiClient *objectstorage.APIClient var err error - if providerData.PostgreSQLCustomEndpoint != "" { + if providerData.ObjectStorageCustomEndpoint != "" { apiClient, err = objectstorage.NewAPIClient( config.WithCustomAuth(providerData.RoundTripper), - config.WithEndpoint(providerData.PostgreSQLCustomEndpoint), + config.WithEndpoint(providerData.ObjectStorageCustomEndpoint), ) } else { apiClient, err = objectstorage.NewAPIClient( diff --git a/stackit/internal/services/resourcemanager/project/resource.go b/stackit/internal/services/resourcemanager/project/resource.go index 5912cf2e..68219f31 100644 --- a/stackit/internal/services/resourcemanager/project/resource.go +++ b/stackit/internal/services/resourcemanager/project/resource.go @@ -171,7 +171,7 @@ func (r *projectResource) Schema(_ context.Context, _ resource.SchemaRequest, re ), mapvalidator.ValueStringsAre( stringvalidator.RegexMatches( - regexp.MustCompile(`[A-ZÄÜÖa-zäüöß0-9_-]{1,64}`), + regexp.MustCompile(`^$|[A-ZÄÜÖa-zäüöß0-9_-]{1,64}`), "must match expression"), ), },