chore: fix downloading error

Author: sofisl

src/generator/download.ts

@@ -86,15 +86,19 @@ export async function downloadDiscoveryDocs(
       const url = `${options.discoveryUrl}/${api.name}.${api.version}.json`;
       const changeSet: ChangeSet = {api, changes: []};
       try {
-        const res = await request<{}>({url});
+        const res = await request({url});
         // The keys in the downloaded JSON come back in an arbitrary order from
         // request to request. Sort them before storing.
-        const newDoc = sortKeys(res.data);
+        // console.log(JSON.parse(res.data as string))
+        const newDoc = sortKeys(JSON.parse(res.data as string));
         let updateFile = true;
 
         try {
           const oldDoc = JSON.parse(await gfs.readFile(apiPath));
+          // console.log(oldDoc)
+          // console.log(newDoc)
           updateFile = shouldUpdate(newDoc, oldDoc);
+          // console.log(updateFile)
           changeSet.changes = getDiffs(oldDoc, newDoc);
         } catch {
           // If the file doesn't exist, that's fine it's just new

src/generator/generator.ts

@@ -109,7 +109,7 @@ export class Generator {
     if (useCache) {
       console.log('Reading from cache...');
     } else {
-      changes = await downloadDiscoveryDocs({
+        changes = await downloadDiscoveryDocs({
         includePrivate: this.options.includePrivate,
         discoveryUrl,
         downloadPath: discoveryPath,
@@ -133,6 +133,8 @@ export class Generator {
           api.discoveryRestUrl,
           'Attempting first generateAPI call...'
         );
+        console.log("DISCOVERY PATH")
+        console.log(discoveryPath)
         try {
           const apiPath = path.join(
             discoveryPath,

test/test.download.ts

@@ -78,7 +78,7 @@ describe(__filename, () => {
     assert.strictEqual(shouldUpdate, false);
   });
 
-  it('should download the discovery docs', async () => {
+  it.only('should download the discovery docs', async () => {
     const scopes = [
       nock(
         'https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries'
@@ -91,7 +91,10 @@ describe(__filename, () => {
         'https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries'
       )
         .get('/fake.v1.json')
-        .reply(200),
+        .reply(
+          200,
+          '{"id": "fake:v1","discoveryRestUrl": "http://localhost:3030/path","name": "fake","version": "v1"}'
+        ),
     ];
     const mkdirpStub = sandbox.stub(dn.gfs, 'mkdir').resolves();
     const writeFileStub = sandbox.stub(dn.gfs, 'writeFile');
@@ -117,9 +120,10 @@ describe(__filename, () => {
         'https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries'
       )
         .get('/fake.v1.json')
-        .reply(200, {
-          revision: '1234',
-        }),
+        .reply(
+          200,
+          '{"id": "fake:v1","discoveryRestUrl": "http://localhost:3030/path","name": "fake","version": "v1", revision: "1234"}'
+        ),
     ];
     const writeFileStub = sandbox.stub(dn.gfs, 'writeFile');
     const readFileStub = sandbox.stub(dn.gfs, 'readFile').callsFake(() => {