diff --git a/.codegen/impl.go.tmpl b/.codegen/impl.go.tmpl index 9ddaa2694..6e8ec47d2 100644 --- a/.codegen/impl.go.tmpl +++ b/.codegen/impl.go.tmpl @@ -8,6 +8,7 @@ import ( "time" "io" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" {{range .ImportedPackages}} "github.com/databricks/databricks-sdk-go/service/{{.}}"{{end}} @@ -22,7 +23,7 @@ type {{.CamelName}}Impl struct { func (a *{{.Service.CamelName}}Impl) {{.PascalName}}(ctx context.Context{{if .Request}}, request {{.Request.PascalName}}{{end}}) {{ template "response-type" . }} { {{- template "response-var" . }} path := {{if .PathParts -}} - fmt.Sprintf("{{range .PathParts}}{{.Prefix}}{{if or .Field .IsAccountId}}%v{{end}}{{ end }}"{{ range .PathParts }}{{if .Field}}, request.{{.Field.PascalName}}{{ else if .IsAccountId }}, a.client.ConfiguredAccountID(){{end}}{{ end }}) + fmt.Sprintf("{{range .PathParts}}{{.Prefix}}{{if or .Field .IsAccountId}}%v{{end}}{{ end }}"{{ range .PathParts }}{{if .Field}}, strings.TrimPrefix(fmt.Sprint(request.{{.Field.PascalName}}), "/"){{ else if .IsAccountId }}, a.client.ConfiguredAccountID(){{end}}{{ end }}) {{- else}}"{{.Path}}"{{end}} {{ template "make-header" . }} err := a.client.Do(ctx, http.Method{{.TitleVerb}}, path, headers, {{ template "request-param" . }}, {{if .Response}}&{{.Response.CamelName}}{{else}}nil{{end}}) diff --git a/apierr/error_mapping.go b/apierr/error_mapping.go index 0bb3c299d..6ebcf8d9e 100755 --- a/apierr/error_mapping.go +++ b/apierr/error_mapping.go @@ -19,6 +19,7 @@ var ( ErrTemporarilyUnavailable = errors.New("the service is currently unavailable") ErrDeadlineExceeded = errors.New("the deadline expired before the operation could complete") ErrInvalidParameterValue = inheritErr(ErrBadRequest, "supplied value for a parameter was invalid") + ErrResourceDoesNotExist = inheritErr(ErrNotFound, "operation was performed on a resource that does not exist") ErrAborted = inheritErr(ErrResourceConflict, "the operation was aborted, typically due to a concurrency issue such as a sequencer check failure") ErrAlreadyExists = inheritErr(ErrResourceConflict, "operation was rejected due a conflict with an existing resource") ErrResourceAlreadyExists = inheritErr(ErrResourceConflict, "operation was rejected due a conflict with an existing resource") @@ -43,6 +44,7 @@ var ( errorCodeMapping = map[string]error{ "INVALID_PARAMETER_VALUE": ErrInvalidParameterValue, + "RESOURCE_DOES_NOT_EXIST": ErrResourceDoesNotExist, "ABORTED": ErrAborted, "ALREADY_EXISTS": ErrAlreadyExists, "RESOURCE_ALREADY_EXISTS": ErrResourceAlreadyExists, diff --git a/error_alias.go b/error_alias.go index 98d907acd..d4165bd0e 100755 --- a/error_alias.go +++ b/error_alias.go @@ -29,6 +29,8 @@ var ( ErrDeadlineExceeded = apierr.ErrDeadlineExceeded // supplied value for a parameter was invalid ErrInvalidParameterValue = apierr.ErrInvalidParameterValue + // operation was performed on a resource that does not exist + ErrResourceDoesNotExist = apierr.ErrResourceDoesNotExist // the operation was aborted, typically due to a concurrency issue such as a sequencer check failure ErrAborted = apierr.ErrAborted // operation was rejected due a conflict with an existing resource diff --git a/service/billing/impl.go b/service/billing/impl.go index 1ed819734..f4e49b54a 100755 --- a/service/billing/impl.go +++ b/service/billing/impl.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -41,7 +42,7 @@ func (a *budgetsImpl) Create(ctx context.Context, request WrappedBudget) (*Wrapp } func (a *budgetsImpl) Delete(ctx context.Context, request DeleteBudgetRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/budget/%v", a.client.ConfiguredAccountID(), request.BudgetId) + path := fmt.Sprintf("/api/2.0/accounts/%v/budget/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.BudgetId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -50,7 +51,7 @@ func (a *budgetsImpl) Delete(ctx context.Context, request DeleteBudgetRequest) e func (a *budgetsImpl) Get(ctx context.Context, request GetBudgetRequest) (*WrappedBudgetWithStatus, error) { var wrappedBudgetWithStatus WrappedBudgetWithStatus - path := fmt.Sprintf("/api/2.0/accounts/%v/budget/%v", a.client.ConfiguredAccountID(), request.BudgetId) + path := fmt.Sprintf("/api/2.0/accounts/%v/budget/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.BudgetId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &wrappedBudgetWithStatus) @@ -67,7 +68,7 @@ func (a *budgetsImpl) List(ctx context.Context) (*BudgetList, error) { } func (a *budgetsImpl) Update(ctx context.Context, request WrappedBudget) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/budget/%v", a.client.ConfiguredAccountID(), request.BudgetId) + path := fmt.Sprintf("/api/2.0/accounts/%v/budget/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.BudgetId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -92,7 +93,7 @@ func (a *logDeliveryImpl) Create(ctx context.Context, request WrappedCreateLogDe func (a *logDeliveryImpl) Get(ctx context.Context, request GetLogDeliveryRequest) (*WrappedLogDeliveryConfiguration, error) { var wrappedLogDeliveryConfiguration WrappedLogDeliveryConfiguration - path := fmt.Sprintf("/api/2.0/accounts/%v/log-delivery/%v", a.client.ConfiguredAccountID(), request.LogDeliveryConfigurationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/log-delivery/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.LogDeliveryConfigurationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &wrappedLogDeliveryConfiguration) @@ -109,7 +110,7 @@ func (a *logDeliveryImpl) List(ctx context.Context, request ListLogDeliveryReque } func (a *logDeliveryImpl) PatchStatus(ctx context.Context, request UpdateLogDeliveryConfigurationStatusRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/log-delivery/%v", a.client.ConfiguredAccountID(), request.LogDeliveryConfigurationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/log-delivery/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.LogDeliveryConfigurationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/catalog/catalogs_usage_test.go b/service/catalog/catalogs_usage_test.go index 2a04dcbdb..b9ead28c9 100755 --- a/service/catalog/catalogs_usage_test.go +++ b/service/catalog/catalogs_usage_test.go @@ -238,9 +238,8 @@ func ExampleCatalogsAPI_Update_catalogs() { logger.Infof(ctx, "found %v", created) _, err = w.Catalogs.Update(ctx, catalog.UpdateCatalog{ - Name: created.Name, - Comment: "updated", - EnablePredictiveOptimization: catalog.EnablePredictiveOptimizationEnable, + Name: created.Name, + Comment: "updated", }) if err != nil { panic(err) diff --git a/service/catalog/impl.go b/service/catalog/impl.go index aa1d88fcf..57dafe76e 100755 --- a/service/catalog/impl.go +++ b/service/catalog/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -16,7 +17,7 @@ type accountMetastoreAssignmentsImpl struct { } func (a *accountMetastoreAssignmentsImpl) Create(ctx context.Context, request AccountsCreateMetastoreAssignment) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastores/%v", a.client.ConfiguredAccountID(), request.WorkspaceId, request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastores/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/"), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -25,7 +26,7 @@ func (a *accountMetastoreAssignmentsImpl) Create(ctx context.Context, request Ac } func (a *accountMetastoreAssignmentsImpl) Delete(ctx context.Context, request DeleteAccountMetastoreAssignmentRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastores/%v", a.client.ConfiguredAccountID(), request.WorkspaceId, request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastores/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/"), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -34,7 +35,7 @@ func (a *accountMetastoreAssignmentsImpl) Delete(ctx context.Context, request De func (a *accountMetastoreAssignmentsImpl) Get(ctx context.Context, request GetAccountMetastoreAssignmentRequest) (*AccountsMetastoreAssignment, error) { var accountsMetastoreAssignment AccountsMetastoreAssignment - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastore", a.client.ConfiguredAccountID(), request.WorkspaceId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastore", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &accountsMetastoreAssignment) @@ -43,7 +44,7 @@ func (a *accountMetastoreAssignmentsImpl) Get(ctx context.Context, request GetAc func (a *accountMetastoreAssignmentsImpl) List(ctx context.Context, request ListAccountMetastoreAssignmentsRequest) (*ListAccountMetastoreAssignmentsResponse, error) { var listAccountMetastoreAssignmentsResponse ListAccountMetastoreAssignmentsResponse - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/workspaces", a.client.ConfiguredAccountID(), request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/workspaces", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listAccountMetastoreAssignmentsResponse) @@ -51,7 +52,7 @@ func (a *accountMetastoreAssignmentsImpl) List(ctx context.Context, request List } func (a *accountMetastoreAssignmentsImpl) Update(ctx context.Context, request AccountsUpdateMetastoreAssignment) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastores/%v", a.client.ConfiguredAccountID(), request.WorkspaceId, request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/metastores/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/"), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -75,7 +76,7 @@ func (a *accountMetastoresImpl) Create(ctx context.Context, request AccountsCrea } func (a *accountMetastoresImpl) Delete(ctx context.Context, request DeleteAccountMetastoreRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v", a.client.ConfiguredAccountID(), request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -84,7 +85,7 @@ func (a *accountMetastoresImpl) Delete(ctx context.Context, request DeleteAccoun func (a *accountMetastoresImpl) Get(ctx context.Context, request GetAccountMetastoreRequest) (*AccountsMetastoreInfo, error) { var accountsMetastoreInfo AccountsMetastoreInfo - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v", a.client.ConfiguredAccountID(), request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &accountsMetastoreInfo) @@ -102,7 +103,7 @@ func (a *accountMetastoresImpl) List(ctx context.Context) (*ListMetastoresRespon func (a *accountMetastoresImpl) Update(ctx context.Context, request AccountsUpdateMetastore) (*AccountsMetastoreInfo, error) { var accountsMetastoreInfo AccountsMetastoreInfo - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v", a.client.ConfiguredAccountID(), request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -117,7 +118,7 @@ type accountStorageCredentialsImpl struct { func (a *accountStorageCredentialsImpl) Create(ctx context.Context, request AccountsCreateStorageCredential) (*AccountsStorageCredentialInfo, error) { var accountsStorageCredentialInfo AccountsStorageCredentialInfo - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials", a.client.ConfiguredAccountID(), request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -126,7 +127,7 @@ func (a *accountStorageCredentialsImpl) Create(ctx context.Context, request Acco } func (a *accountStorageCredentialsImpl) Delete(ctx context.Context, request DeleteAccountStorageCredentialRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials/%v", a.client.ConfiguredAccountID(), request.MetastoreId, request.StorageCredentialName) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/"), strings.TrimPrefix(fmt.Sprint(request.StorageCredentialName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -135,7 +136,7 @@ func (a *accountStorageCredentialsImpl) Delete(ctx context.Context, request Dele func (a *accountStorageCredentialsImpl) Get(ctx context.Context, request GetAccountStorageCredentialRequest) (*AccountsStorageCredentialInfo, error) { var accountsStorageCredentialInfo AccountsStorageCredentialInfo - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials/%v", a.client.ConfiguredAccountID(), request.MetastoreId, request.StorageCredentialName) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/"), strings.TrimPrefix(fmt.Sprint(request.StorageCredentialName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &accountsStorageCredentialInfo) @@ -144,7 +145,7 @@ func (a *accountStorageCredentialsImpl) Get(ctx context.Context, request GetAcco func (a *accountStorageCredentialsImpl) List(ctx context.Context, request ListAccountStorageCredentialsRequest) ([]StorageCredentialInfo, error) { var storageCredentialInfoList []StorageCredentialInfo - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials", a.client.ConfiguredAccountID(), request.MetastoreId) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &storageCredentialInfoList) @@ -153,7 +154,7 @@ func (a *accountStorageCredentialsImpl) List(ctx context.Context, request ListAc func (a *accountStorageCredentialsImpl) Update(ctx context.Context, request AccountsUpdateStorageCredential) (*AccountsStorageCredentialInfo, error) { var accountsStorageCredentialInfo AccountsStorageCredentialInfo - path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials/%v", a.client.ConfiguredAccountID(), request.MetastoreId, request.StorageCredentialName) + path := fmt.Sprintf("/api/2.0/accounts/%v/metastores/%v/storage-credentials/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/"), strings.TrimPrefix(fmt.Sprint(request.StorageCredentialName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -168,7 +169,7 @@ type artifactAllowlistsImpl struct { func (a *artifactAllowlistsImpl) Get(ctx context.Context, request GetArtifactAllowlistRequest) (*ArtifactAllowlistInfo, error) { var artifactAllowlistInfo ArtifactAllowlistInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/artifact-allowlists/%v", request.ArtifactType) + path := fmt.Sprintf("/api/2.1/unity-catalog/artifact-allowlists/%v", strings.TrimPrefix(fmt.Sprint(request.ArtifactType), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &artifactAllowlistInfo) @@ -177,7 +178,7 @@ func (a *artifactAllowlistsImpl) Get(ctx context.Context, request GetArtifactAll func (a *artifactAllowlistsImpl) Update(ctx context.Context, request SetArtifactAllowlist) (*ArtifactAllowlistInfo, error) { var artifactAllowlistInfo ArtifactAllowlistInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/artifact-allowlists/%v", request.ArtifactType) + path := fmt.Sprintf("/api/2.1/unity-catalog/artifact-allowlists/%v", strings.TrimPrefix(fmt.Sprint(request.ArtifactType), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -201,7 +202,7 @@ func (a *catalogsImpl) Create(ctx context.Context, request CreateCatalog) (*Cata } func (a *catalogsImpl) Delete(ctx context.Context, request DeleteCatalogRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/catalogs/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/catalogs/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -210,7 +211,7 @@ func (a *catalogsImpl) Delete(ctx context.Context, request DeleteCatalogRequest) func (a *catalogsImpl) Get(ctx context.Context, request GetCatalogRequest) (*CatalogInfo, error) { var catalogInfo CatalogInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/catalogs/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/catalogs/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &catalogInfo) @@ -228,7 +229,7 @@ func (a *catalogsImpl) List(ctx context.Context) (*ListCatalogsResponse, error) func (a *catalogsImpl) Update(ctx context.Context, request UpdateCatalog) (*CatalogInfo, error) { var catalogInfo CatalogInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/catalogs/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/catalogs/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -252,7 +253,7 @@ func (a *connectionsImpl) Create(ctx context.Context, request CreateConnection) } func (a *connectionsImpl) Delete(ctx context.Context, request DeleteConnectionRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/connections/%v", request.NameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/connections/%v", strings.TrimPrefix(fmt.Sprint(request.NameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -261,7 +262,7 @@ func (a *connectionsImpl) Delete(ctx context.Context, request DeleteConnectionRe func (a *connectionsImpl) Get(ctx context.Context, request GetConnectionRequest) (*ConnectionInfo, error) { var connectionInfo ConnectionInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/connections/%v", request.NameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/connections/%v", strings.TrimPrefix(fmt.Sprint(request.NameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &connectionInfo) @@ -279,7 +280,7 @@ func (a *connectionsImpl) List(ctx context.Context) (*ListConnectionsResponse, e func (a *connectionsImpl) Update(ctx context.Context, request UpdateConnection) (*ConnectionInfo, error) { var connectionInfo ConnectionInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/connections/%v", request.NameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/connections/%v", strings.TrimPrefix(fmt.Sprint(request.NameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -303,7 +304,7 @@ func (a *externalLocationsImpl) Create(ctx context.Context, request CreateExtern } func (a *externalLocationsImpl) Delete(ctx context.Context, request DeleteExternalLocationRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/external-locations/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/external-locations/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -312,7 +313,7 @@ func (a *externalLocationsImpl) Delete(ctx context.Context, request DeleteExtern func (a *externalLocationsImpl) Get(ctx context.Context, request GetExternalLocationRequest) (*ExternalLocationInfo, error) { var externalLocationInfo ExternalLocationInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/external-locations/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/external-locations/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &externalLocationInfo) @@ -330,7 +331,7 @@ func (a *externalLocationsImpl) List(ctx context.Context) (*ListExternalLocation func (a *externalLocationsImpl) Update(ctx context.Context, request UpdateExternalLocation) (*ExternalLocationInfo, error) { var externalLocationInfo ExternalLocationInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/external-locations/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/external-locations/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -354,7 +355,7 @@ func (a *functionsImpl) Create(ctx context.Context, request CreateFunctionReques } func (a *functionsImpl) Delete(ctx context.Context, request DeleteFunctionRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/functions/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/functions/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -363,7 +364,7 @@ func (a *functionsImpl) Delete(ctx context.Context, request DeleteFunctionReques func (a *functionsImpl) Get(ctx context.Context, request GetFunctionRequest) (*FunctionInfo, error) { var functionInfo FunctionInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/functions/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/functions/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &functionInfo) @@ -381,7 +382,7 @@ func (a *functionsImpl) List(ctx context.Context, request ListFunctionsRequest) func (a *functionsImpl) Update(ctx context.Context, request UpdateFunction) (*FunctionInfo, error) { var functionInfo FunctionInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/functions/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/functions/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -396,7 +397,7 @@ type grantsImpl struct { func (a *grantsImpl) Get(ctx context.Context, request GetGrantRequest) (*PermissionsList, error) { var permissionsList PermissionsList - path := fmt.Sprintf("/api/2.1/unity-catalog/permissions/%v/%v", request.SecurableType, request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.SecurableType), "/"), strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &permissionsList) @@ -405,7 +406,7 @@ func (a *grantsImpl) Get(ctx context.Context, request GetGrantRequest) (*Permiss func (a *grantsImpl) GetEffective(ctx context.Context, request GetEffectiveRequest) (*EffectivePermissionsList, error) { var effectivePermissionsList EffectivePermissionsList - path := fmt.Sprintf("/api/2.1/unity-catalog/effective-permissions/%v/%v", request.SecurableType, request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/effective-permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.SecurableType), "/"), strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &effectivePermissionsList) @@ -414,7 +415,7 @@ func (a *grantsImpl) GetEffective(ctx context.Context, request GetEffectiveReque func (a *grantsImpl) Update(ctx context.Context, request UpdatePermissions) (*PermissionsList, error) { var permissionsList PermissionsList - path := fmt.Sprintf("/api/2.1/unity-catalog/permissions/%v/%v", request.SecurableType, request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.SecurableType), "/"), strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -428,7 +429,7 @@ type metastoresImpl struct { } func (a *metastoresImpl) Assign(ctx context.Context, request CreateMetastoreAssignment) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/workspaces/%v/metastore", request.WorkspaceId) + path := fmt.Sprintf("/api/2.1/unity-catalog/workspaces/%v/metastore", strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -456,7 +457,7 @@ func (a *metastoresImpl) Current(ctx context.Context) (*MetastoreAssignment, err } func (a *metastoresImpl) Delete(ctx context.Context, request DeleteMetastoreRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v", request.Id) + path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -465,7 +466,7 @@ func (a *metastoresImpl) Delete(ctx context.Context, request DeleteMetastoreRequ func (a *metastoresImpl) Get(ctx context.Context, request GetMetastoreRequest) (*MetastoreInfo, error) { var metastoreInfo MetastoreInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v", request.Id) + path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &metastoreInfo) @@ -491,7 +492,7 @@ func (a *metastoresImpl) Summary(ctx context.Context) (*GetMetastoreSummaryRespo } func (a *metastoresImpl) Unassign(ctx context.Context, request UnassignRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/workspaces/%v/metastore", request.WorkspaceId) + path := fmt.Sprintf("/api/2.1/unity-catalog/workspaces/%v/metastore", strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -500,7 +501,7 @@ func (a *metastoresImpl) Unassign(ctx context.Context, request UnassignRequest) func (a *metastoresImpl) Update(ctx context.Context, request UpdateMetastore) (*MetastoreInfo, error) { var metastoreInfo MetastoreInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v", request.Id) + path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -509,7 +510,7 @@ func (a *metastoresImpl) Update(ctx context.Context, request UpdateMetastore) (* } func (a *metastoresImpl) UpdateAssignment(ctx context.Context, request UpdateMetastoreAssignment) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/workspaces/%v/metastore", request.WorkspaceId) + path := fmt.Sprintf("/api/2.1/unity-catalog/workspaces/%v/metastore", strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -523,7 +524,7 @@ type modelVersionsImpl struct { } func (a *modelVersionsImpl) Delete(ctx context.Context, request DeleteModelVersionRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions/%v", request.FullName, request.Version) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/"), strings.TrimPrefix(fmt.Sprint(request.Version), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -531,7 +532,7 @@ func (a *modelVersionsImpl) Delete(ctx context.Context, request DeleteModelVersi func (a *modelVersionsImpl) Get(ctx context.Context, request GetModelVersionRequest) (*RegisteredModelInfo, error) { var registeredModelInfo RegisteredModelInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions/%v", request.FullName, request.Version) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/"), strings.TrimPrefix(fmt.Sprint(request.Version), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, ®isteredModelInfo) @@ -540,7 +541,7 @@ func (a *modelVersionsImpl) Get(ctx context.Context, request GetModelVersionRequ func (a *modelVersionsImpl) GetByAlias(ctx context.Context, request GetByAliasRequest) (*ModelVersionInfo, error) { var modelVersionInfo ModelVersionInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/aliases/%v", request.FullName, request.Alias) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/aliases/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/"), strings.TrimPrefix(fmt.Sprint(request.Alias), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &modelVersionInfo) @@ -549,7 +550,7 @@ func (a *modelVersionsImpl) GetByAlias(ctx context.Context, request GetByAliasRe func (a *modelVersionsImpl) List(ctx context.Context, request ListModelVersionsRequest) (*ListModelVersionsResponse, error) { var listModelVersionsResponse ListModelVersionsResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listModelVersionsResponse) @@ -558,7 +559,7 @@ func (a *modelVersionsImpl) List(ctx context.Context, request ListModelVersionsR func (a *modelVersionsImpl) Update(ctx context.Context, request UpdateModelVersionRequest) (*ModelVersionInfo, error) { var modelVersionInfo ModelVersionInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions/%v", request.FullName, request.Version) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/versions/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/"), strings.TrimPrefix(fmt.Sprint(request.Version), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -582,14 +583,14 @@ func (a *registeredModelsImpl) Create(ctx context.Context, request CreateRegiste } func (a *registeredModelsImpl) Delete(ctx context.Context, request DeleteRegisteredModelRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err } func (a *registeredModelsImpl) DeleteAlias(ctx context.Context, request DeleteAliasRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/aliases/%v", request.FullName, request.Alias) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/aliases/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/"), strings.TrimPrefix(fmt.Sprint(request.Alias), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -597,7 +598,7 @@ func (a *registeredModelsImpl) DeleteAlias(ctx context.Context, request DeleteAl func (a *registeredModelsImpl) Get(ctx context.Context, request GetRegisteredModelRequest) (*RegisteredModelInfo, error) { var registeredModelInfo RegisteredModelInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, ®isteredModelInfo) @@ -615,7 +616,7 @@ func (a *registeredModelsImpl) List(ctx context.Context, request ListRegisteredM func (a *registeredModelsImpl) SetAlias(ctx context.Context, request SetRegisteredModelAliasRequest) (*RegisteredModelAlias, error) { var registeredModelAlias RegisteredModelAlias - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/aliases/%v", request.FullName, request.Alias) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v/aliases/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/"), strings.TrimPrefix(fmt.Sprint(request.Alias), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -625,7 +626,7 @@ func (a *registeredModelsImpl) SetAlias(ctx context.Context, request SetRegister func (a *registeredModelsImpl) Update(ctx context.Context, request UpdateRegisteredModelRequest) (*RegisteredModelInfo, error) { var registeredModelInfo RegisteredModelInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/models/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -649,7 +650,7 @@ func (a *schemasImpl) Create(ctx context.Context, request CreateSchema) (*Schema } func (a *schemasImpl) Delete(ctx context.Context, request DeleteSchemaRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/schemas/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/schemas/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -658,7 +659,7 @@ func (a *schemasImpl) Delete(ctx context.Context, request DeleteSchemaRequest) e func (a *schemasImpl) Get(ctx context.Context, request GetSchemaRequest) (*SchemaInfo, error) { var schemaInfo SchemaInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/schemas/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/schemas/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &schemaInfo) @@ -676,7 +677,7 @@ func (a *schemasImpl) List(ctx context.Context, request ListSchemasRequest) (*Li func (a *schemasImpl) Update(ctx context.Context, request UpdateSchema) (*SchemaInfo, error) { var schemaInfo SchemaInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/schemas/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/schemas/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -700,7 +701,7 @@ func (a *storageCredentialsImpl) Create(ctx context.Context, request CreateStora } func (a *storageCredentialsImpl) Delete(ctx context.Context, request DeleteStorageCredentialRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/storage-credentials/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/storage-credentials/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -709,7 +710,7 @@ func (a *storageCredentialsImpl) Delete(ctx context.Context, request DeleteStora func (a *storageCredentialsImpl) Get(ctx context.Context, request GetStorageCredentialRequest) (*StorageCredentialInfo, error) { var storageCredentialInfo StorageCredentialInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/storage-credentials/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/storage-credentials/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &storageCredentialInfo) @@ -727,7 +728,7 @@ func (a *storageCredentialsImpl) List(ctx context.Context) (*ListStorageCredenti func (a *storageCredentialsImpl) Update(ctx context.Context, request UpdateStorageCredential) (*StorageCredentialInfo, error) { var storageCredentialInfo StorageCredentialInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/storage-credentials/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/storage-credentials/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -751,7 +752,7 @@ type systemSchemasImpl struct { } func (a *systemSchemasImpl) Disable(ctx context.Context, request DisableRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v/systemschemas/%v", request.MetastoreId, request.SchemaName) + path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v/systemschemas/%v", strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/"), strings.TrimPrefix(fmt.Sprint(request.SchemaName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -759,7 +760,7 @@ func (a *systemSchemasImpl) Disable(ctx context.Context, request DisableRequest) } func (a *systemSchemasImpl) Enable(ctx context.Context, request EnableRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v/systemschemas/%v", request.MetastoreId, request.SchemaName) + path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v/systemschemas/%v", strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/"), strings.TrimPrefix(fmt.Sprint(request.SchemaName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPut, path, headers, nil, nil) @@ -768,7 +769,7 @@ func (a *systemSchemasImpl) Enable(ctx context.Context, request EnableRequest) e func (a *systemSchemasImpl) List(ctx context.Context, request ListSystemSchemasRequest) (*ListSystemSchemasResponse, error) { var listSystemSchemasResponse ListSystemSchemasResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v/systemschemas", request.MetastoreId) + path := fmt.Sprintf("/api/2.1/unity-catalog/metastores/%v/systemschemas", strings.TrimPrefix(fmt.Sprint(request.MetastoreId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listSystemSchemasResponse) @@ -791,7 +792,7 @@ func (a *tableConstraintsImpl) Create(ctx context.Context, request CreateTableCo } func (a *tableConstraintsImpl) Delete(ctx context.Context, request DeleteTableConstraintRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/constraints/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/constraints/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -804,7 +805,7 @@ type tablesImpl struct { } func (a *tablesImpl) Delete(ctx context.Context, request DeleteTableRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/tables/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/tables/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -813,7 +814,7 @@ func (a *tablesImpl) Delete(ctx context.Context, request DeleteTableRequest) err func (a *tablesImpl) Get(ctx context.Context, request GetTableRequest) (*TableInfo, error) { var tableInfo TableInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/tables/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/tables/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &tableInfo) @@ -839,7 +840,7 @@ func (a *tablesImpl) ListSummaries(ctx context.Context, request ListSummariesReq } func (a *tablesImpl) Update(ctx context.Context, request UpdateTableRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/tables/%v", request.FullName) + path := fmt.Sprintf("/api/2.1/unity-catalog/tables/%v", strings.TrimPrefix(fmt.Sprint(request.FullName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -863,7 +864,7 @@ func (a *volumesImpl) Create(ctx context.Context, request CreateVolumeRequestCon } func (a *volumesImpl) Delete(ctx context.Context, request DeleteVolumeRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/volumes/%v", request.FullNameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/volumes/%v", strings.TrimPrefix(fmt.Sprint(request.FullNameArg), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -880,7 +881,7 @@ func (a *volumesImpl) List(ctx context.Context, request ListVolumesRequest) (*Li func (a *volumesImpl) Read(ctx context.Context, request ReadVolumeRequest) (*VolumeInfo, error) { var volumeInfo VolumeInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/volumes/%v", request.FullNameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/volumes/%v", strings.TrimPrefix(fmt.Sprint(request.FullNameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &volumeInfo) @@ -889,7 +890,7 @@ func (a *volumesImpl) Read(ctx context.Context, request ReadVolumeRequest) (*Vol func (a *volumesImpl) Update(ctx context.Context, request UpdateVolumeRequestContent) (*VolumeInfo, error) { var volumeInfo VolumeInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/volumes/%v", request.FullNameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/volumes/%v", strings.TrimPrefix(fmt.Sprint(request.FullNameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -904,7 +905,7 @@ type workspaceBindingsImpl struct { func (a *workspaceBindingsImpl) Get(ctx context.Context, request GetWorkspaceBindingRequest) (*CurrentWorkspaceBindings, error) { var currentWorkspaceBindings CurrentWorkspaceBindings - path := fmt.Sprintf("/api/2.1/unity-catalog/workspace-bindings/catalogs/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/workspace-bindings/catalogs/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, ¤tWorkspaceBindings) @@ -913,7 +914,7 @@ func (a *workspaceBindingsImpl) Get(ctx context.Context, request GetWorkspaceBin func (a *workspaceBindingsImpl) GetBindings(ctx context.Context, request GetBindingsRequest) (*WorkspaceBindingsResponse, error) { var workspaceBindingsResponse WorkspaceBindingsResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/bindings/%v/%v", request.SecurableType, request.SecurableName) + path := fmt.Sprintf("/api/2.1/unity-catalog/bindings/%v/%v", strings.TrimPrefix(fmt.Sprint(request.SecurableType), "/"), strings.TrimPrefix(fmt.Sprint(request.SecurableName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &workspaceBindingsResponse) @@ -922,7 +923,7 @@ func (a *workspaceBindingsImpl) GetBindings(ctx context.Context, request GetBind func (a *workspaceBindingsImpl) Update(ctx context.Context, request UpdateWorkspaceBindings) (*CurrentWorkspaceBindings, error) { var currentWorkspaceBindings CurrentWorkspaceBindings - path := fmt.Sprintf("/api/2.1/unity-catalog/workspace-bindings/catalogs/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/workspace-bindings/catalogs/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -932,7 +933,7 @@ func (a *workspaceBindingsImpl) Update(ctx context.Context, request UpdateWorksp func (a *workspaceBindingsImpl) UpdateBindings(ctx context.Context, request UpdateWorkspaceBindingsParameters) (*WorkspaceBindingsResponse, error) { var workspaceBindingsResponse WorkspaceBindingsResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/bindings/%v/%v", request.SecurableType, request.SecurableName) + path := fmt.Sprintf("/api/2.1/unity-catalog/bindings/%v/%v", strings.TrimPrefix(fmt.Sprint(request.SecurableType), "/"), strings.TrimPrefix(fmt.Sprint(request.SecurableName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/compute/impl.go b/service/compute/impl.go index 5b92cebc2..f8a32c853 100755 --- a/service/compute/impl.go +++ b/service/compute/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -54,7 +55,7 @@ func (a *clusterPoliciesImpl) Get(ctx context.Context, request GetClusterPolicyR func (a *clusterPoliciesImpl) GetPermissionLevels(ctx context.Context, request GetClusterPolicyPermissionLevelsRequest) (*GetClusterPolicyPermissionLevelsResponse, error) { var getClusterPolicyPermissionLevelsResponse GetClusterPolicyPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v/permissionLevels", request.ClusterPolicyId) + path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.ClusterPolicyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getClusterPolicyPermissionLevelsResponse) @@ -63,7 +64,7 @@ func (a *clusterPoliciesImpl) GetPermissionLevels(ctx context.Context, request G func (a *clusterPoliciesImpl) GetPermissions(ctx context.Context, request GetClusterPolicyPermissionsRequest) (*ClusterPolicyPermissions, error) { var clusterPolicyPermissions ClusterPolicyPermissions - path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v", request.ClusterPolicyId) + path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v", strings.TrimPrefix(fmt.Sprint(request.ClusterPolicyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &clusterPolicyPermissions) @@ -81,7 +82,7 @@ func (a *clusterPoliciesImpl) List(ctx context.Context, request ListClusterPolic func (a *clusterPoliciesImpl) SetPermissions(ctx context.Context, request ClusterPolicyPermissionsRequest) (*ClusterPolicyPermissions, error) { var clusterPolicyPermissions ClusterPolicyPermissions - path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v", request.ClusterPolicyId) + path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v", strings.TrimPrefix(fmt.Sprint(request.ClusterPolicyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -91,7 +92,7 @@ func (a *clusterPoliciesImpl) SetPermissions(ctx context.Context, request Cluste func (a *clusterPoliciesImpl) UpdatePermissions(ctx context.Context, request ClusterPolicyPermissionsRequest) (*ClusterPolicyPermissions, error) { var clusterPolicyPermissions ClusterPolicyPermissions - path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v", request.ClusterPolicyId) + path := fmt.Sprintf("/api/2.0/permissions/cluster-policies/%v", strings.TrimPrefix(fmt.Sprint(request.ClusterPolicyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -162,7 +163,7 @@ func (a *clustersImpl) Get(ctx context.Context, request GetClusterRequest) (*Clu func (a *clustersImpl) GetPermissionLevels(ctx context.Context, request GetClusterPermissionLevelsRequest) (*GetClusterPermissionLevelsResponse, error) { var getClusterPermissionLevelsResponse GetClusterPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/clusters/%v/permissionLevels", request.ClusterId) + path := fmt.Sprintf("/api/2.0/permissions/clusters/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.ClusterId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getClusterPermissionLevelsResponse) @@ -171,7 +172,7 @@ func (a *clustersImpl) GetPermissionLevels(ctx context.Context, request GetClust func (a *clustersImpl) GetPermissions(ctx context.Context, request GetClusterPermissionsRequest) (*ClusterPermissions, error) { var clusterPermissions ClusterPermissions - path := fmt.Sprintf("/api/2.0/permissions/clusters/%v", request.ClusterId) + path := fmt.Sprintf("/api/2.0/permissions/clusters/%v", strings.TrimPrefix(fmt.Sprint(request.ClusterId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &clusterPermissions) @@ -243,7 +244,7 @@ func (a *clustersImpl) Restart(ctx context.Context, request RestartCluster) erro func (a *clustersImpl) SetPermissions(ctx context.Context, request ClusterPermissionsRequest) (*ClusterPermissions, error) { var clusterPermissions ClusterPermissions - path := fmt.Sprintf("/api/2.0/permissions/clusters/%v", request.ClusterId) + path := fmt.Sprintf("/api/2.0/permissions/clusters/%v", strings.TrimPrefix(fmt.Sprint(request.ClusterId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -280,7 +281,7 @@ func (a *clustersImpl) Unpin(ctx context.Context, request UnpinCluster) error { func (a *clustersImpl) UpdatePermissions(ctx context.Context, request ClusterPermissionsRequest) (*ClusterPermissions, error) { var clusterPermissions ClusterPermissions - path := fmt.Sprintf("/api/2.0/permissions/clusters/%v", request.ClusterId) + path := fmt.Sprintf("/api/2.0/permissions/clusters/%v", strings.TrimPrefix(fmt.Sprint(request.ClusterId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -365,7 +366,7 @@ func (a *globalInitScriptsImpl) Create(ctx context.Context, request GlobalInitSc } func (a *globalInitScriptsImpl) Delete(ctx context.Context, request DeleteGlobalInitScriptRequest) error { - path := fmt.Sprintf("/api/2.0/global-init-scripts/%v", request.ScriptId) + path := fmt.Sprintf("/api/2.0/global-init-scripts/%v", strings.TrimPrefix(fmt.Sprint(request.ScriptId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -373,7 +374,7 @@ func (a *globalInitScriptsImpl) Delete(ctx context.Context, request DeleteGlobal func (a *globalInitScriptsImpl) Get(ctx context.Context, request GetGlobalInitScriptRequest) (*GlobalInitScriptDetailsWithContent, error) { var globalInitScriptDetailsWithContent GlobalInitScriptDetailsWithContent - path := fmt.Sprintf("/api/2.0/global-init-scripts/%v", request.ScriptId) + path := fmt.Sprintf("/api/2.0/global-init-scripts/%v", strings.TrimPrefix(fmt.Sprint(request.ScriptId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &globalInitScriptDetailsWithContent) @@ -390,7 +391,7 @@ func (a *globalInitScriptsImpl) List(ctx context.Context) (*ListGlobalInitScript } func (a *globalInitScriptsImpl) Update(ctx context.Context, request GlobalInitScriptUpdateRequest) error { - path := fmt.Sprintf("/api/2.0/global-init-scripts/%v", request.ScriptId) + path := fmt.Sprintf("/api/2.0/global-init-scripts/%v", strings.TrimPrefix(fmt.Sprint(request.ScriptId), "/")) headers := make(map[string]string) headers["Content-Type"] = "application/json" err := a.client.Do(ctx, http.MethodPatch, path, headers, request, nil) @@ -441,7 +442,7 @@ func (a *instancePoolsImpl) Get(ctx context.Context, request GetInstancePoolRequ func (a *instancePoolsImpl) GetPermissionLevels(ctx context.Context, request GetInstancePoolPermissionLevelsRequest) (*GetInstancePoolPermissionLevelsResponse, error) { var getInstancePoolPermissionLevelsResponse GetInstancePoolPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v/permissionLevels", request.InstancePoolId) + path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.InstancePoolId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getInstancePoolPermissionLevelsResponse) @@ -450,7 +451,7 @@ func (a *instancePoolsImpl) GetPermissionLevels(ctx context.Context, request Get func (a *instancePoolsImpl) GetPermissions(ctx context.Context, request GetInstancePoolPermissionsRequest) (*InstancePoolPermissions, error) { var instancePoolPermissions InstancePoolPermissions - path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v", request.InstancePoolId) + path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v", strings.TrimPrefix(fmt.Sprint(request.InstancePoolId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &instancePoolPermissions) @@ -468,7 +469,7 @@ func (a *instancePoolsImpl) List(ctx context.Context) (*ListInstancePools, error func (a *instancePoolsImpl) SetPermissions(ctx context.Context, request InstancePoolPermissionsRequest) (*InstancePoolPermissions, error) { var instancePoolPermissions InstancePoolPermissions - path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v", request.InstancePoolId) + path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v", strings.TrimPrefix(fmt.Sprint(request.InstancePoolId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -478,7 +479,7 @@ func (a *instancePoolsImpl) SetPermissions(ctx context.Context, request Instance func (a *instancePoolsImpl) UpdatePermissions(ctx context.Context, request InstancePoolPermissionsRequest) (*InstancePoolPermissions, error) { var instancePoolPermissions InstancePoolPermissions - path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v", request.InstancePoolId) + path := fmt.Sprintf("/api/2.0/permissions/instance-pools/%v", strings.TrimPrefix(fmt.Sprint(request.InstancePoolId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -575,7 +576,7 @@ type policyFamiliesImpl struct { func (a *policyFamiliesImpl) Get(ctx context.Context, request GetPolicyFamilyRequest) (*PolicyFamily, error) { var policyFamily PolicyFamily - path := fmt.Sprintf("/api/2.0/policy-families/%v", request.PolicyFamilyId) + path := fmt.Sprintf("/api/2.0/policy-families/%v", strings.TrimPrefix(fmt.Sprint(request.PolicyFamilyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &policyFamily) diff --git a/service/files/impl.go b/service/files/impl.go index b516fac97..fbe1402e8 100755 --- a/service/files/impl.go +++ b/service/files/impl.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -113,7 +114,7 @@ type filesImpl struct { } func (a *filesImpl) Delete(ctx context.Context, request DeleteFileRequest) error { - path := fmt.Sprintf("/api/2.0/fs/files/%v", request.FilePath) + path := fmt.Sprintf("/api/2.0/fs/files/%v", strings.TrimPrefix(fmt.Sprint(request.FilePath), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -121,7 +122,7 @@ func (a *filesImpl) Delete(ctx context.Context, request DeleteFileRequest) error func (a *filesImpl) Download(ctx context.Context, request DownloadRequest) (*DownloadResponse, error) { var downloadResponse io.ReadCloser - path := fmt.Sprintf("/api/2.0/fs/files/%v", request.FilePath) + path := fmt.Sprintf("/api/2.0/fs/files/%v", strings.TrimPrefix(fmt.Sprint(request.FilePath), "/")) headers := make(map[string]string) headers["Accept"] = "application/octet-stream" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &downloadResponse) @@ -138,7 +139,7 @@ func (a *filesImpl) GetStatus(ctx context.Context, request GetStatusRequest) (*F } func (a *filesImpl) Upload(ctx context.Context, request UploadRequest) error { - path := fmt.Sprintf("/api/2.0/fs/files/%v", request.FilePath) + path := fmt.Sprintf("/api/2.0/fs/files/%v", strings.TrimPrefix(fmt.Sprint(request.FilePath), "/")) headers := make(map[string]string) headers["Content-Type"] = "application/octet-stream" err := a.client.Do(ctx, http.MethodPut, path, headers, request.Contents, nil) diff --git a/service/iam/impl.go b/service/iam/impl.go index 57df3fb0b..f4c5d37d5 100755 --- a/service/iam/impl.go +++ b/service/iam/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -92,7 +93,7 @@ func (a *accountGroupsImpl) Create(ctx context.Context, request Group) (*Group, } func (a *accountGroupsImpl) Delete(ctx context.Context, request DeleteAccountGroupRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -100,7 +101,7 @@ func (a *accountGroupsImpl) Delete(ctx context.Context, request DeleteAccountGro func (a *accountGroupsImpl) Get(ctx context.Context, request GetAccountGroupRequest) (*Group, error) { var group Group - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &group) @@ -117,7 +118,7 @@ func (a *accountGroupsImpl) List(ctx context.Context, request ListAccountGroupsR } func (a *accountGroupsImpl) Patch(ctx context.Context, request PartialUpdate) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -126,7 +127,7 @@ func (a *accountGroupsImpl) Patch(ctx context.Context, request PartialUpdate) er } func (a *accountGroupsImpl) Update(ctx context.Context, request Group) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Groups/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -150,7 +151,7 @@ func (a *accountServicePrincipalsImpl) Create(ctx context.Context, request Servi } func (a *accountServicePrincipalsImpl) Delete(ctx context.Context, request DeleteAccountServicePrincipalRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -158,7 +159,7 @@ func (a *accountServicePrincipalsImpl) Delete(ctx context.Context, request Delet func (a *accountServicePrincipalsImpl) Get(ctx context.Context, request GetAccountServicePrincipalRequest) (*ServicePrincipal, error) { var servicePrincipal ServicePrincipal - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &servicePrincipal) @@ -175,7 +176,7 @@ func (a *accountServicePrincipalsImpl) List(ctx context.Context, request ListAcc } func (a *accountServicePrincipalsImpl) Patch(ctx context.Context, request PartialUpdate) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -184,7 +185,7 @@ func (a *accountServicePrincipalsImpl) Patch(ctx context.Context, request Partia } func (a *accountServicePrincipalsImpl) Update(ctx context.Context, request ServicePrincipal) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/ServicePrincipals/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -208,7 +209,7 @@ func (a *accountUsersImpl) Create(ctx context.Context, request User) (*User, err } func (a *accountUsersImpl) Delete(ctx context.Context, request DeleteAccountUserRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -216,7 +217,7 @@ func (a *accountUsersImpl) Delete(ctx context.Context, request DeleteAccountUser func (a *accountUsersImpl) Get(ctx context.Context, request GetAccountUserRequest) (*User, error) { var user User - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &user) @@ -233,7 +234,7 @@ func (a *accountUsersImpl) List(ctx context.Context, request ListAccountUsersReq } func (a *accountUsersImpl) Patch(ctx context.Context, request PartialUpdate) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -242,7 +243,7 @@ func (a *accountUsersImpl) Patch(ctx context.Context, request PartialUpdate) err } func (a *accountUsersImpl) Update(ctx context.Context, request User) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), request.Id) + path := fmt.Sprintf("/api/2.0/accounts/%v/scim/v2/Users/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -280,7 +281,7 @@ func (a *groupsImpl) Create(ctx context.Context, request Group) (*Group, error) } func (a *groupsImpl) Delete(ctx context.Context, request DeleteGroupRequest) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -288,7 +289,7 @@ func (a *groupsImpl) Delete(ctx context.Context, request DeleteGroupRequest) err func (a *groupsImpl) Get(ctx context.Context, request GetGroupRequest) (*Group, error) { var group Group - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &group) @@ -305,7 +306,7 @@ func (a *groupsImpl) List(ctx context.Context, request ListGroupsRequest) (*List } func (a *groupsImpl) Patch(ctx context.Context, request PartialUpdate) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -314,7 +315,7 @@ func (a *groupsImpl) Patch(ctx context.Context, request PartialUpdate) error { } func (a *groupsImpl) Update(ctx context.Context, request Group) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Groups/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -329,7 +330,7 @@ type permissionsImpl struct { func (a *permissionsImpl) Get(ctx context.Context, request GetPermissionRequest) (*ObjectPermissions, error) { var objectPermissions ObjectPermissions - path := fmt.Sprintf("/api/2.0/permissions/%v/%v", request.RequestObjectType, request.RequestObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.RequestObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.RequestObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &objectPermissions) @@ -338,7 +339,7 @@ func (a *permissionsImpl) Get(ctx context.Context, request GetPermissionRequest) func (a *permissionsImpl) GetPermissionLevels(ctx context.Context, request GetPermissionLevelsRequest) (*GetPermissionLevelsResponse, error) { var getPermissionLevelsResponse GetPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/%v/%v/permissionLevels", request.RequestObjectType, request.RequestObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.RequestObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.RequestObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getPermissionLevelsResponse) @@ -347,7 +348,7 @@ func (a *permissionsImpl) GetPermissionLevels(ctx context.Context, request GetPe func (a *permissionsImpl) Set(ctx context.Context, request PermissionsRequest) (*ObjectPermissions, error) { var objectPermissions ObjectPermissions - path := fmt.Sprintf("/api/2.0/permissions/%v/%v", request.RequestObjectType, request.RequestObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.RequestObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.RequestObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -357,7 +358,7 @@ func (a *permissionsImpl) Set(ctx context.Context, request PermissionsRequest) ( func (a *permissionsImpl) Update(ctx context.Context, request PermissionsRequest) (*ObjectPermissions, error) { var objectPermissions ObjectPermissions - path := fmt.Sprintf("/api/2.0/permissions/%v/%v", request.RequestObjectType, request.RequestObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.RequestObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.RequestObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -381,7 +382,7 @@ func (a *servicePrincipalsImpl) Create(ctx context.Context, request ServicePrinc } func (a *servicePrincipalsImpl) Delete(ctx context.Context, request DeleteServicePrincipalRequest) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -389,7 +390,7 @@ func (a *servicePrincipalsImpl) Delete(ctx context.Context, request DeleteServic func (a *servicePrincipalsImpl) Get(ctx context.Context, request GetServicePrincipalRequest) (*ServicePrincipal, error) { var servicePrincipal ServicePrincipal - path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &servicePrincipal) @@ -406,7 +407,7 @@ func (a *servicePrincipalsImpl) List(ctx context.Context, request ListServicePri } func (a *servicePrincipalsImpl) Patch(ctx context.Context, request PartialUpdate) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -415,7 +416,7 @@ func (a *servicePrincipalsImpl) Patch(ctx context.Context, request PartialUpdate } func (a *servicePrincipalsImpl) Update(ctx context.Context, request ServicePrincipal) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/ServicePrincipals/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -439,7 +440,7 @@ func (a *usersImpl) Create(ctx context.Context, request User) (*User, error) { } func (a *usersImpl) Delete(ctx context.Context, request DeleteUserRequest) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -447,7 +448,7 @@ func (a *usersImpl) Delete(ctx context.Context, request DeleteUserRequest) error func (a *usersImpl) Get(ctx context.Context, request GetUserRequest) (*User, error) { var user User - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &user) @@ -482,7 +483,7 @@ func (a *usersImpl) List(ctx context.Context, request ListUsersRequest) (*ListUs } func (a *usersImpl) Patch(ctx context.Context, request PartialUpdate) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -501,7 +502,7 @@ func (a *usersImpl) SetPermissions(ctx context.Context, request PasswordPermissi } func (a *usersImpl) Update(ctx context.Context, request User) error { - path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/scim/v2/Users/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -525,7 +526,7 @@ type workspaceAssignmentImpl struct { } func (a *workspaceAssignmentImpl) Delete(ctx context.Context, request DeleteWorkspaceAssignmentRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments/principals/%v", a.client.ConfiguredAccountID(), request.WorkspaceId, request.PrincipalId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments/principals/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/"), strings.TrimPrefix(fmt.Sprint(request.PrincipalId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -534,7 +535,7 @@ func (a *workspaceAssignmentImpl) Delete(ctx context.Context, request DeleteWork func (a *workspaceAssignmentImpl) Get(ctx context.Context, request GetWorkspaceAssignmentRequest) (*WorkspacePermissions, error) { var workspacePermissions WorkspacePermissions - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments/permissions", a.client.ConfiguredAccountID(), request.WorkspaceId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments/permissions", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &workspacePermissions) @@ -543,7 +544,7 @@ func (a *workspaceAssignmentImpl) Get(ctx context.Context, request GetWorkspaceA func (a *workspaceAssignmentImpl) List(ctx context.Context, request ListWorkspaceAssignmentRequest) (*PermissionAssignments, error) { var permissionAssignments PermissionAssignments - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments", a.client.ConfiguredAccountID(), request.WorkspaceId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &permissionAssignments) @@ -551,7 +552,7 @@ func (a *workspaceAssignmentImpl) List(ctx context.Context, request ListWorkspac } func (a *workspaceAssignmentImpl) Update(ctx context.Context, request UpdateWorkspaceAssignments) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments/principals/%v", a.client.ConfiguredAccountID(), request.WorkspaceId, request.PrincipalId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v/permissionassignments/principals/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/"), strings.TrimPrefix(fmt.Sprint(request.PrincipalId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/iam/model.go b/service/iam/model.go index a6577e69b..8cf331d17 100755 --- a/service/iam/model.go +++ b/service/iam/model.go @@ -1179,7 +1179,7 @@ type ServicePrincipal struct { Groups []ComplexValue `json:"groups,omitempty"` // Databricks service principal ID. - Id string `json:"id,omitempty"` + Id string `json:"id,omitempty" url:"-"` // Corresponds to AWS instance profile/arn role. Roles []ComplexValue `json:"roles,omitempty"` // The schema of the List response. @@ -1260,7 +1260,7 @@ type User struct { Groups []ComplexValue `json:"groups,omitempty"` // Databricks user ID. This is automatically set by Databricks. Any value // provided by the client will be ignored. - Id string `json:"id,omitempty"` + Id string `json:"id,omitempty" url:"-"` Name *Name `json:"name,omitempty"` // Corresponds to AWS instance profile/arn role. diff --git a/service/jobs/impl.go b/service/jobs/impl.go index ffb97ce95..5ba93f4cc 100755 --- a/service/jobs/impl.go +++ b/service/jobs/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -81,7 +82,7 @@ func (a *jobsImpl) Get(ctx context.Context, request GetJobRequest) (*Job, error) func (a *jobsImpl) GetPermissionLevels(ctx context.Context, request GetJobPermissionLevelsRequest) (*GetJobPermissionLevelsResponse, error) { var getJobPermissionLevelsResponse GetJobPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/jobs/%v/permissionLevels", request.JobId) + path := fmt.Sprintf("/api/2.0/permissions/jobs/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.JobId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getJobPermissionLevelsResponse) @@ -90,7 +91,7 @@ func (a *jobsImpl) GetPermissionLevels(ctx context.Context, request GetJobPermis func (a *jobsImpl) GetPermissions(ctx context.Context, request GetJobPermissionsRequest) (*JobPermissions, error) { var jobPermissions JobPermissions - path := fmt.Sprintf("/api/2.0/permissions/jobs/%v", request.JobId) + path := fmt.Sprintf("/api/2.0/permissions/jobs/%v", strings.TrimPrefix(fmt.Sprint(request.JobId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &jobPermissions) @@ -164,7 +165,7 @@ func (a *jobsImpl) RunNow(ctx context.Context, request RunNow) (*RunNowResponse, func (a *jobsImpl) SetPermissions(ctx context.Context, request JobPermissionsRequest) (*JobPermissions, error) { var jobPermissions JobPermissions - path := fmt.Sprintf("/api/2.0/permissions/jobs/%v", request.JobId) + path := fmt.Sprintf("/api/2.0/permissions/jobs/%v", strings.TrimPrefix(fmt.Sprint(request.JobId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -193,7 +194,7 @@ func (a *jobsImpl) Update(ctx context.Context, request UpdateJob) error { func (a *jobsImpl) UpdatePermissions(ctx context.Context, request JobPermissionsRequest) (*JobPermissions, error) { var jobPermissions JobPermissions - path := fmt.Sprintf("/api/2.0/permissions/jobs/%v", request.JobId) + path := fmt.Sprintf("/api/2.0/permissions/jobs/%v", strings.TrimPrefix(fmt.Sprint(request.JobId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/ml/impl.go b/service/ml/impl.go index dae4c880b..0b785ae60 100755 --- a/service/ml/impl.go +++ b/service/ml/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -101,7 +102,7 @@ func (a *experimentsImpl) GetHistory(ctx context.Context, request GetHistoryRequ func (a *experimentsImpl) GetPermissionLevels(ctx context.Context, request GetExperimentPermissionLevelsRequest) (*GetExperimentPermissionLevelsResponse, error) { var getExperimentPermissionLevelsResponse GetExperimentPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/experiments/%v/permissionLevels", request.ExperimentId) + path := fmt.Sprintf("/api/2.0/permissions/experiments/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.ExperimentId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getExperimentPermissionLevelsResponse) @@ -110,7 +111,7 @@ func (a *experimentsImpl) GetPermissionLevels(ctx context.Context, request GetEx func (a *experimentsImpl) GetPermissions(ctx context.Context, request GetExperimentPermissionsRequest) (*ExperimentPermissions, error) { var experimentPermissions ExperimentPermissions - path := fmt.Sprintf("/api/2.0/permissions/experiments/%v", request.ExperimentId) + path := fmt.Sprintf("/api/2.0/permissions/experiments/%v", strings.TrimPrefix(fmt.Sprint(request.ExperimentId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &experimentPermissions) @@ -248,7 +249,7 @@ func (a *experimentsImpl) SetExperimentTag(ctx context.Context, request SetExper func (a *experimentsImpl) SetPermissions(ctx context.Context, request ExperimentPermissionsRequest) (*ExperimentPermissions, error) { var experimentPermissions ExperimentPermissions - path := fmt.Sprintf("/api/2.0/permissions/experiments/%v", request.ExperimentId) + path := fmt.Sprintf("/api/2.0/permissions/experiments/%v", strings.TrimPrefix(fmt.Sprint(request.ExperimentId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -276,7 +277,7 @@ func (a *experimentsImpl) UpdateExperiment(ctx context.Context, request UpdateEx func (a *experimentsImpl) UpdatePermissions(ctx context.Context, request ExperimentPermissionsRequest) (*ExperimentPermissions, error) { var experimentPermissions ExperimentPermissions - path := fmt.Sprintf("/api/2.0/permissions/experiments/%v", request.ExperimentId) + path := fmt.Sprintf("/api/2.0/permissions/experiments/%v", strings.TrimPrefix(fmt.Sprint(request.ExperimentId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -454,7 +455,7 @@ func (a *modelRegistryImpl) GetModelVersionDownloadUri(ctx context.Context, requ func (a *modelRegistryImpl) GetPermissionLevels(ctx context.Context, request GetRegisteredModelPermissionLevelsRequest) (*GetRegisteredModelPermissionLevelsResponse, error) { var getRegisteredModelPermissionLevelsResponse GetRegisteredModelPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v/permissionLevels", request.RegisteredModelId) + path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.RegisteredModelId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getRegisteredModelPermissionLevelsResponse) @@ -463,7 +464,7 @@ func (a *modelRegistryImpl) GetPermissionLevels(ctx context.Context, request Get func (a *modelRegistryImpl) GetPermissions(ctx context.Context, request GetRegisteredModelPermissionsRequest) (*RegisteredModelPermissions, error) { var registeredModelPermissions RegisteredModelPermissions - path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v", request.RegisteredModelId) + path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v", strings.TrimPrefix(fmt.Sprint(request.RegisteredModelId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, ®isteredModelPermissions) @@ -555,7 +556,7 @@ func (a *modelRegistryImpl) SetModelVersionTag(ctx context.Context, request SetM func (a *modelRegistryImpl) SetPermissions(ctx context.Context, request RegisteredModelPermissionsRequest) (*RegisteredModelPermissions, error) { var registeredModelPermissions RegisteredModelPermissions - path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v", request.RegisteredModelId) + path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v", strings.TrimPrefix(fmt.Sprint(request.RegisteredModelId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -613,7 +614,7 @@ func (a *modelRegistryImpl) UpdateModelVersion(ctx context.Context, request Upda func (a *modelRegistryImpl) UpdatePermissions(ctx context.Context, request RegisteredModelPermissionsRequest) (*RegisteredModelPermissions, error) { var registeredModelPermissions RegisteredModelPermissions - path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v", request.RegisteredModelId) + path := fmt.Sprintf("/api/2.0/permissions/registered-models/%v", strings.TrimPrefix(fmt.Sprint(request.RegisteredModelId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/ml/model_registry_usage_test.go b/service/ml/model_registry_usage_test.go index 72de73538..4d28afe5d 100755 --- a/service/ml/model_registry_usage_test.go +++ b/service/ml/model_registry_usage_test.go @@ -58,37 +58,37 @@ func ExampleModelRegistryAPI_CreateComment_modelVersionComments() { } -func ExampleModelRegistryAPI_CreateModel_models() { +func ExampleModelRegistryAPI_CreateModel_modelVersionComments() { ctx := context.Background() w, err := databricks.NewWorkspaceClient() if err != nil { panic(err) } - created, err := w.ModelRegistry.CreateModel(ctx, ml.CreateModelRequest{ + model, err := w.ModelRegistry.CreateModel(ctx, ml.CreateModelRequest{ Name: fmt.Sprintf("sdk-%x", time.Now().UnixNano()), }) if err != nil { panic(err) } - logger.Infof(ctx, "found %v", created) + logger.Infof(ctx, "found %v", model) } -func ExampleModelRegistryAPI_CreateModel_modelVersionComments() { +func ExampleModelRegistryAPI_CreateModel_models() { ctx := context.Background() w, err := databricks.NewWorkspaceClient() if err != nil { panic(err) } - model, err := w.ModelRegistry.CreateModel(ctx, ml.CreateModelRequest{ + created, err := w.ModelRegistry.CreateModel(ctx, ml.CreateModelRequest{ Name: fmt.Sprintf("sdk-%x", time.Now().UnixNano()), }) if err != nil { panic(err) } - logger.Infof(ctx, "found %v", model) + logger.Infof(ctx, "found %v", created) } @@ -109,7 +109,7 @@ func ExampleModelRegistryAPI_CreateModel_modelVersions() { } -func ExampleModelRegistryAPI_CreateModelVersion_modelVersions() { +func ExampleModelRegistryAPI_CreateModelVersion_modelVersionComments() { ctx := context.Background() w, err := databricks.NewWorkspaceClient() if err != nil { @@ -124,18 +124,18 @@ func ExampleModelRegistryAPI_CreateModelVersion_modelVersions() { } logger.Infof(ctx, "found %v", model) - created, err := w.ModelRegistry.CreateModelVersion(ctx, ml.CreateModelVersionRequest{ + mv, err := w.ModelRegistry.CreateModelVersion(ctx, ml.CreateModelVersionRequest{ Name: model.RegisteredModel.Name, Source: "dbfs:/tmp", }) if err != nil { panic(err) } - logger.Infof(ctx, "found %v", created) + logger.Infof(ctx, "found %v", mv) } -func ExampleModelRegistryAPI_CreateModelVersion_modelVersionComments() { +func ExampleModelRegistryAPI_CreateModelVersion_modelVersions() { ctx := context.Background() w, err := databricks.NewWorkspaceClient() if err != nil { @@ -150,14 +150,14 @@ func ExampleModelRegistryAPI_CreateModelVersion_modelVersionComments() { } logger.Infof(ctx, "found %v", model) - mv, err := w.ModelRegistry.CreateModelVersion(ctx, ml.CreateModelVersionRequest{ + created, err := w.ModelRegistry.CreateModelVersion(ctx, ml.CreateModelVersionRequest{ Name: model.RegisteredModel.Name, Source: "dbfs:/tmp", }) if err != nil { panic(err) } - logger.Infof(ctx, "found %v", mv) + logger.Infof(ctx, "found %v", created) } diff --git a/service/oauth2/impl.go b/service/oauth2/impl.go index 658992b43..44813423c 100755 --- a/service/oauth2/impl.go +++ b/service/oauth2/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -26,7 +27,7 @@ func (a *customAppIntegrationImpl) Create(ctx context.Context, request CreateCus } func (a *customAppIntegrationImpl) Delete(ctx context.Context, request DeleteCustomAppIntegrationRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/custom-app-integrations/%v", a.client.ConfiguredAccountID(), request.IntegrationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/custom-app-integrations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IntegrationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -35,7 +36,7 @@ func (a *customAppIntegrationImpl) Delete(ctx context.Context, request DeleteCus func (a *customAppIntegrationImpl) Get(ctx context.Context, request GetCustomAppIntegrationRequest) (*GetCustomAppIntegrationOutput, error) { var getCustomAppIntegrationOutput GetCustomAppIntegrationOutput - path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/custom-app-integrations/%v", a.client.ConfiguredAccountID(), request.IntegrationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/custom-app-integrations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IntegrationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getCustomAppIntegrationOutput) @@ -52,7 +53,7 @@ func (a *customAppIntegrationImpl) List(ctx context.Context) (*GetCustomAppInteg } func (a *customAppIntegrationImpl) Update(ctx context.Context, request UpdateCustomAppIntegration) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/custom-app-integrations/%v", a.client.ConfiguredAccountID(), request.IntegrationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/custom-app-integrations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IntegrationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -90,7 +91,7 @@ func (a *publishedAppIntegrationImpl) Create(ctx context.Context, request Create } func (a *publishedAppIntegrationImpl) Delete(ctx context.Context, request DeletePublishedAppIntegrationRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/published-app-integrations/%v", a.client.ConfiguredAccountID(), request.IntegrationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/published-app-integrations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IntegrationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -99,7 +100,7 @@ func (a *publishedAppIntegrationImpl) Delete(ctx context.Context, request Delete func (a *publishedAppIntegrationImpl) Get(ctx context.Context, request GetPublishedAppIntegrationRequest) (*GetPublishedAppIntegrationOutput, error) { var getPublishedAppIntegrationOutput GetPublishedAppIntegrationOutput - path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/published-app-integrations/%v", a.client.ConfiguredAccountID(), request.IntegrationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/published-app-integrations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IntegrationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getPublishedAppIntegrationOutput) @@ -116,7 +117,7 @@ func (a *publishedAppIntegrationImpl) List(ctx context.Context) (*GetPublishedAp } func (a *publishedAppIntegrationImpl) Update(ctx context.Context, request UpdatePublishedAppIntegration) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/published-app-integrations/%v", a.client.ConfiguredAccountID(), request.IntegrationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/oauth2/published-app-integrations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IntegrationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -131,7 +132,7 @@ type servicePrincipalSecretsImpl struct { func (a *servicePrincipalSecretsImpl) Create(ctx context.Context, request CreateServicePrincipalSecretRequest) (*CreateServicePrincipalSecretResponse, error) { var createServicePrincipalSecretResponse CreateServicePrincipalSecretResponse - path := fmt.Sprintf("/api/2.0/accounts/%v/servicePrincipals/%v/credentials/secrets", a.client.ConfiguredAccountID(), request.ServicePrincipalId) + path := fmt.Sprintf("/api/2.0/accounts/%v/servicePrincipals/%v/credentials/secrets", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.ServicePrincipalId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, &createServicePrincipalSecretResponse) @@ -139,7 +140,7 @@ func (a *servicePrincipalSecretsImpl) Create(ctx context.Context, request Create } func (a *servicePrincipalSecretsImpl) Delete(ctx context.Context, request DeleteServicePrincipalSecretRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/servicePrincipals/%v/credentials/secrets/%v", a.client.ConfiguredAccountID(), request.ServicePrincipalId, request.SecretId) + path := fmt.Sprintf("/api/2.0/accounts/%v/servicePrincipals/%v/credentials/secrets/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.ServicePrincipalId), "/"), strings.TrimPrefix(fmt.Sprint(request.SecretId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -147,7 +148,7 @@ func (a *servicePrincipalSecretsImpl) Delete(ctx context.Context, request Delete func (a *servicePrincipalSecretsImpl) List(ctx context.Context, request ListServicePrincipalSecretsRequest) (*ListServicePrincipalSecretsResponse, error) { var listServicePrincipalSecretsResponse ListServicePrincipalSecretsResponse - path := fmt.Sprintf("/api/2.0/accounts/%v/servicePrincipals/%v/credentials/secrets", a.client.ConfiguredAccountID(), request.ServicePrincipalId) + path := fmt.Sprintf("/api/2.0/accounts/%v/servicePrincipals/%v/credentials/secrets", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.ServicePrincipalId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listServicePrincipalSecretsResponse) diff --git a/service/pipelines/impl.go b/service/pipelines/impl.go index 9395eaede..a06643508 100755 --- a/service/pipelines/impl.go +++ b/service/pipelines/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -26,7 +27,7 @@ func (a *pipelinesImpl) Create(ctx context.Context, request CreatePipeline) (*Cr } func (a *pipelinesImpl) Delete(ctx context.Context, request DeletePipelineRequest) error { - path := fmt.Sprintf("/api/2.0/pipelines/%v", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -35,7 +36,7 @@ func (a *pipelinesImpl) Delete(ctx context.Context, request DeletePipelineReques func (a *pipelinesImpl) Get(ctx context.Context, request GetPipelineRequest) (*GetPipelineResponse, error) { var getPipelineResponse GetPipelineResponse - path := fmt.Sprintf("/api/2.0/pipelines/%v", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getPipelineResponse) @@ -44,7 +45,7 @@ func (a *pipelinesImpl) Get(ctx context.Context, request GetPipelineRequest) (*G func (a *pipelinesImpl) GetPermissionLevels(ctx context.Context, request GetPipelinePermissionLevelsRequest) (*GetPipelinePermissionLevelsResponse, error) { var getPipelinePermissionLevelsResponse GetPipelinePermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v/permissionLevels", request.PipelineId) + path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getPipelinePermissionLevelsResponse) @@ -53,7 +54,7 @@ func (a *pipelinesImpl) GetPermissionLevels(ctx context.Context, request GetPipe func (a *pipelinesImpl) GetPermissions(ctx context.Context, request GetPipelinePermissionsRequest) (*PipelinePermissions, error) { var pipelinePermissions PipelinePermissions - path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v", request.PipelineId) + path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &pipelinePermissions) @@ -62,7 +63,7 @@ func (a *pipelinesImpl) GetPermissions(ctx context.Context, request GetPipelineP func (a *pipelinesImpl) GetUpdate(ctx context.Context, request GetUpdateRequest) (*GetUpdateResponse, error) { var getUpdateResponse GetUpdateResponse - path := fmt.Sprintf("/api/2.0/pipelines/%v/updates/%v", request.PipelineId, request.UpdateId) + path := fmt.Sprintf("/api/2.0/pipelines/%v/updates/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/"), strings.TrimPrefix(fmt.Sprint(request.UpdateId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getUpdateResponse) @@ -71,7 +72,7 @@ func (a *pipelinesImpl) GetUpdate(ctx context.Context, request GetUpdateRequest) func (a *pipelinesImpl) ListPipelineEvents(ctx context.Context, request ListPipelineEventsRequest) (*ListPipelineEventsResponse, error) { var listPipelineEventsResponse ListPipelineEventsResponse - path := fmt.Sprintf("/api/2.0/pipelines/%v/events", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v/events", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listPipelineEventsResponse) @@ -89,7 +90,7 @@ func (a *pipelinesImpl) ListPipelines(ctx context.Context, request ListPipelines func (a *pipelinesImpl) ListUpdates(ctx context.Context, request ListUpdatesRequest) (*ListUpdatesResponse, error) { var listUpdatesResponse ListUpdatesResponse - path := fmt.Sprintf("/api/2.0/pipelines/%v/updates", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v/updates", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listUpdatesResponse) @@ -97,7 +98,7 @@ func (a *pipelinesImpl) ListUpdates(ctx context.Context, request ListUpdatesRequ } func (a *pipelinesImpl) Reset(ctx context.Context, request ResetRequest) error { - path := fmt.Sprintf("/api/2.0/pipelines/%v/reset", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v/reset", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) @@ -106,7 +107,7 @@ func (a *pipelinesImpl) Reset(ctx context.Context, request ResetRequest) error { func (a *pipelinesImpl) SetPermissions(ctx context.Context, request PipelinePermissionsRequest) (*PipelinePermissions, error) { var pipelinePermissions PipelinePermissions - path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v", request.PipelineId) + path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -116,7 +117,7 @@ func (a *pipelinesImpl) SetPermissions(ctx context.Context, request PipelinePerm func (a *pipelinesImpl) StartUpdate(ctx context.Context, request StartUpdate) (*StartUpdateResponse, error) { var startUpdateResponse StartUpdateResponse - path := fmt.Sprintf("/api/2.0/pipelines/%v/updates", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v/updates", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -125,7 +126,7 @@ func (a *pipelinesImpl) StartUpdate(ctx context.Context, request StartUpdate) (* } func (a *pipelinesImpl) Stop(ctx context.Context, request StopRequest) error { - path := fmt.Sprintf("/api/2.0/pipelines/%v/stop", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v/stop", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) @@ -133,7 +134,7 @@ func (a *pipelinesImpl) Stop(ctx context.Context, request StopRequest) error { } func (a *pipelinesImpl) Update(ctx context.Context, request EditPipeline) error { - path := fmt.Sprintf("/api/2.0/pipelines/%v", request.PipelineId) + path := fmt.Sprintf("/api/2.0/pipelines/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -143,7 +144,7 @@ func (a *pipelinesImpl) Update(ctx context.Context, request EditPipeline) error func (a *pipelinesImpl) UpdatePermissions(ctx context.Context, request PipelinePermissionsRequest) (*PipelinePermissions, error) { var pipelinePermissions PipelinePermissions - path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v", request.PipelineId) + path := fmt.Sprintf("/api/2.0/permissions/pipelines/%v", strings.TrimPrefix(fmt.Sprint(request.PipelineId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/provisioning/impl.go b/service/provisioning/impl.go index 7b27057e3..954f4529d 100755 --- a/service/provisioning/impl.go +++ b/service/provisioning/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -26,7 +27,7 @@ func (a *credentialsImpl) Create(ctx context.Context, request CreateCredentialRe } func (a *credentialsImpl) Delete(ctx context.Context, request DeleteCredentialRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/credentials/%v", a.client.ConfiguredAccountID(), request.CredentialsId) + path := fmt.Sprintf("/api/2.0/accounts/%v/credentials/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.CredentialsId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -35,7 +36,7 @@ func (a *credentialsImpl) Delete(ctx context.Context, request DeleteCredentialRe func (a *credentialsImpl) Get(ctx context.Context, request GetCredentialRequest) (*Credential, error) { var credential Credential - path := fmt.Sprintf("/api/2.0/accounts/%v/credentials/%v", a.client.ConfiguredAccountID(), request.CredentialsId) + path := fmt.Sprintf("/api/2.0/accounts/%v/credentials/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.CredentialsId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &credential) @@ -67,7 +68,7 @@ func (a *encryptionKeysImpl) Create(ctx context.Context, request CreateCustomerM } func (a *encryptionKeysImpl) Delete(ctx context.Context, request DeleteEncryptionKeyRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/customer-managed-keys/%v", a.client.ConfiguredAccountID(), request.CustomerManagedKeyId) + path := fmt.Sprintf("/api/2.0/accounts/%v/customer-managed-keys/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.CustomerManagedKeyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -76,7 +77,7 @@ func (a *encryptionKeysImpl) Delete(ctx context.Context, request DeleteEncryptio func (a *encryptionKeysImpl) Get(ctx context.Context, request GetEncryptionKeyRequest) (*CustomerManagedKey, error) { var customerManagedKey CustomerManagedKey - path := fmt.Sprintf("/api/2.0/accounts/%v/customer-managed-keys/%v", a.client.ConfiguredAccountID(), request.CustomerManagedKeyId) + path := fmt.Sprintf("/api/2.0/accounts/%v/customer-managed-keys/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.CustomerManagedKeyId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &customerManagedKey) @@ -108,7 +109,7 @@ func (a *networksImpl) Create(ctx context.Context, request CreateNetworkRequest) } func (a *networksImpl) Delete(ctx context.Context, request DeleteNetworkRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/networks/%v", a.client.ConfiguredAccountID(), request.NetworkId) + path := fmt.Sprintf("/api/2.0/accounts/%v/networks/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -117,7 +118,7 @@ func (a *networksImpl) Delete(ctx context.Context, request DeleteNetworkRequest) func (a *networksImpl) Get(ctx context.Context, request GetNetworkRequest) (*Network, error) { var network Network - path := fmt.Sprintf("/api/2.0/accounts/%v/networks/%v", a.client.ConfiguredAccountID(), request.NetworkId) + path := fmt.Sprintf("/api/2.0/accounts/%v/networks/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &network) @@ -149,7 +150,7 @@ func (a *privateAccessImpl) Create(ctx context.Context, request UpsertPrivateAcc } func (a *privateAccessImpl) Delete(ctx context.Context, request DeletePrivateAccesRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/private-access-settings/%v", a.client.ConfiguredAccountID(), request.PrivateAccessSettingsId) + path := fmt.Sprintf("/api/2.0/accounts/%v/private-access-settings/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.PrivateAccessSettingsId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -158,7 +159,7 @@ func (a *privateAccessImpl) Delete(ctx context.Context, request DeletePrivateAcc func (a *privateAccessImpl) Get(ctx context.Context, request GetPrivateAccesRequest) (*PrivateAccessSettings, error) { var privateAccessSettings PrivateAccessSettings - path := fmt.Sprintf("/api/2.0/accounts/%v/private-access-settings/%v", a.client.ConfiguredAccountID(), request.PrivateAccessSettingsId) + path := fmt.Sprintf("/api/2.0/accounts/%v/private-access-settings/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.PrivateAccessSettingsId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &privateAccessSettings) @@ -175,7 +176,7 @@ func (a *privateAccessImpl) List(ctx context.Context) ([]PrivateAccessSettings, } func (a *privateAccessImpl) Replace(ctx context.Context, request UpsertPrivateAccessSettingsRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/private-access-settings/%v", a.client.ConfiguredAccountID(), request.PrivateAccessSettingsId) + path := fmt.Sprintf("/api/2.0/accounts/%v/private-access-settings/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.PrivateAccessSettingsId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -199,7 +200,7 @@ func (a *storageImpl) Create(ctx context.Context, request CreateStorageConfigura } func (a *storageImpl) Delete(ctx context.Context, request DeleteStorageRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/storage-configurations/%v", a.client.ConfiguredAccountID(), request.StorageConfigurationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/storage-configurations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.StorageConfigurationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -208,7 +209,7 @@ func (a *storageImpl) Delete(ctx context.Context, request DeleteStorageRequest) func (a *storageImpl) Get(ctx context.Context, request GetStorageRequest) (*StorageConfiguration, error) { var storageConfiguration StorageConfiguration - path := fmt.Sprintf("/api/2.0/accounts/%v/storage-configurations/%v", a.client.ConfiguredAccountID(), request.StorageConfigurationId) + path := fmt.Sprintf("/api/2.0/accounts/%v/storage-configurations/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.StorageConfigurationId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &storageConfiguration) @@ -240,7 +241,7 @@ func (a *vpcEndpointsImpl) Create(ctx context.Context, request CreateVpcEndpoint } func (a *vpcEndpointsImpl) Delete(ctx context.Context, request DeleteVpcEndpointRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/vpc-endpoints/%v", a.client.ConfiguredAccountID(), request.VpcEndpointId) + path := fmt.Sprintf("/api/2.0/accounts/%v/vpc-endpoints/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.VpcEndpointId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -249,7 +250,7 @@ func (a *vpcEndpointsImpl) Delete(ctx context.Context, request DeleteVpcEndpoint func (a *vpcEndpointsImpl) Get(ctx context.Context, request GetVpcEndpointRequest) (*VpcEndpoint, error) { var vpcEndpoint VpcEndpoint - path := fmt.Sprintf("/api/2.0/accounts/%v/vpc-endpoints/%v", a.client.ConfiguredAccountID(), request.VpcEndpointId) + path := fmt.Sprintf("/api/2.0/accounts/%v/vpc-endpoints/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.VpcEndpointId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &vpcEndpoint) @@ -281,7 +282,7 @@ func (a *workspacesImpl) Create(ctx context.Context, request CreateWorkspaceRequ } func (a *workspacesImpl) Delete(ctx context.Context, request DeleteWorkspaceRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v", a.client.ConfiguredAccountID(), request.WorkspaceId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -290,7 +291,7 @@ func (a *workspacesImpl) Delete(ctx context.Context, request DeleteWorkspaceRequ func (a *workspacesImpl) Get(ctx context.Context, request GetWorkspaceRequest) (*Workspace, error) { var workspace Workspace - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v", a.client.ConfiguredAccountID(), request.WorkspaceId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &workspace) @@ -307,7 +308,7 @@ func (a *workspacesImpl) List(ctx context.Context) ([]Workspace, error) { } func (a *workspacesImpl) Update(ctx context.Context, request UpdateWorkspaceRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v", a.client.ConfiguredAccountID(), request.WorkspaceId) + path := fmt.Sprintf("/api/2.0/accounts/%v/workspaces/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.WorkspaceId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/serving/impl.go b/service/serving/impl.go index a93e57341..1fc66560f 100755 --- a/service/serving/impl.go +++ b/service/serving/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -27,7 +28,7 @@ func (a *appsImpl) Create(ctx context.Context, request DeployAppRequest) (*Deplo func (a *appsImpl) DeleteApp(ctx context.Context, request DeleteAppRequest) (*DeleteAppResponse, error) { var deleteAppResponse DeleteAppResponse - path := fmt.Sprintf("/api/2.0/preview/apps/instances/%v", request.Name) + path := fmt.Sprintf("/api/2.0/preview/apps/instances/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, &deleteAppResponse) @@ -36,7 +37,7 @@ func (a *appsImpl) DeleteApp(ctx context.Context, request DeleteAppRequest) (*De func (a *appsImpl) GetApp(ctx context.Context, request GetAppRequest) (*GetAppResponse, error) { var getAppResponse GetAppResponse - path := fmt.Sprintf("/api/2.0/preview/apps/instances/%v", request.Name) + path := fmt.Sprintf("/api/2.0/preview/apps/instances/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getAppResponse) @@ -45,7 +46,7 @@ func (a *appsImpl) GetApp(ctx context.Context, request GetAppRequest) (*GetAppRe func (a *appsImpl) GetAppDeploymentStatus(ctx context.Context, request GetAppDeploymentStatusRequest) (*DeploymentStatus, error) { var deploymentStatus DeploymentStatus - path := fmt.Sprintf("/api/2.0/preview/apps/deployments/%v", request.DeploymentId) + path := fmt.Sprintf("/api/2.0/preview/apps/deployments/%v", strings.TrimPrefix(fmt.Sprint(request.DeploymentId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &deploymentStatus) @@ -63,7 +64,7 @@ func (a *appsImpl) GetApps(ctx context.Context) (*ListAppsResponse, error) { func (a *appsImpl) GetEvents(ctx context.Context, request GetEventsRequest) (*ListAppEventsResponse, error) { var listAppEventsResponse ListAppEventsResponse - path := fmt.Sprintf("/api/2.0/preview/apps/%v/events", request.Name) + path := fmt.Sprintf("/api/2.0/preview/apps/%v/events", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listAppEventsResponse) @@ -77,7 +78,7 @@ type servingEndpointsImpl struct { func (a *servingEndpointsImpl) BuildLogs(ctx context.Context, request BuildLogsRequest) (*BuildLogsResponse, error) { var buildLogsResponse BuildLogsResponse - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/served-models/%v/build-logs", request.Name, request.ServedModelName) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/served-models/%v/build-logs", strings.TrimPrefix(fmt.Sprint(request.Name), "/"), strings.TrimPrefix(fmt.Sprint(request.ServedModelName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &buildLogsResponse) @@ -95,7 +96,7 @@ func (a *servingEndpointsImpl) Create(ctx context.Context, request CreateServing } func (a *servingEndpointsImpl) Delete(ctx context.Context, request DeleteServingEndpointRequest) error { - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v", request.Name) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -103,7 +104,7 @@ func (a *servingEndpointsImpl) Delete(ctx context.Context, request DeleteServing } func (a *servingEndpointsImpl) ExportMetrics(ctx context.Context, request ExportMetricsRequest) error { - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/metrics", request.Name) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/metrics", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodGet, path, headers, request, nil) return err @@ -111,7 +112,7 @@ func (a *servingEndpointsImpl) ExportMetrics(ctx context.Context, request Export func (a *servingEndpointsImpl) Get(ctx context.Context, request GetServingEndpointRequest) (*ServingEndpointDetailed, error) { var servingEndpointDetailed ServingEndpointDetailed - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v", request.Name) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &servingEndpointDetailed) @@ -120,7 +121,7 @@ func (a *servingEndpointsImpl) Get(ctx context.Context, request GetServingEndpoi func (a *servingEndpointsImpl) GetPermissionLevels(ctx context.Context, request GetServingEndpointPermissionLevelsRequest) (*GetServingEndpointPermissionLevelsResponse, error) { var getServingEndpointPermissionLevelsResponse GetServingEndpointPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v/permissionLevels", request.ServingEndpointId) + path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.ServingEndpointId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getServingEndpointPermissionLevelsResponse) @@ -129,7 +130,7 @@ func (a *servingEndpointsImpl) GetPermissionLevels(ctx context.Context, request func (a *servingEndpointsImpl) GetPermissions(ctx context.Context, request GetServingEndpointPermissionsRequest) (*ServingEndpointPermissions, error) { var servingEndpointPermissions ServingEndpointPermissions - path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v", request.ServingEndpointId) + path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v", strings.TrimPrefix(fmt.Sprint(request.ServingEndpointId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &servingEndpointPermissions) @@ -147,7 +148,7 @@ func (a *servingEndpointsImpl) List(ctx context.Context) (*ListEndpointsResponse func (a *servingEndpointsImpl) Logs(ctx context.Context, request LogsRequest) (*ServerLogsResponse, error) { var serverLogsResponse ServerLogsResponse - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/served-models/%v/logs", request.Name, request.ServedModelName) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/served-models/%v/logs", strings.TrimPrefix(fmt.Sprint(request.Name), "/"), strings.TrimPrefix(fmt.Sprint(request.ServedModelName), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &serverLogsResponse) @@ -156,7 +157,7 @@ func (a *servingEndpointsImpl) Logs(ctx context.Context, request LogsRequest) (* func (a *servingEndpointsImpl) Patch(ctx context.Context, request PatchServingEndpointTags) ([]EndpointTag, error) { var endpointTagList []EndpointTag - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/tags", request.Name) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/tags", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -166,7 +167,7 @@ func (a *servingEndpointsImpl) Patch(ctx context.Context, request PatchServingEn func (a *servingEndpointsImpl) Query(ctx context.Context, request QueryEndpointInput) (*QueryEndpointResponse, error) { var queryEndpointResponse QueryEndpointResponse - path := fmt.Sprintf("/serving-endpoints/%v/invocations", request.Name) + path := fmt.Sprintf("/serving-endpoints/%v/invocations", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -176,7 +177,7 @@ func (a *servingEndpointsImpl) Query(ctx context.Context, request QueryEndpointI func (a *servingEndpointsImpl) SetPermissions(ctx context.Context, request ServingEndpointPermissionsRequest) (*ServingEndpointPermissions, error) { var servingEndpointPermissions ServingEndpointPermissions - path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v", request.ServingEndpointId) + path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v", strings.TrimPrefix(fmt.Sprint(request.ServingEndpointId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -186,7 +187,7 @@ func (a *servingEndpointsImpl) SetPermissions(ctx context.Context, request Servi func (a *servingEndpointsImpl) UpdateConfig(ctx context.Context, request EndpointCoreConfigInput) (*ServingEndpointDetailed, error) { var servingEndpointDetailed ServingEndpointDetailed - path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/config", request.Name) + path := fmt.Sprintf("/api/2.0/serving-endpoints/%v/config", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -196,7 +197,7 @@ func (a *servingEndpointsImpl) UpdateConfig(ctx context.Context, request Endpoin func (a *servingEndpointsImpl) UpdatePermissions(ctx context.Context, request ServingEndpointPermissionsRequest) (*ServingEndpointPermissions, error) { var servingEndpointPermissions ServingEndpointPermissions - path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v", request.ServingEndpointId) + path := fmt.Sprintf("/api/2.0/permissions/serving-endpoints/%v", strings.TrimPrefix(fmt.Sprint(request.ServingEndpointId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/settings/impl.go b/service/settings/impl.go index 60b36465c..3172d1bc7 100755 --- a/service/settings/impl.go +++ b/service/settings/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -26,7 +27,7 @@ func (a *accountIpAccessListsImpl) Create(ctx context.Context, request CreateIpA } func (a *accountIpAccessListsImpl) Delete(ctx context.Context, request DeleteAccountIpAccessListRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -34,7 +35,7 @@ func (a *accountIpAccessListsImpl) Delete(ctx context.Context, request DeleteAcc func (a *accountIpAccessListsImpl) Get(ctx context.Context, request GetAccountIpAccessListRequest) (*GetIpAccessListResponse, error) { var getIpAccessListResponse GetIpAccessListResponse - path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getIpAccessListResponse) @@ -51,7 +52,7 @@ func (a *accountIpAccessListsImpl) List(ctx context.Context) (*GetIpAccessListsR } func (a *accountIpAccessListsImpl) Replace(ctx context.Context, request ReplaceIpAccessList) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -60,7 +61,7 @@ func (a *accountIpAccessListsImpl) Replace(ctx context.Context, request ReplaceI } func (a *accountIpAccessListsImpl) Update(ctx context.Context, request UpdateIpAccessList) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/accounts/%v/ip-access-lists/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -165,7 +166,7 @@ func (a *ipAccessListsImpl) Create(ctx context.Context, request CreateIpAccessLi } func (a *ipAccessListsImpl) Delete(ctx context.Context, request DeleteIpAccessListRequest) error { - path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -173,7 +174,7 @@ func (a *ipAccessListsImpl) Delete(ctx context.Context, request DeleteIpAccessLi func (a *ipAccessListsImpl) Get(ctx context.Context, request GetIpAccessListRequest) (*FetchIpAccessListResponse, error) { var fetchIpAccessListResponse FetchIpAccessListResponse - path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &fetchIpAccessListResponse) @@ -190,7 +191,7 @@ func (a *ipAccessListsImpl) List(ctx context.Context) (*ListIpAccessListResponse } func (a *ipAccessListsImpl) Replace(ctx context.Context, request ReplaceIpAccessList) error { - path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -199,7 +200,7 @@ func (a *ipAccessListsImpl) Replace(ctx context.Context, request ReplaceIpAccess } func (a *ipAccessListsImpl) Update(ctx context.Context, request UpdateIpAccessList) error { - path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", request.IpAccessListId) + path := fmt.Sprintf("/api/2.0/ip-access-lists/%v", strings.TrimPrefix(fmt.Sprint(request.IpAccessListId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -224,7 +225,7 @@ func (a *networkConnectivityImpl) CreateNetworkConnectivityConfiguration(ctx con func (a *networkConnectivityImpl) CreatePrivateEndpointRule(ctx context.Context, request CreatePrivateEndpointRuleRequest) (*NccAzurePrivateEndpointRule, error) { var nccAzurePrivateEndpointRule NccAzurePrivateEndpointRule - path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules", a.client.ConfiguredAccountID(), request.NetworkConnectivityConfigId) + path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkConnectivityConfigId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -233,7 +234,7 @@ func (a *networkConnectivityImpl) CreatePrivateEndpointRule(ctx context.Context, } func (a *networkConnectivityImpl) DeleteNetworkConnectivityConfiguration(ctx context.Context, request DeleteNetworkConnectivityConfigurationRequest) error { - path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v", a.client.ConfiguredAccountID(), request.NetworkConnectivityConfigId) + path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkConnectivityConfigId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -242,7 +243,7 @@ func (a *networkConnectivityImpl) DeleteNetworkConnectivityConfiguration(ctx con func (a *networkConnectivityImpl) DeletePrivateEndpointRule(ctx context.Context, request DeletePrivateEndpointRuleRequest) (*NccAzurePrivateEndpointRule, error) { var nccAzurePrivateEndpointRule NccAzurePrivateEndpointRule - path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules/%v", a.client.ConfiguredAccountID(), request.NetworkConnectivityConfigId, request.PrivateEndpointRuleId) + path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkConnectivityConfigId), "/"), strings.TrimPrefix(fmt.Sprint(request.PrivateEndpointRuleId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, &nccAzurePrivateEndpointRule) @@ -251,7 +252,7 @@ func (a *networkConnectivityImpl) DeletePrivateEndpointRule(ctx context.Context, func (a *networkConnectivityImpl) GetNetworkConnectivityConfiguration(ctx context.Context, request GetNetworkConnectivityConfigurationRequest) (*NetworkConnectivityConfiguration, error) { var networkConnectivityConfiguration NetworkConnectivityConfiguration - path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v", a.client.ConfiguredAccountID(), request.NetworkConnectivityConfigId) + path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkConnectivityConfigId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &networkConnectivityConfiguration) @@ -260,7 +261,7 @@ func (a *networkConnectivityImpl) GetNetworkConnectivityConfiguration(ctx contex func (a *networkConnectivityImpl) GetPrivateEndpointRule(ctx context.Context, request GetPrivateEndpointRuleRequest) (*NccAzurePrivateEndpointRule, error) { var nccAzurePrivateEndpointRule NccAzurePrivateEndpointRule - path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules/%v", a.client.ConfiguredAccountID(), request.NetworkConnectivityConfigId, request.PrivateEndpointRuleId) + path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules/%v", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkConnectivityConfigId), "/"), strings.TrimPrefix(fmt.Sprint(request.PrivateEndpointRuleId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &nccAzurePrivateEndpointRule) @@ -278,7 +279,7 @@ func (a *networkConnectivityImpl) ListNetworkConnectivityConfigurations(ctx cont func (a *networkConnectivityImpl) ListPrivateEndpointRules(ctx context.Context, request ListPrivateEndpointRulesRequest) (*ListNccAzurePrivateEndpointRulesResponse, error) { var listNccAzurePrivateEndpointRulesResponse ListNccAzurePrivateEndpointRulesResponse - path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules", a.client.ConfiguredAccountID(), request.NetworkConnectivityConfigId) + path := fmt.Sprintf("/api/2.0/accounts/%v/network-connectivity-configs/%v/private-endpoint-rules", a.client.ConfiguredAccountID(), strings.TrimPrefix(fmt.Sprint(request.NetworkConnectivityConfigId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listNccAzurePrivateEndpointRulesResponse) @@ -334,7 +335,7 @@ func (a *tokenManagementImpl) CreateOboToken(ctx context.Context, request Create } func (a *tokenManagementImpl) Delete(ctx context.Context, request DeleteTokenManagementRequest) error { - path := fmt.Sprintf("/api/2.0/token-management/tokens/%v", request.TokenId) + path := fmt.Sprintf("/api/2.0/token-management/tokens/%v", strings.TrimPrefix(fmt.Sprint(request.TokenId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -342,7 +343,7 @@ func (a *tokenManagementImpl) Delete(ctx context.Context, request DeleteTokenMan func (a *tokenManagementImpl) Get(ctx context.Context, request GetTokenManagementRequest) (*TokenInfo, error) { var tokenInfo TokenInfo - path := fmt.Sprintf("/api/2.0/token-management/tokens/%v", request.TokenId) + path := fmt.Sprintf("/api/2.0/token-management/tokens/%v", strings.TrimPrefix(fmt.Sprint(request.TokenId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &tokenInfo) diff --git a/service/sharing/impl.go b/service/sharing/impl.go index a29d30f1e..39a2d6c3b 100755 --- a/service/sharing/impl.go +++ b/service/sharing/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" @@ -28,7 +29,7 @@ func (a *cleanRoomsImpl) Create(ctx context.Context, request CreateCleanRoom) (* } func (a *cleanRoomsImpl) Delete(ctx context.Context, request DeleteCleanRoomRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/clean-rooms/%v", request.NameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/clean-rooms/%v", strings.TrimPrefix(fmt.Sprint(request.NameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -37,7 +38,7 @@ func (a *cleanRoomsImpl) Delete(ctx context.Context, request DeleteCleanRoomRequ func (a *cleanRoomsImpl) Get(ctx context.Context, request GetCleanRoomRequest) (*CleanRoomInfo, error) { var cleanRoomInfo CleanRoomInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/clean-rooms/%v", request.NameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/clean-rooms/%v", strings.TrimPrefix(fmt.Sprint(request.NameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &cleanRoomInfo) @@ -55,7 +56,7 @@ func (a *cleanRoomsImpl) List(ctx context.Context, request ListCleanRoomsRequest func (a *cleanRoomsImpl) Update(ctx context.Context, request UpdateCleanRoom) (*CleanRoomInfo, error) { var cleanRoomInfo CleanRoomInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/clean-rooms/%v", request.NameArg) + path := fmt.Sprintf("/api/2.1/unity-catalog/clean-rooms/%v", strings.TrimPrefix(fmt.Sprint(request.NameArg), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -79,7 +80,7 @@ func (a *providersImpl) Create(ctx context.Context, request CreateProvider) (*Pr } func (a *providersImpl) Delete(ctx context.Context, request DeleteProviderRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -88,7 +89,7 @@ func (a *providersImpl) Delete(ctx context.Context, request DeleteProviderReques func (a *providersImpl) Get(ctx context.Context, request GetProviderRequest) (*ProviderInfo, error) { var providerInfo ProviderInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &providerInfo) @@ -106,7 +107,7 @@ func (a *providersImpl) List(ctx context.Context, request ListProvidersRequest) func (a *providersImpl) ListShares(ctx context.Context, request ListSharesRequest) (*ListProviderSharesResponse, error) { var listProviderSharesResponse ListProviderSharesResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v/shares", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v/shares", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &listProviderSharesResponse) @@ -115,7 +116,7 @@ func (a *providersImpl) ListShares(ctx context.Context, request ListSharesReques func (a *providersImpl) Update(ctx context.Context, request UpdateProvider) (*ProviderInfo, error) { var providerInfo ProviderInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/providers/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -129,7 +130,7 @@ type recipientActivationImpl struct { } func (a *recipientActivationImpl) GetActivationUrlInfo(ctx context.Context, request GetActivationUrlInfoRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/public/data_sharing_activation_info/%v", request.ActivationUrl) + path := fmt.Sprintf("/api/2.1/unity-catalog/public/data_sharing_activation_info/%v", strings.TrimPrefix(fmt.Sprint(request.ActivationUrl), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, nil) @@ -138,7 +139,7 @@ func (a *recipientActivationImpl) GetActivationUrlInfo(ctx context.Context, requ func (a *recipientActivationImpl) RetrieveToken(ctx context.Context, request RetrieveTokenRequest) (*RetrieveTokenResponse, error) { var retrieveTokenResponse RetrieveTokenResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/public/data_sharing_activation/%v", request.ActivationUrl) + path := fmt.Sprintf("/api/2.1/unity-catalog/public/data_sharing_activation/%v", strings.TrimPrefix(fmt.Sprint(request.ActivationUrl), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &retrieveTokenResponse) @@ -161,7 +162,7 @@ func (a *recipientsImpl) Create(ctx context.Context, request CreateRecipient) (* } func (a *recipientsImpl) Delete(ctx context.Context, request DeleteRecipientRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -170,7 +171,7 @@ func (a *recipientsImpl) Delete(ctx context.Context, request DeleteRecipientRequ func (a *recipientsImpl) Get(ctx context.Context, request GetRecipientRequest) (*RecipientInfo, error) { var recipientInfo RecipientInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &recipientInfo) @@ -188,7 +189,7 @@ func (a *recipientsImpl) List(ctx context.Context, request ListRecipientsRequest func (a *recipientsImpl) RotateToken(ctx context.Context, request RotateRecipientToken) (*RecipientInfo, error) { var recipientInfo RecipientInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v/rotate-token", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v/rotate-token", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -198,7 +199,7 @@ func (a *recipientsImpl) RotateToken(ctx context.Context, request RotateRecipien func (a *recipientsImpl) SharePermissions(ctx context.Context, request SharePermissionsRequest) (*GetRecipientSharePermissionsResponse, error) { var getRecipientSharePermissionsResponse GetRecipientSharePermissionsResponse - path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v/share-permissions", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v/share-permissions", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getRecipientSharePermissionsResponse) @@ -206,7 +207,7 @@ func (a *recipientsImpl) SharePermissions(ctx context.Context, request SharePerm } func (a *recipientsImpl) Update(ctx context.Context, request UpdateRecipient) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/recipients/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -230,7 +231,7 @@ func (a *sharesImpl) Create(ctx context.Context, request CreateShare) (*ShareInf } func (a *sharesImpl) Delete(ctx context.Context, request DeleteShareRequest) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -239,7 +240,7 @@ func (a *sharesImpl) Delete(ctx context.Context, request DeleteShareRequest) err func (a *sharesImpl) Get(ctx context.Context, request GetShareRequest) (*ShareInfo, error) { var shareInfo ShareInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &shareInfo) @@ -257,7 +258,7 @@ func (a *sharesImpl) List(ctx context.Context) (*ListSharesResponse, error) { func (a *sharesImpl) SharePermissions(ctx context.Context, request SharePermissionsRequest) (*catalog.PermissionsList, error) { var permissionsList catalog.PermissionsList - path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v/permissions", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v/permissions", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &permissionsList) @@ -266,7 +267,7 @@ func (a *sharesImpl) SharePermissions(ctx context.Context, request SharePermissi func (a *sharesImpl) Update(ctx context.Context, request UpdateShare) (*ShareInfo, error) { var shareInfo ShareInfo - path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -275,7 +276,7 @@ func (a *sharesImpl) Update(ctx context.Context, request UpdateShare) (*ShareInf } func (a *sharesImpl) UpdatePermissions(ctx context.Context, request UpdateSharePermissions) error { - path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v/permissions", request.Name) + path := fmt.Sprintf("/api/2.1/unity-catalog/shares/%v/permissions", strings.TrimPrefix(fmt.Sprint(request.Name), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/sql/impl.go b/service/sql/impl.go index ac920f2f1..76ef27d84 100755 --- a/service/sql/impl.go +++ b/service/sql/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -26,7 +27,7 @@ func (a *alertsImpl) Create(ctx context.Context, request CreateAlert) (*Alert, e } func (a *alertsImpl) Delete(ctx context.Context, request DeleteAlertRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/alerts/%v", request.AlertId) + path := fmt.Sprintf("/api/2.0/preview/sql/alerts/%v", strings.TrimPrefix(fmt.Sprint(request.AlertId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -35,7 +36,7 @@ func (a *alertsImpl) Delete(ctx context.Context, request DeleteAlertRequest) err func (a *alertsImpl) Get(ctx context.Context, request GetAlertRequest) (*Alert, error) { var alert Alert - path := fmt.Sprintf("/api/2.0/preview/sql/alerts/%v", request.AlertId) + path := fmt.Sprintf("/api/2.0/preview/sql/alerts/%v", strings.TrimPrefix(fmt.Sprint(request.AlertId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &alert) @@ -52,7 +53,7 @@ func (a *alertsImpl) List(ctx context.Context) ([]Alert, error) { } func (a *alertsImpl) Update(ctx context.Context, request EditAlert) error { - path := fmt.Sprintf("/api/2.0/preview/sql/alerts/%v", request.AlertId) + path := fmt.Sprintf("/api/2.0/preview/sql/alerts/%v", strings.TrimPrefix(fmt.Sprint(request.AlertId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -76,7 +77,7 @@ func (a *dashboardWidgetsImpl) Create(ctx context.Context, request CreateWidget) } func (a *dashboardWidgetsImpl) Delete(ctx context.Context, request DeleteDashboardWidgetRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/widgets/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/sql/widgets/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -85,7 +86,7 @@ func (a *dashboardWidgetsImpl) Delete(ctx context.Context, request DeleteDashboa func (a *dashboardWidgetsImpl) Update(ctx context.Context, request CreateWidget) (*Widget, error) { var widget Widget - path := fmt.Sprintf("/api/2.0/preview/sql/widgets/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/sql/widgets/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -109,7 +110,7 @@ func (a *dashboardsImpl) Create(ctx context.Context, request CreateDashboardRequ } func (a *dashboardsImpl) Delete(ctx context.Context, request DeleteDashboardRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/dashboards/%v", request.DashboardId) + path := fmt.Sprintf("/api/2.0/preview/sql/dashboards/%v", strings.TrimPrefix(fmt.Sprint(request.DashboardId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -118,7 +119,7 @@ func (a *dashboardsImpl) Delete(ctx context.Context, request DeleteDashboardRequ func (a *dashboardsImpl) Get(ctx context.Context, request GetDashboardRequest) (*Dashboard, error) { var dashboard Dashboard - path := fmt.Sprintf("/api/2.0/preview/sql/dashboards/%v", request.DashboardId) + path := fmt.Sprintf("/api/2.0/preview/sql/dashboards/%v", strings.TrimPrefix(fmt.Sprint(request.DashboardId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &dashboard) @@ -135,7 +136,7 @@ func (a *dashboardsImpl) List(ctx context.Context, request ListDashboardsRequest } func (a *dashboardsImpl) Restore(ctx context.Context, request RestoreDashboardRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/dashboards/trash/%v", request.DashboardId) + path := fmt.Sprintf("/api/2.0/preview/sql/dashboards/trash/%v", strings.TrimPrefix(fmt.Sprint(request.DashboardId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) @@ -163,7 +164,7 @@ type dbsqlPermissionsImpl struct { func (a *dbsqlPermissionsImpl) Get(ctx context.Context, request GetDbsqlPermissionRequest) (*GetResponse, error) { var getResponse GetResponse - path := fmt.Sprintf("/api/2.0/preview/sql/permissions/%v/%v", request.ObjectType, request.ObjectId) + path := fmt.Sprintf("/api/2.0/preview/sql/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.ObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.ObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getResponse) @@ -172,7 +173,7 @@ func (a *dbsqlPermissionsImpl) Get(ctx context.Context, request GetDbsqlPermissi func (a *dbsqlPermissionsImpl) Set(ctx context.Context, request SetRequest) (*SetResponse, error) { var setResponse SetResponse - path := fmt.Sprintf("/api/2.0/preview/sql/permissions/%v/%v", request.ObjectType, request.ObjectId) + path := fmt.Sprintf("/api/2.0/preview/sql/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.ObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.ObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -182,7 +183,7 @@ func (a *dbsqlPermissionsImpl) Set(ctx context.Context, request SetRequest) (*Se func (a *dbsqlPermissionsImpl) TransferOwnership(ctx context.Context, request TransferOwnershipRequest) (*Success, error) { var success Success - path := fmt.Sprintf("/api/2.0/preview/sql/permissions/%v/%v/transfer", request.ObjectType, request.ObjectId) + path := fmt.Sprintf("/api/2.0/preview/sql/permissions/%v/%v/transfer", strings.TrimPrefix(fmt.Sprint(request.ObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.ObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -206,7 +207,7 @@ func (a *queriesImpl) Create(ctx context.Context, request QueryPostContent) (*Qu } func (a *queriesImpl) Delete(ctx context.Context, request DeleteQueryRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/queries/%v", request.QueryId) + path := fmt.Sprintf("/api/2.0/preview/sql/queries/%v", strings.TrimPrefix(fmt.Sprint(request.QueryId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -215,7 +216,7 @@ func (a *queriesImpl) Delete(ctx context.Context, request DeleteQueryRequest) er func (a *queriesImpl) Get(ctx context.Context, request GetQueryRequest) (*Query, error) { var query Query - path := fmt.Sprintf("/api/2.0/preview/sql/queries/%v", request.QueryId) + path := fmt.Sprintf("/api/2.0/preview/sql/queries/%v", strings.TrimPrefix(fmt.Sprint(request.QueryId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &query) @@ -232,7 +233,7 @@ func (a *queriesImpl) List(ctx context.Context, request ListQueriesRequest) (*Qu } func (a *queriesImpl) Restore(ctx context.Context, request RestoreQueryRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/queries/trash/%v", request.QueryId) + path := fmt.Sprintf("/api/2.0/preview/sql/queries/trash/%v", strings.TrimPrefix(fmt.Sprint(request.QueryId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) @@ -241,7 +242,7 @@ func (a *queriesImpl) Restore(ctx context.Context, request RestoreQueryRequest) func (a *queriesImpl) Update(ctx context.Context, request QueryEditContent) (*Query, error) { var query Query - path := fmt.Sprintf("/api/2.0/preview/sql/queries/%v", request.QueryId) + path := fmt.Sprintf("/api/2.0/preview/sql/queries/%v", strings.TrimPrefix(fmt.Sprint(request.QueryId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -279,7 +280,7 @@ func (a *queryVisualizationsImpl) Create(ctx context.Context, request CreateQuer } func (a *queryVisualizationsImpl) Delete(ctx context.Context, request DeleteQueryVisualizationRequest) error { - path := fmt.Sprintf("/api/2.0/preview/sql/visualizations/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/sql/visualizations/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -288,7 +289,7 @@ func (a *queryVisualizationsImpl) Delete(ctx context.Context, request DeleteQuer func (a *queryVisualizationsImpl) Update(ctx context.Context, request Visualization) (*Visualization, error) { var visualization Visualization - path := fmt.Sprintf("/api/2.0/preview/sql/visualizations/%v", request.Id) + path := fmt.Sprintf("/api/2.0/preview/sql/visualizations/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -302,7 +303,7 @@ type statementExecutionImpl struct { } func (a *statementExecutionImpl) CancelExecution(ctx context.Context, request CancelExecutionRequest) error { - path := fmt.Sprintf("/api/2.0/sql/statements/%v/cancel", request.StatementId) + path := fmt.Sprintf("/api/2.0/sql/statements/%v/cancel", strings.TrimPrefix(fmt.Sprint(request.StatementId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) return err @@ -320,7 +321,7 @@ func (a *statementExecutionImpl) ExecuteStatement(ctx context.Context, request E func (a *statementExecutionImpl) GetStatement(ctx context.Context, request GetStatementRequest) (*GetStatementResponse, error) { var getStatementResponse GetStatementResponse - path := fmt.Sprintf("/api/2.0/sql/statements/%v", request.StatementId) + path := fmt.Sprintf("/api/2.0/sql/statements/%v", strings.TrimPrefix(fmt.Sprint(request.StatementId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getStatementResponse) @@ -329,7 +330,7 @@ func (a *statementExecutionImpl) GetStatement(ctx context.Context, request GetSt func (a *statementExecutionImpl) GetStatementResultChunkN(ctx context.Context, request GetStatementResultChunkNRequest) (*ResultData, error) { var resultData ResultData - path := fmt.Sprintf("/api/2.0/sql/statements/%v/result/chunks/%v", request.StatementId, request.ChunkIndex) + path := fmt.Sprintf("/api/2.0/sql/statements/%v/result/chunks/%v", strings.TrimPrefix(fmt.Sprint(request.StatementId), "/"), strings.TrimPrefix(fmt.Sprint(request.ChunkIndex), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &resultData) @@ -352,7 +353,7 @@ func (a *warehousesImpl) Create(ctx context.Context, request CreateWarehouseRequ } func (a *warehousesImpl) Delete(ctx context.Context, request DeleteWarehouseRequest) error { - path := fmt.Sprintf("/api/2.0/sql/warehouses/%v", request.Id) + path := fmt.Sprintf("/api/2.0/sql/warehouses/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) @@ -360,7 +361,7 @@ func (a *warehousesImpl) Delete(ctx context.Context, request DeleteWarehouseRequ } func (a *warehousesImpl) Edit(ctx context.Context, request EditWarehouseRequest) error { - path := fmt.Sprintf("/api/2.0/sql/warehouses/%v/edit", request.Id) + path := fmt.Sprintf("/api/2.0/sql/warehouses/%v/edit", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -370,7 +371,7 @@ func (a *warehousesImpl) Edit(ctx context.Context, request EditWarehouseRequest) func (a *warehousesImpl) Get(ctx context.Context, request GetWarehouseRequest) (*GetWarehouseResponse, error) { var getWarehouseResponse GetWarehouseResponse - path := fmt.Sprintf("/api/2.0/sql/warehouses/%v", request.Id) + path := fmt.Sprintf("/api/2.0/sql/warehouses/%v", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getWarehouseResponse) @@ -379,7 +380,7 @@ func (a *warehousesImpl) Get(ctx context.Context, request GetWarehouseRequest) ( func (a *warehousesImpl) GetPermissionLevels(ctx context.Context, request GetWarehousePermissionLevelsRequest) (*GetWarehousePermissionLevelsResponse, error) { var getWarehousePermissionLevelsResponse GetWarehousePermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v/permissionLevels", request.WarehouseId) + path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.WarehouseId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getWarehousePermissionLevelsResponse) @@ -388,7 +389,7 @@ func (a *warehousesImpl) GetPermissionLevels(ctx context.Context, request GetWar func (a *warehousesImpl) GetPermissions(ctx context.Context, request GetWarehousePermissionsRequest) (*WarehousePermissions, error) { var warehousePermissions WarehousePermissions - path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v", request.WarehouseId) + path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v", strings.TrimPrefix(fmt.Sprint(request.WarehouseId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &warehousePermissions) @@ -415,7 +416,7 @@ func (a *warehousesImpl) List(ctx context.Context, request ListWarehousesRequest func (a *warehousesImpl) SetPermissions(ctx context.Context, request WarehousePermissionsRequest) (*WarehousePermissions, error) { var warehousePermissions WarehousePermissions - path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v", request.WarehouseId) + path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v", strings.TrimPrefix(fmt.Sprint(request.WarehouseId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -433,7 +434,7 @@ func (a *warehousesImpl) SetWorkspaceWarehouseConfig(ctx context.Context, reques } func (a *warehousesImpl) Start(ctx context.Context, request StartRequest) error { - path := fmt.Sprintf("/api/2.0/sql/warehouses/%v/start", request.Id) + path := fmt.Sprintf("/api/2.0/sql/warehouses/%v/start", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) @@ -441,7 +442,7 @@ func (a *warehousesImpl) Start(ctx context.Context, request StartRequest) error } func (a *warehousesImpl) Stop(ctx context.Context, request StopRequest) error { - path := fmt.Sprintf("/api/2.0/sql/warehouses/%v/stop", request.Id) + path := fmt.Sprintf("/api/2.0/sql/warehouses/%v/stop", strings.TrimPrefix(fmt.Sprint(request.Id), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodPost, path, headers, nil, nil) @@ -450,7 +451,7 @@ func (a *warehousesImpl) Stop(ctx context.Context, request StopRequest) error { func (a *warehousesImpl) UpdatePermissions(ctx context.Context, request WarehousePermissionsRequest) (*WarehousePermissions, error) { var warehousePermissions WarehousePermissions - path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v", request.WarehouseId) + path := fmt.Sprintf("/api/2.0/permissions/warehouses/%v", strings.TrimPrefix(fmt.Sprint(request.WarehouseId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" diff --git a/service/sql/model.go b/service/sql/model.go index b529c88e4..86bb9706d 100755 --- a/service/sql/model.go +++ b/service/sql/model.go @@ -280,7 +280,6 @@ func (s ChannelInfo) MarshalJSON() ([]byte, error) { return marshal.Marshal(s) } -// Name of the channel type ChannelName string const ChannelNameChannelNameCurrent ChannelName = `CHANNEL_NAME_CURRENT` diff --git a/service/workspace/impl.go b/service/workspace/impl.go index 87e149c38..441e68f9e 100755 --- a/service/workspace/impl.go +++ b/service/workspace/impl.go @@ -6,6 +6,7 @@ import ( "context" "fmt" "net/http" + "strings" "github.com/databricks/databricks-sdk-go/client" ) @@ -26,7 +27,7 @@ func (a *gitCredentialsImpl) Create(ctx context.Context, request CreateCredentia } func (a *gitCredentialsImpl) Delete(ctx context.Context, request DeleteGitCredentialRequest) error { - path := fmt.Sprintf("/api/2.0/git-credentials/%v", request.CredentialId) + path := fmt.Sprintf("/api/2.0/git-credentials/%v", strings.TrimPrefix(fmt.Sprint(request.CredentialId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -34,7 +35,7 @@ func (a *gitCredentialsImpl) Delete(ctx context.Context, request DeleteGitCreden func (a *gitCredentialsImpl) Get(ctx context.Context, request GetGitCredentialRequest) (*CredentialInfo, error) { var credentialInfo CredentialInfo - path := fmt.Sprintf("/api/2.0/git-credentials/%v", request.CredentialId) + path := fmt.Sprintf("/api/2.0/git-credentials/%v", strings.TrimPrefix(fmt.Sprint(request.CredentialId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &credentialInfo) @@ -51,7 +52,7 @@ func (a *gitCredentialsImpl) List(ctx context.Context) (*GetCredentialsResponse, } func (a *gitCredentialsImpl) Update(ctx context.Context, request UpdateCredentials) error { - path := fmt.Sprintf("/api/2.0/git-credentials/%v", request.CredentialId) + path := fmt.Sprintf("/api/2.0/git-credentials/%v", strings.TrimPrefix(fmt.Sprint(request.CredentialId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -75,7 +76,7 @@ func (a *reposImpl) Create(ctx context.Context, request CreateRepo) (*RepoInfo, } func (a *reposImpl) Delete(ctx context.Context, request DeleteRepoRequest) error { - path := fmt.Sprintf("/api/2.0/repos/%v", request.RepoId) + path := fmt.Sprintf("/api/2.0/repos/%v", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) err := a.client.Do(ctx, http.MethodDelete, path, headers, request, nil) return err @@ -83,7 +84,7 @@ func (a *reposImpl) Delete(ctx context.Context, request DeleteRepoRequest) error func (a *reposImpl) Get(ctx context.Context, request GetRepoRequest) (*RepoInfo, error) { var repoInfo RepoInfo - path := fmt.Sprintf("/api/2.0/repos/%v", request.RepoId) + path := fmt.Sprintf("/api/2.0/repos/%v", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &repoInfo) @@ -92,7 +93,7 @@ func (a *reposImpl) Get(ctx context.Context, request GetRepoRequest) (*RepoInfo, func (a *reposImpl) GetPermissionLevels(ctx context.Context, request GetRepoPermissionLevelsRequest) (*GetRepoPermissionLevelsResponse, error) { var getRepoPermissionLevelsResponse GetRepoPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/repos/%v/permissionLevels", request.RepoId) + path := fmt.Sprintf("/api/2.0/permissions/repos/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getRepoPermissionLevelsResponse) @@ -101,7 +102,7 @@ func (a *reposImpl) GetPermissionLevels(ctx context.Context, request GetRepoPerm func (a *reposImpl) GetPermissions(ctx context.Context, request GetRepoPermissionsRequest) (*RepoPermissions, error) { var repoPermissions RepoPermissions - path := fmt.Sprintf("/api/2.0/permissions/repos/%v", request.RepoId) + path := fmt.Sprintf("/api/2.0/permissions/repos/%v", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &repoPermissions) @@ -119,7 +120,7 @@ func (a *reposImpl) List(ctx context.Context, request ListReposRequest) (*ListRe func (a *reposImpl) SetPermissions(ctx context.Context, request RepoPermissionsRequest) (*RepoPermissions, error) { var repoPermissions RepoPermissions - path := fmt.Sprintf("/api/2.0/permissions/repos/%v", request.RepoId) + path := fmt.Sprintf("/api/2.0/permissions/repos/%v", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -128,7 +129,7 @@ func (a *reposImpl) SetPermissions(ctx context.Context, request RepoPermissionsR } func (a *reposImpl) Update(ctx context.Context, request UpdateRepo) error { - path := fmt.Sprintf("/api/2.0/repos/%v", request.RepoId) + path := fmt.Sprintf("/api/2.0/repos/%v", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -138,7 +139,7 @@ func (a *reposImpl) Update(ctx context.Context, request UpdateRepo) error { func (a *reposImpl) UpdatePermissions(ctx context.Context, request RepoPermissionsRequest) (*RepoPermissions, error) { var repoPermissions RepoPermissions - path := fmt.Sprintf("/api/2.0/permissions/repos/%v", request.RepoId) + path := fmt.Sprintf("/api/2.0/permissions/repos/%v", strings.TrimPrefix(fmt.Sprint(request.RepoId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -275,7 +276,7 @@ func (a *workspaceImpl) Export(ctx context.Context, request ExportRequest) (*Exp func (a *workspaceImpl) GetPermissionLevels(ctx context.Context, request GetWorkspaceObjectPermissionLevelsRequest) (*GetWorkspaceObjectPermissionLevelsResponse, error) { var getWorkspaceObjectPermissionLevelsResponse GetWorkspaceObjectPermissionLevelsResponse - path := fmt.Sprintf("/api/2.0/permissions/%v/%v/permissionLevels", request.WorkspaceObjectType, request.WorkspaceObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v/permissionLevels", strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &getWorkspaceObjectPermissionLevelsResponse) @@ -284,7 +285,7 @@ func (a *workspaceImpl) GetPermissionLevels(ctx context.Context, request GetWork func (a *workspaceImpl) GetPermissions(ctx context.Context, request GetWorkspaceObjectPermissionsRequest) (*WorkspaceObjectPermissions, error) { var workspaceObjectPermissions WorkspaceObjectPermissions - path := fmt.Sprintf("/api/2.0/permissions/%v/%v", request.WorkspaceObjectType, request.WorkspaceObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" err := a.client.Do(ctx, http.MethodGet, path, headers, request, &workspaceObjectPermissions) @@ -329,7 +330,7 @@ func (a *workspaceImpl) Mkdirs(ctx context.Context, request Mkdirs) error { func (a *workspaceImpl) SetPermissions(ctx context.Context, request WorkspaceObjectPermissionsRequest) (*WorkspaceObjectPermissions, error) { var workspaceObjectPermissions WorkspaceObjectPermissions - path := fmt.Sprintf("/api/2.0/permissions/%v/%v", request.WorkspaceObjectType, request.WorkspaceObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json" @@ -339,7 +340,7 @@ func (a *workspaceImpl) SetPermissions(ctx context.Context, request WorkspaceObj func (a *workspaceImpl) UpdatePermissions(ctx context.Context, request WorkspaceObjectPermissionsRequest) (*WorkspaceObjectPermissions, error) { var workspaceObjectPermissions WorkspaceObjectPermissions - path := fmt.Sprintf("/api/2.0/permissions/%v/%v", request.WorkspaceObjectType, request.WorkspaceObjectId) + path := fmt.Sprintf("/api/2.0/permissions/%v/%v", strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectType), "/"), strings.TrimPrefix(fmt.Sprint(request.WorkspaceObjectId), "/")) headers := make(map[string]string) headers["Accept"] = "application/json" headers["Content-Type"] = "application/json"