diff --git a/src/options.ts b/src/options.ts deleted file mode 100644 index bda11d9f..00000000 --- a/src/options.ts +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Accepts an options object passed from the user to the API. In the -// previous version of the API, it referred to a `Request` options object. -// Now it refers to an Axiox Request Config object. This is here to help -// ensure users don't pass invalid options when they upgrade from 0.x to 1.x. -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export function validate(options: any) { - const vpairs = [ - {invalid: 'uri', expected: 'url'}, - {invalid: 'json', expected: 'data'}, - {invalid: 'qs', expected: 'params'}, - ]; - for (const pair of vpairs) { - if (options[pair.invalid]) { - const e = `'${pair.invalid}' is not a valid configuration option. Please use '${pair.expected}' instead. This library is using Axios for requests. Please see https://github.com/axios/axios to learn more about the valid request options.`; - throw new Error(e); - } - } -} diff --git a/src/transporters.ts b/src/transporters.ts index 41660308..c60a556d 100644 --- a/src/transporters.ts +++ b/src/transporters.ts @@ -19,9 +19,7 @@ import { GaxiosPromise, GaxiosResponse, } from 'gaxios'; -import {validate} from './options'; -// eslint-disable-next-line @typescript-eslint/no-var-requires const pkg = require('../../package.json'); const PRODUCT_NAME = 'google-api-nodejs-client'; @@ -85,7 +83,6 @@ export class DefaultTransporter implements Transporter { request(opts: GaxiosOptions): GaxiosPromise { // ensure the user isn't passing in request-style options opts = this.configure(opts); - validate(opts); return this.instance.request(opts).catch(e => { throw this.processError(e); }); diff --git a/test/test.transporters.ts b/test/test.transporters.ts index 6c019191..055ede56 100644 --- a/test/test.transporters.ts +++ b/test/test.transporters.ts @@ -121,16 +121,6 @@ describe('transporters', () => { ); }); - it('should return an error if you try to use request config options with a promise', async () => { - const expected = new RegExp( - "'uri' is not a valid configuration option. Please use 'url' instead. This " + - 'library is using Axios for requests. Please see https://github.com/axios/axios ' + - 'to learn more about the valid request options.' - ); - const uri = 'http://example.com/api'; - assert.throws(() => transporter.request({uri} as GaxiosOptions), expected); - }); - it('should support invocation with async/await', async () => { const url = 'http://example.com'; const scope = nock(url).get('/').reply(200);