stackit-dev-tools/terraform-provider-stackitprivatepreview
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix object storage credential custom endpoint and resource manager regex commnet (#178)

Browse source
This commit is contained in:
Vicente Pinto 2023-12-22 16:03:18 +00:00 • committed by GitHub
parent c7effac5c7
commit cfaf8f2605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stackit/internal/services/objectstorage/credential/resource.go
View file

@ -70,10 +70,10 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
var apiClient *objectstorage.APIClient var apiClient *objectstorage.APIClient
var err error var err error
if providerData.PostgreSQLCustomEndpoint != "" { if providerData.ObjectStorageCustomEndpoint != "" {
apiClient, err = objectstorage.NewAPIClient( apiClient, err = objectstorage.NewAPIClient(
config.WithCustomAuth(providerData.RoundTripper), config.WithCustomAuth(providerData.RoundTripper),
config.WithEndpoint(providerData.PostgreSQLCustomEndpoint), config.WithEndpoint(providerData.ObjectStorageCustomEndpoint),
) )
} else { } else {
apiClient, err = objectstorage.NewAPIClient( apiClient, err = objectstorage.NewAPIClient(

2
stackit/internal/services/resourcemanager/project/resource.go
View file

@ -171,7 +171,7 @@ func (r *projectResource) Schema(_ context.Context, _ resource.SchemaRequest, re
), ),
mapvalidator.ValueStringsAre( mapvalidator.ValueStringsAre(
stringvalidator.RegexMatches( 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"), "must match expression"),
), ),
}, },