diff --git a/.stats.yml b/.stats.yml index 5b63f9fae7..205bae70ce 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ -configured_endpoints: 1680 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-e6020a67e862bf0a579c6977605f8e28657d6b161f107192512ac660a3b01858.yml -openapi_spec_hash: 4e7b96ee4e75204fc2667400a1bf84ec +configured_endpoints: 1674 +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-03f9db4f9d5414dbc88660c5268327c1e4135fa2860aa61874adbdcc5daeaa4a.yml +openapi_spec_hash: f99a0dcebfdeef6f2ea6580a53a4cba7 config_hash: 3fe4ecf1144e6b4732e2888957c2c22e diff --git a/api.md b/api.md index 24b60b0675..5130f13b23 100644 --- a/api.md +++ b/api.md @@ -4353,34 +4353,16 @@ Types: - JobCreateResponse - JobListResponse -- JobAbortResponse - JobAbortAllResponse -- JobGetResponse -- JobPauseResponse -- JobProgressResponse -- JobResumeResponse Methods: - client.r2.superSlurper.jobs.create({ ...params }) -> JobCreateResponse - client.r2.superSlurper.jobs.list({ ...params }) -> JobListResponsesSinglePage -- client.r2.superSlurper.jobs.abort(jobId, { ...params }) -> JobAbortResponse - client.r2.superSlurper.jobs.abortAll({ ...params }) -> JobAbortAllResponse -- client.r2.superSlurper.jobs.get(jobId, { ...params }) -> JobGetResponse -- client.r2.superSlurper.jobs.pause(jobId, { ...params }) -> JobPauseResponse -- client.r2.superSlurper.jobs.progress(jobId, { ...params }) -> JobProgressResponse -- client.r2.superSlurper.jobs.resume(jobId, { ...params }) -> JobResumeResponse #### Logs -Types: - -- LogListResponse - -Methods: - -- client.r2.superSlurper.jobs.logs.list(jobId, { ...params }) -> LogListResponsesSinglePage - ### ConnectivityPrecheck Types: diff --git a/src/resources/r2/super-slurper/index.ts b/src/resources/r2/super-slurper/index.ts index 59ce3330f5..a681cf58a3 100644 --- a/src/resources/r2/super-slurper/index.ts +++ b/src/resources/r2/super-slurper/index.ts @@ -12,19 +12,9 @@ export { Jobs, type JobCreateResponse, type JobListResponse, - type JobAbortResponse, type JobAbortAllResponse, - type JobGetResponse, - type JobPauseResponse, - type JobProgressResponse, - type JobResumeResponse, type JobCreateParams, type JobListParams, - type JobAbortParams, type JobAbortAllParams, - type JobGetParams, - type JobPauseParams, - type JobProgressParams, - type JobResumeParams, } from './jobs/index'; export { SuperSlurper } from './super-slurper'; diff --git a/src/resources/r2/super-slurper/jobs/index.ts b/src/resources/r2/super-slurper/jobs/index.ts index 7c7d6c772b..620c2ccc2f 100644 --- a/src/resources/r2/super-slurper/jobs/index.ts +++ b/src/resources/r2/super-slurper/jobs/index.ts @@ -5,19 +5,9 @@ export { Jobs, type JobCreateResponse, type JobListResponse, - type JobAbortResponse, type JobAbortAllResponse, - type JobGetResponse, - type JobPauseResponse, - type JobProgressResponse, - type JobResumeResponse, type JobCreateParams, type JobListParams, - type JobAbortParams, type JobAbortAllParams, - type JobGetParams, - type JobPauseParams, - type JobProgressParams, - type JobResumeParams, } from './jobs'; -export { LogListResponsesSinglePage, Logs, type LogListResponse, type LogListParams } from './logs'; +export { Logs } from './logs'; diff --git a/src/resources/r2/super-slurper/jobs/jobs.ts b/src/resources/r2/super-slurper/jobs/jobs.ts index 96fc927c2e..6a046c0e4b 100644 --- a/src/resources/r2/super-slurper/jobs/jobs.ts +++ b/src/resources/r2/super-slurper/jobs/jobs.ts @@ -4,7 +4,7 @@ import { APIResource } from '../../../../resource'; import * as Core from '../../../../core'; import * as SippyAPI from '../../buckets/sippy'; import * as LogsAPI from './logs'; -import { LogListParams, LogListResponse, LogListResponsesSinglePage, Logs } from './logs'; +import { Logs } from './logs'; import { SinglePage } from '../../../../pagination'; export class Jobs extends APIResource { @@ -36,22 +36,6 @@ export class Jobs extends APIResource { }); } - /** - * Abort a job - */ - abort( - jobId: string, - params: JobAbortParams, - options?: Core.RequestOptions, - ): Core.APIPromise { - const { account_id } = params; - return ( - this._client.put(`/accounts/${account_id}/slurper/jobs/${jobId}/abort`, options) as Core.APIPromise<{ - result: JobAbortResponse; - }> - )._thenUnwrap((obj) => obj.result); - } - /** * Abort all jobs */ @@ -63,72 +47,12 @@ export class Jobs extends APIResource { }> )._thenUnwrap((obj) => obj.result); } - - /** - * Get job details - */ - get(jobId: string, params: JobGetParams, options?: Core.RequestOptions): Core.APIPromise { - const { account_id } = params; - return ( - this._client.get(`/accounts/${account_id}/slurper/jobs/${jobId}`, options) as Core.APIPromise<{ - result: JobGetResponse; - }> - )._thenUnwrap((obj) => obj.result); - } - - /** - * Pause a job - */ - pause( - jobId: string, - params: JobPauseParams, - options?: Core.RequestOptions, - ): Core.APIPromise { - const { account_id } = params; - return ( - this._client.put(`/accounts/${account_id}/slurper/jobs/${jobId}/pause`, options) as Core.APIPromise<{ - result: JobPauseResponse; - }> - )._thenUnwrap((obj) => obj.result); - } - - /** - * Get job progress - */ - progress( - jobId: string, - params: JobProgressParams, - options?: Core.RequestOptions, - ): Core.APIPromise { - const { account_id } = params; - return ( - this._client.get(`/accounts/${account_id}/slurper/jobs/${jobId}/progress`, options) as Core.APIPromise<{ - result: JobProgressResponse; - }> - )._thenUnwrap((obj) => obj.result); - } - - /** - * Resume a job - */ - resume( - jobId: string, - params: JobResumeParams, - options?: Core.RequestOptions, - ): Core.APIPromise { - const { account_id } = params; - return ( - this._client.put(`/accounts/${account_id}/slurper/jobs/${jobId}/resume`, options) as Core.APIPromise<{ - result: JobResumeResponse; - }> - )._thenUnwrap((obj) => obj.result); - } } export class JobListResponsesSinglePage extends SinglePage {} export interface JobCreateResponse { - jobId?: string; + id?: string; } export interface JobListResponse { @@ -188,87 +112,8 @@ export namespace JobListResponse { } } -export type JobAbortResponse = string; - export type JobAbortAllResponse = string; -export interface JobGetResponse { - id?: string; - - createdAt?: string; - - finishedAt?: string | null; - - overwrite?: boolean; - - source?: - | JobGetResponse.S3SourceResponseSchema - | JobGetResponse.GcsSourceResponseSchema - | JobGetResponse.R2SourceResponseSchema; - - status?: 'running' | 'paused' | 'aborted' | 'completed'; - - target?: JobGetResponse.Target; -} - -export namespace JobGetResponse { - export interface S3SourceResponseSchema { - bucket?: string; - - endpoint?: string | null; - - pathPrefix?: string | null; - - vendor?: 's3'; - } - - export interface GcsSourceResponseSchema { - bucket?: string; - - pathPrefix?: string | null; - - vendor?: 'gcs'; - } - - export interface R2SourceResponseSchema { - bucket?: string; - - jurisdiction?: 'default' | 'eu' | 'fedramp'; - - pathPrefix?: string | null; - - vendor?: SippyAPI.Provider; - } - - export interface Target { - bucket?: string; - - jurisdiction?: 'default' | 'eu' | 'fedramp'; - - vendor?: SippyAPI.Provider; - } -} - -export type JobPauseResponse = string; - -export interface JobProgressResponse { - id?: string; - - createdAt?: string; - - failedObjects?: number; - - objects?: number; - - skippedObjects?: number; - - status?: 'running' | 'paused' | 'aborted' | 'completed'; - - transferredObjects?: number; -} - -export type JobResumeResponse = string; - export interface JobCreateParams { /** * Path param: @@ -383,59 +228,23 @@ export interface JobListParams { offset?: number; } -export interface JobAbortParams { - account_id: string; -} - export interface JobAbortAllParams { account_id: string; } -export interface JobGetParams { - account_id: string; -} - -export interface JobPauseParams { - account_id: string; -} - -export interface JobProgressParams { - account_id: string; -} - -export interface JobResumeParams { - account_id: string; -} - Jobs.JobListResponsesSinglePage = JobListResponsesSinglePage; Jobs.Logs = Logs; -Jobs.LogListResponsesSinglePage = LogListResponsesSinglePage; export declare namespace Jobs { export { type JobCreateResponse as JobCreateResponse, type JobListResponse as JobListResponse, - type JobAbortResponse as JobAbortResponse, type JobAbortAllResponse as JobAbortAllResponse, - type JobGetResponse as JobGetResponse, - type JobPauseResponse as JobPauseResponse, - type JobProgressResponse as JobProgressResponse, - type JobResumeResponse as JobResumeResponse, JobListResponsesSinglePage as JobListResponsesSinglePage, type JobCreateParams as JobCreateParams, type JobListParams as JobListParams, - type JobAbortParams as JobAbortParams, type JobAbortAllParams as JobAbortAllParams, - type JobGetParams as JobGetParams, - type JobPauseParams as JobPauseParams, - type JobProgressParams as JobProgressParams, - type JobResumeParams as JobResumeParams, }; - export { - Logs as Logs, - type LogListResponse as LogListResponse, - LogListResponsesSinglePage as LogListResponsesSinglePage, - type LogListParams as LogListParams, - }; + export { Logs as Logs }; } diff --git a/src/resources/r2/super-slurper/jobs/logs.ts b/src/resources/r2/super-slurper/jobs/logs.ts index f5fa24efc0..4bac93b04d 100644 --- a/src/resources/r2/super-slurper/jobs/logs.ts +++ b/src/resources/r2/super-slurper/jobs/logs.ts @@ -1,79 +1,5 @@ // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. import { APIResource } from '../../../../resource'; -import * as Core from '../../../../core'; -import { SinglePage } from '../../../../pagination'; -export class Logs extends APIResource { - /** - * Get job logs - */ - list( - jobId: string, - params: LogListParams, - options?: Core.RequestOptions, - ): Core.PagePromise { - const { account_id, ...query } = params; - return this._client.getAPIList( - `/accounts/${account_id}/slurper/jobs/${jobId}/logs`, - LogListResponsesSinglePage, - { query, ...options }, - ); - } -} - -export class LogListResponsesSinglePage extends SinglePage {} - -export interface LogListResponse { - createdAt?: string; - - job?: string; - - logType?: - | 'migrationStart' - | 'migrationComplete' - | 'migrationAbort' - | 'migrationError' - | 'migrationPause' - | 'migrationResume' - | 'migrationErrorFailedContinuation' - | 'importErrorRetryExhaustion' - | 'importSkippedStorageClass' - | 'importSkippedOversized' - | 'importSkippedEmptyObject' - | 'importSkippedUnsupportedContentType' - | 'importSkippedExcludedContentType' - | 'importSkippedInvalidMedia' - | 'importSkippedRequiresRetrieval'; - - message?: string | null; - - objectKey?: string | null; -} - -export interface LogListParams { - /** - * Path param: - */ - account_id: string; - - /** - * Query param: - */ - limit?: number; - - /** - * Query param: - */ - offset?: number; -} - -Logs.LogListResponsesSinglePage = LogListResponsesSinglePage; - -export declare namespace Logs { - export { - type LogListResponse as LogListResponse, - LogListResponsesSinglePage as LogListResponsesSinglePage, - type LogListParams as LogListParams, - }; -} +export class Logs extends APIResource {} diff --git a/src/resources/r2/super-slurper/super-slurper.ts b/src/resources/r2/super-slurper/super-slurper.ts index 9eb14c5f43..2089f478f6 100644 --- a/src/resources/r2/super-slurper/super-slurper.ts +++ b/src/resources/r2/super-slurper/super-slurper.ts @@ -13,21 +13,11 @@ import * as JobsAPI from './jobs/jobs'; import { JobAbortAllParams, JobAbortAllResponse, - JobAbortParams, - JobAbortResponse, JobCreateParams, JobCreateResponse, - JobGetParams, - JobGetResponse, JobListParams, JobListResponse, JobListResponsesSinglePage, - JobPauseParams, - JobPauseResponse, - JobProgressParams, - JobProgressResponse, - JobResumeParams, - JobResumeResponse, Jobs, } from './jobs/jobs'; @@ -46,21 +36,11 @@ export declare namespace SuperSlurper { Jobs as Jobs, type JobCreateResponse as JobCreateResponse, type JobListResponse as JobListResponse, - type JobAbortResponse as JobAbortResponse, type JobAbortAllResponse as JobAbortAllResponse, - type JobGetResponse as JobGetResponse, - type JobPauseResponse as JobPauseResponse, - type JobProgressResponse as JobProgressResponse, - type JobResumeResponse as JobResumeResponse, JobListResponsesSinglePage as JobListResponsesSinglePage, type JobCreateParams as JobCreateParams, type JobListParams as JobListParams, - type JobAbortParams as JobAbortParams, type JobAbortAllParams as JobAbortAllParams, - type JobGetParams as JobGetParams, - type JobPauseParams as JobPauseParams, - type JobProgressParams as JobProgressParams, - type JobResumeParams as JobResumeParams, }; export { diff --git a/tests/api-resources/r2/super-slurper/jobs/jobs.test.ts b/tests/api-resources/r2/super-slurper/jobs/jobs.test.ts index 25fbd97cef..9135f4ac8a 100644 --- a/tests/api-resources/r2/super-slurper/jobs/jobs.test.ts +++ b/tests/api-resources/r2/super-slurper/jobs/jobs.test.ts @@ -59,21 +59,6 @@ describe('resource jobs', () => { }); }); - test('abort: only required params', async () => { - const responsePromise = client.r2.superSlurper.jobs.abort('jobId', { account_id: 'account_id' }); - const rawResponse = await responsePromise.asResponse(); - expect(rawResponse).toBeInstanceOf(Response); - const response = await responsePromise; - expect(response).not.toBeInstanceOf(Response); - const dataAndResponse = await responsePromise.withResponse(); - expect(dataAndResponse.data).toBe(response); - expect(dataAndResponse.response).toBe(rawResponse); - }); - - test('abort: required and optional params', async () => { - const response = await client.r2.superSlurper.jobs.abort('jobId', { account_id: 'account_id' }); - }); - test('abortAll: only required params', async () => { const responsePromise = client.r2.superSlurper.jobs.abortAll({ account_id: 'account_id' }); const rawResponse = await responsePromise.asResponse(); @@ -88,64 +73,4 @@ describe('resource jobs', () => { test('abortAll: required and optional params', async () => { const response = await client.r2.superSlurper.jobs.abortAll({ account_id: 'account_id' }); }); - - test('get: only required params', async () => { - const responsePromise = client.r2.superSlurper.jobs.get('jobId', { account_id: 'account_id' }); - const rawResponse = await responsePromise.asResponse(); - expect(rawResponse).toBeInstanceOf(Response); - const response = await responsePromise; - expect(response).not.toBeInstanceOf(Response); - const dataAndResponse = await responsePromise.withResponse(); - expect(dataAndResponse.data).toBe(response); - expect(dataAndResponse.response).toBe(rawResponse); - }); - - test('get: required and optional params', async () => { - const response = await client.r2.superSlurper.jobs.get('jobId', { account_id: 'account_id' }); - }); - - test('pause: only required params', async () => { - const responsePromise = client.r2.superSlurper.jobs.pause('jobId', { account_id: 'account_id' }); - const rawResponse = await responsePromise.asResponse(); - expect(rawResponse).toBeInstanceOf(Response); - const response = await responsePromise; - expect(response).not.toBeInstanceOf(Response); - const dataAndResponse = await responsePromise.withResponse(); - expect(dataAndResponse.data).toBe(response); - expect(dataAndResponse.response).toBe(rawResponse); - }); - - test('pause: required and optional params', async () => { - const response = await client.r2.superSlurper.jobs.pause('jobId', { account_id: 'account_id' }); - }); - - test('progress: only required params', async () => { - const responsePromise = client.r2.superSlurper.jobs.progress('jobId', { account_id: 'account_id' }); - const rawResponse = await responsePromise.asResponse(); - expect(rawResponse).toBeInstanceOf(Response); - const response = await responsePromise; - expect(response).not.toBeInstanceOf(Response); - const dataAndResponse = await responsePromise.withResponse(); - expect(dataAndResponse.data).toBe(response); - expect(dataAndResponse.response).toBe(rawResponse); - }); - - test('progress: required and optional params', async () => { - const response = await client.r2.superSlurper.jobs.progress('jobId', { account_id: 'account_id' }); - }); - - test('resume: only required params', async () => { - const responsePromise = client.r2.superSlurper.jobs.resume('jobId', { account_id: 'account_id' }); - const rawResponse = await responsePromise.asResponse(); - expect(rawResponse).toBeInstanceOf(Response); - const response = await responsePromise; - expect(response).not.toBeInstanceOf(Response); - const dataAndResponse = await responsePromise.withResponse(); - expect(dataAndResponse.data).toBe(response); - expect(dataAndResponse.response).toBe(rawResponse); - }); - - test('resume: required and optional params', async () => { - const response = await client.r2.superSlurper.jobs.resume('jobId', { account_id: 'account_id' }); - }); }); diff --git a/tests/api-resources/r2/super-slurper/jobs/logs.test.ts b/tests/api-resources/r2/super-slurper/jobs/logs.test.ts deleted file mode 100644 index df464498fa..0000000000 --- a/tests/api-resources/r2/super-slurper/jobs/logs.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -import Cloudflare from 'cloudflare'; -import { Response } from 'node-fetch'; - -const client = new Cloudflare({ - apiKey: '144c9defac04969c7bfad8efaa8ea194', - apiEmail: 'user@example.com', - baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010', -}); - -describe('resource logs', () => { - test('list: only required params', async () => { - const responsePromise = client.r2.superSlurper.jobs.logs.list('jobId', { account_id: 'account_id' }); - const rawResponse = await responsePromise.asResponse(); - expect(rawResponse).toBeInstanceOf(Response); - const response = await responsePromise; - expect(response).not.toBeInstanceOf(Response); - const dataAndResponse = await responsePromise.withResponse(); - expect(dataAndResponse.data).toBe(response); - expect(dataAndResponse.response).toBe(rawResponse); - }); - - test('list: required and optional params', async () => { - const response = await client.r2.superSlurper.jobs.logs.list('jobId', { - account_id: 'account_id', - limit: 50, - offset: 0, - }); - }); -});