fix(types): use Metadata for api response type (#222)

Author: JustinBeckwith

packages/google-cloud-resourcemanager/.gitignore

@@ -11,3 +11,4 @@ system-test/*key.json
 .DS_Store
 package-lock.json
 .vscode
+__pycache__

packages/google-cloud-resourcemanager/package.json

@@ -51,7 +51,6 @@
     "@google-cloud/nodejs-repo-tools": "^3.0.0",
     "@types/mocha": "^5.2.5",
     "@types/proxyquire": "^1.3.28",
-    "@types/request": "^2.47.1",
     "@types/uuid": "^3.4.3",
     "arrify": "^2.0.0",
     "codecov": "^3.0.0",

packages/google-cloud-resourcemanager/src/index.ts

@@ -14,26 +14,30 @@
  * limitations under the License.
  */
 
-import {GoogleAuthOptions, Operation, Service} from '@google-cloud/common';
+import {
+  GoogleAuthOptions,
+  Operation,
+  Service,
+  Metadata,
+} from '@google-cloud/common';
 import {paginator} from '@google-cloud/paginator';
 import {promisifyAll} from '@google-cloud/promisify';
-import * as r from 'request'; // Only for type declarations.
 
 import {Project} from './project';
 
 export type CreateProjectCallback = (
   err: Error | null,
   project?: Project | null,
   operation?: Operation<Project>,
-  apiResponse?: r.Response
+  apiResponse?: Metadata
 ) => void;
-export type CreateProjectResponse = [Project, Operation<Project>, r.Response];
-export type GetProjectsResponse = [Project[], r.Response];
+export type CreateProjectResponse = [Project, Operation<Project>, Metadata];
+export type GetProjectsResponse = [Project[], Metadata];
 export type GetProjectsCallback = (
   err: Error | null,
   projects?: Project[] | null,
   nextQuery?: {} | null,
-  apiResponse?: r.Response
+  apiResponse?: Metadata
 ) => void;
 
 export interface GetProjectOptions {

packages/google-cloud-resourcemanager/src/project.ts

@@ -14,25 +14,24 @@
  * limitations under the License.
  */
 
-import {Operation, ServiceObject, util} from '@google-cloud/common';
+import {Operation, ServiceObject, util, Metadata} from '@google-cloud/common';
 import {promisifyAll} from '@google-cloud/promisify';
-import * as r from 'request'; // Only for type declarations.
 
 import {CreateProjectCallback, CreateProjectResponse, Resource} from '.';
 
 export type RestoreCallback = (
   err: Error | null,
-  apiResonse?: r.Response
+  apiResonse?: Metadata
 ) => void;
-export type RestoreResponse = [r.Response];
+export type RestoreResponse = [Metadata];
 
-export type ProjectCreateResponse = [Project, Operation<Project>, r.Response];
+export type ProjectCreateResponse = [Project, Operation<Project>, Metadata];
 export interface ProjectCreateCallback {
   (
     err: Error | null,
     project?: Project,
     operation?: Operation<Project>,
-    apiResponse?: r.Response
+    apiResponse?: Metadata
   ): void;
 }
 

packages/google-cloud-resourcemanager/test/index.ts

@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-import {DecorateRequestOptions, Operation, util} from '@google-cloud/common';
+import {
+  DecorateRequestOptions,
+  Operation,
+  util,
+  Metadata,
+} from '@google-cloud/common';
 import {MakeAuthenticatedRequestFactoryConfig} from '@google-cloud/common/build/src/util';
 import arrify = require('arrify');
 import * as assert from 'assert';
 import * as proxyquire from 'proxyquire';
-import {Response} from 'request';
 
 import * as root from '../src';
 import {Project} from '../src';
@@ -196,7 +200,7 @@ describe('Resource', () => {
         resource.createProject(
           NEW_PROJECT_ID,
           OPTIONS,
-          (err: Error, p: Project, res: Response) => {
+          (err: Error, p: Project, res: Metadata) => {
             assert.strictEqual(err, error);
             assert.strictEqual(p, null);
             assert.strictEqual(res, apiResponse);
@@ -235,7 +239,7 @@ describe('Resource', () => {
         resource.createProject(
           NEW_PROJECT_ID,
           OPTIONS,
-          (e: Error, p: Project, o: Operation, res: Response) => {
+          (e: Error, p: Project, o: Operation, res: Metadata) => {
             assert.ifError(e);
             assert.strictEqual(p, project);
             assert.strictEqual(o, fakeOperation);
@@ -287,7 +291,7 @@ describe('Resource', () => {
             err: Error,
             projects: Project[],
             nextQuery: {},
-            apiResp: Response
+            apiResp: Metadata
           ) => {
             assert.strictEqual(err, error);
             assert.strictEqual(projects, null);
@@ -355,7 +359,7 @@ describe('Resource', () => {
             err: Error,
             projects: Project[],
             nextQuery: {},
-            apiResp: Response
+            apiResp: Metadata
           ) => {
             assert.ifError(err);
             assert.strictEqual(projects[0], project);

packages/google-cloud-resourcemanager/test/project.ts

@@ -19,11 +19,11 @@ import {
   ServiceObject,
   ServiceObjectConfig,
   util,
+  Metadata,
 } from '@google-cloud/common';
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import * as proxyquire from 'proxyquire';
-import {Response} from 'request';
 
 let promisified = false;
 const fakePromisify = Object.assign({}, promisify, {
@@ -128,7 +128,7 @@ describe('Project', () => {
     });
 
     it('should execute the callback with error & API response', done => {
-      project.restore((err: Error, apiResponse_: Response) => {
+      project.restore((err: Error, apiResponse_: Metadata) => {
         assert.strictEqual(err, error);
         assert.strictEqual(apiResponse_, apiResponse);
         done();