Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .codegen/api.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ func (a *{{.Service.Name}}API) {{.PascalName}}AndWait(ctx context.Context{{if .R
// This method is generated by Databricks SDK Code Generator.
func (a *{{.Service.Name}}API) {{.PascalName}}All(ctx context.Context{{if .Request}}, request {{.Request.PascalName}}{{end}}) ([]{{.Pagination.Entity.PascalName}}, error) {
{{if .Pagination.MultiRequest}}var results []{{.Pagination.Entity.PascalName}}
{{ if .Pagination.Limit -}}
var totalCount {{template "type" .Pagination.Offset.Entity}} = 0
{{ end -}}
ctx = useragent.InContext(ctx, "sdk-feature", "pagination")
{{if .Pagination.NeedsOffsetDedupe -}}
// deduplicate items that may have been added during iteration
Expand All @@ -129,6 +132,10 @@ func (a *{{.Service.Name}}API) {{.PascalName}}All(ctx context.Context{{if .Reque
{{- end}}
results = append(results, v)
}
{{ if .Pagination.Offset -}}
count := {{template "type" .Pagination.Offset.Entity}}(len(response.{{.Pagination.Results.PascalName}}))
totalCount += count
{{ end -}}
{{if eq .Path "/api/2.0/clusters/events" -}}
if response.NextPage == nil {
break
Expand All @@ -144,6 +151,12 @@ func (a *{{.Service.Name}}API) {{.PascalName}}All(ctx context.Context{{if .Reque
{{- else -}}
request.{{.Pagination.Offset.PascalName}} += {{template "type" .Pagination.Offset.Entity}}(len(response.{{.Pagination.Results.PascalName}}))
{{- end}}
{{ if .Pagination.Limit -}}
limit := request.{{.Pagination.Limit.PascalName}}
if limit > 0 && totalCount >= limit {
break
}
{{- end -}}
}
return results, nil{{else if .Pagination.Results}}response, err := a.impl.{{.PascalName}}(ctx{{if .Request}}, request{{end}})
if err != nil {
Expand Down
57 changes: 57 additions & 0 deletions internal/jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,60 @@ func TestAccJobsListAllNoDuplicatesNoTranspile(t *testing.T) {
}
assert.Equal(t, len(all), len(ids), "Listing produced duplicate results")
}

func TestAccJobsListWithLimitNoTranspile(t *testing.T) {
ctx, w := workspaceTest(t)

sparkVersions, err := w.Clusters.SparkVersions(ctx)
require.NoError(t, err)

// Select the latest LTS version
latestLTS, err := sparkVersions.Select(compute.SparkVersionRequest{
Latest: true,
})
require.NoError(t, err)

// Select the smallest node type id
smallestWithDisk, err := w.Clusters.SelectNodeType(ctx, compute.NodeTypeRequest{
LocalDisk: true,
})
require.NoError(t, err)

for i := 0; i < 11; i++ {
createdJob, err := w.Jobs.Create(ctx, jobs.CreateJob{
Name: RandomName(t.Name()),
Tasks: []jobs.JobTaskSettings{{
Description: "test",
NewCluster: &compute.BaseClusterInfo{
SparkVersion: latestLTS,
NodeTypeId: smallestWithDisk,
NumWorkers: 1,
},
TaskKey: "test",
TimeoutSeconds: 0,
NotebookTask: &jobs.NotebookTask{
NotebookPath: "/foo/bar",
},
}},
})
require.NoError(t, err)
t.Cleanup(func() {
err := w.Jobs.DeleteByJobId(ctx, createdJob.JobId)
require.NoError(t, err)
})
}

jobList, err := w.Jobs.ListAll(ctx, jobs.ListJobsRequest{
Limit: 5,
})

require.NoError(t, err)
assert.Equal(t, 5, len(jobList), "List returned correct amount of jobs (5)")

jobList, err = w.Jobs.ListAll(ctx, jobs.ListJobsRequest{
Limit: 10,
})

require.NoError(t, err)
assert.Equal(t, 10, len(jobList), "List returned correct amount of jobs (10)")
}
7 changes: 7 additions & 0 deletions service/compute/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions service/jobs/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 13 additions & 2 deletions service/ml/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions service/sql/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.