From 032ac1fe32c86ad0f24f76b68fc867b33a87de22 Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Wed, 12 Jun 2019 14:15:48 -0700 Subject: [PATCH 1/4] Add console error messages for better logging --- functions/composer-storage-trigger/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/functions/composer-storage-trigger/index.js b/functions/composer-storage-trigger/index.js index 3e6877aa76..b56725482b 100644 --- a/functions/composer-storage-trigger/index.js +++ b/functions/composer-storage-trigger/index.js @@ -88,6 +88,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const tokenResponse = await res.json(); if (tokenResponse.error) { + console.error(JSON.stringify(tokenResponse.error)); return Promise.reject(tokenResponse.error); } @@ -118,6 +119,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const blobJson = await blob.json(); if (blobJson.error) { + console.error(JSON.stringify(blobJson.error)); return Promise.reject(blobJson.error); } @@ -134,6 +136,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { }); const tokenJson = await token.json(); if (tokenJson.error) { + console.error(JSON.stringify(tokenJson.error)); return Promise.reject(tokenJson.error); } @@ -161,6 +164,7 @@ const makeIapPostRequest = async (url, body, idToken, userAgent) => { if (!res.ok) { const err = await res.text(); + console.error(JSON.stringify(err)); throw new Error(err); } }; From 1489cc4d2d7565466a5b68f5afa6febe0051603b Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Thu, 13 Jun 2019 15:04:54 -0700 Subject: [PATCH 2/4] Improve logging messages --- functions/composer-storage-trigger/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/functions/composer-storage-trigger/index.js b/functions/composer-storage-trigger/index.js index b56725482b..b0d6f6740b 100644 --- a/functions/composer-storage-trigger/index.js +++ b/functions/composer-storage-trigger/index.js @@ -61,6 +61,7 @@ exports.triggerDag = async data => { iap.jwt ); } catch (err) { + console.error('Error authorizing IAP: ' + err.message); throw new Error(err); } }; @@ -88,7 +89,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const tokenResponse = await res.json(); if (tokenResponse.error) { - console.error(JSON.stringify(tokenResponse.error)); + console.error('Error in token reponse:' + tokenResponse.error.message); return Promise.reject(tokenResponse.error); } @@ -119,7 +120,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const blobJson = await blob.json(); if (blobJson.error) { - console.error(JSON.stringify(blobJson.error)); + console.error('Error in blob signing: ' + blobJson.error.message); return Promise.reject(blobJson.error); } @@ -136,7 +137,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { }); const tokenJson = await token.json(); if (tokenJson.error) { - console.error(JSON.stringify(tokenJson.error)); + console.error('Error fetching token: ' + tokenJson.error.message); return Promise.reject(tokenJson.error); } @@ -164,7 +165,7 @@ const makeIapPostRequest = async (url, body, idToken, userAgent) => { if (!res.ok) { const err = await res.text(); - console.error(JSON.stringify(err)); + console.error('Error making IAP post request: ' + err.message); throw new Error(err); } }; From 4f4554431e7ae58595dc3fceec3030f6542fe23b Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Thu, 13 Jun 2019 17:14:01 -0700 Subject: [PATCH 3/4] Nit fix --- functions/composer-storage-trigger/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions/composer-storage-trigger/index.js b/functions/composer-storage-trigger/index.js index b0d6f6740b..bbd9623d36 100644 --- a/functions/composer-storage-trigger/index.js +++ b/functions/composer-storage-trigger/index.js @@ -61,7 +61,7 @@ exports.triggerDag = async data => { iap.jwt ); } catch (err) { - console.error('Error authorizing IAP: ' + err.message); + console.error('Error authorizing IAP: ', err.message); throw new Error(err); } }; @@ -89,7 +89,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const tokenResponse = await res.json(); if (tokenResponse.error) { - console.error('Error in token reponse:' + tokenResponse.error.message); + console.error('Error in token reponse:', tokenResponse.error.message); return Promise.reject(tokenResponse.error); } @@ -120,7 +120,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const blobJson = await blob.json(); if (blobJson.error) { - console.error('Error in blob signing: ' + blobJson.error.message); + console.error('Error in blob signing: ', blobJson.error.message); return Promise.reject(blobJson.error); } @@ -137,7 +137,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { }); const tokenJson = await token.json(); if (tokenJson.error) { - console.error('Error fetching token: ' + tokenJson.error.message); + console.error('Error fetching token: ', tokenJson.error.message); return Promise.reject(tokenJson.error); } @@ -165,7 +165,7 @@ const makeIapPostRequest = async (url, body, idToken, userAgent) => { if (!res.ok) { const err = await res.text(); - console.error('Error making IAP post request: ' + err.message); + console.error('Error making IAP post request: ', err.message); throw new Error(err); } }; From 2e833a2269af3cabab51c5666d3fc6d5b543cfaa Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Thu, 13 Jun 2019 17:17:06 -0700 Subject: [PATCH 4/4] Nit fix again --- functions/composer-storage-trigger/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/functions/composer-storage-trigger/index.js b/functions/composer-storage-trigger/index.js index bbd9623d36..8ebe15e186 100644 --- a/functions/composer-storage-trigger/index.js +++ b/functions/composer-storage-trigger/index.js @@ -61,7 +61,7 @@ exports.triggerDag = async data => { iap.jwt ); } catch (err) { - console.error('Error authorizing IAP: ', err.message); + console.error('Error authorizing IAP:', err.message); throw new Error(err); } }; @@ -120,7 +120,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { ); const blobJson = await blob.json(); if (blobJson.error) { - console.error('Error in blob signing: ', blobJson.error.message); + console.error('Error in blob signing:', blobJson.error.message); return Promise.reject(blobJson.error); } @@ -137,7 +137,7 @@ const authorizeIap = async (clientId, projectId, userAgent) => { }); const tokenJson = await token.json(); if (tokenJson.error) { - console.error('Error fetching token: ', tokenJson.error.message); + console.error('Error fetching token:', tokenJson.error.message); return Promise.reject(tokenJson.error); } @@ -165,7 +165,7 @@ const makeIapPostRequest = async (url, body, idToken, userAgent) => { if (!res.ok) { const err = await res.text(); - console.error('Error making IAP post request: ', err.message); + console.error('Error making IAP post request:', err.message); throw new Error(err); } };