Skip to content

Commit 1caa15e

Browse files
committed
fix: update schema for subaccount api and ignore unknown properties
1 parent 146e64d commit 1caa15e

File tree

36 files changed

+807
-90
lines changed

36 files changed

+807
-90
lines changed

internal/clients/servicemanager/service_instance_proxy_client.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,32 @@ func (t ServiceManagerInstanceProxyClient) describeAdminBinding(ctx context.Cont
8484
return nil, nil
8585
}
8686

87-
return (*BindingCredentials)(response), err
87+
return mapBindingCredentialTypes(response), err
8888
}
8989

9090
func (t ServiceManagerInstanceProxyClient) createAdminBinding(ctx context.Context, subaccountGuid string) (*BindingCredentials, error) {
9191
result, _, err := t.CreateServiceManagementBinding(ctx, subaccountGuid).Execute()
9292
if err != nil {
9393
return nil, err
9494
}
95-
return (*BindingCredentials)(result), err
95+
return mapBindingCredentialTypes(result), err
9696
}
9797

9898
func (t ServiceManagerInstanceProxyClient) deleteAdminBinding(ctx context.Context, subaccountGuid string) error {
9999
_, err := t.DeleteServiceManagementBindingOfSubaccount(ctx, subaccountGuid).Execute()
100100
return err
101101
}
102+
103+
// mapBindingCredentialTypes is a helper function to convert ServiceManagerBindingResponseObject to BindingCredentials by mapping each value individually
104+
func mapBindingCredentialTypes(in *accountsserviceclient.ServiceManagerBindingResponseObject) *BindingCredentials {
105+
if in == nil {
106+
return nil
107+
}
108+
out := new(BindingCredentials)
109+
out.Clientid = in.Clientid
110+
out.Clientsecret = in.Clientsecret
111+
out.Url = in.Url
112+
out.SmUrl = in.SmUrl
113+
out.Xsappname = in.Xsappname
114+
return out
115+
}

internal/openapi_clients/btp-accounts-service-api-go/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for other OS see [official guide](https://openapi-generator.tech/docs/installati
99

1010
### How to regenerate
1111
```bash
12-
openapi-generator generate -i swagger-patched.json -g go -o pkg/ --additional-properties=generateInterfaces=true
12+
openapi-generator generate -i swagger-patched.json -g go -o pkg/ --additional-properties=generateInterfaces=true,disallowAdditionalPropertiesIfNotPresent=false
1313
go mod tidy -v
1414
```
1515

internal/openapi_clients/btp-accounts-service-api-go/pkg/api/openapi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4777,7 +4777,6 @@ components:
47774777
- displayName
47784778
- globalAccountGUID
47794779
- guid
4780-
- parentFeatures
47814780
- parentGUID
47824781
- region
47834782
- state

internal/openapi_clients/btp-accounts-service-api-go/pkg/model_add_property_request_payload.go

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/openapi_clients/btp-accounts-service-api-go/pkg/model_api_exception_response_object.go

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/openapi_clients/btp-accounts-service-api-go/pkg/model_api_exception_response_object_error.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/openapi_clients/btp-accounts-service-api-go/pkg/model_clone_neo_subaccount_request_payload.go

Lines changed: 25 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/openapi_clients/btp-accounts-service-api-go/pkg/model_create_directory_request_payload.go

Lines changed: 20 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/openapi_clients/btp-accounts-service-api-go/pkg/model_create_service_manager_binding_request_payload.go

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)