fix(auth): tail logs refresh token #702

Author: sii27858

…manager/environment/tail-log/tail-log.js …nds/cloudmanager/environment/tail-log.jssrc/commands/cloudmanager/environment/tail-log/tail-log.js renamed to src/commands/cloudmanager/environment/tail-log.js src/commands/cloudmanager/environment/tail-log/tail-log.js renamed to src/commands/cloudmanager/environment/tail-log.js

@@ -10,11 +10,10 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const BaseCommand = require('../../../../base-command')
-const { initSdk, getProgramId, sanitizeEnvironmentId } = require('../../../../cloudmanager-helpers')
-const commonFlags = require('../../../../common-flags')
-const commonArgs = require('../../../../common-args')
-const { executeWithRetries } = require('./utils')
+const BaseCommand = require('../../../base-command')
+const { initSdk, getProgramId, sanitizeEnvironmentId } = require('../../../cloudmanager-helpers')
+const commonFlags = require('../../../common-flags')
+const commonArgs = require('../../../common-args')
 
 class TailLog extends BaseCommand {
   async run () {
@@ -39,6 +38,36 @@ class TailLog extends BaseCommand {
   }
 }
 
+async function executeWithRetries (fn, maxRetries = 5) {
+  let retries = 0
+  let startTime = Date.now()
+  while (retries < maxRetries) {
+    try {
+      return await fn()
+    } catch (error) {
+      if (error.sdkDetails && error.sdkDetails.status === 403) {
+        console.log('403 Forbidden error. Attempting to reauthorize...')
+      } else {
+        throw error
+      }
+      retries++
+      if (shouldResetRetires(startTime)) {
+        retries = 0
+        startTime = Date.now()
+      }
+    }
+  }
+}
+
+function shouldResetRetires (startTime, resetInterval = 3600000) {
+  const elapsedTime = Date.now() - startTime
+  if (elapsedTime > resetInterval) {
+    console.log(`Resetting retries after ${resetInterval / 1000} seconds.`)
+    return true
+  }
+  return false
+}
+
 TailLog.description = 'outputs a stream of log data for the specified environment, service and log name'
 
 TailLog.args = [

src/commands/cloudmanager/environment/tail-log/utils.js

@@ -23,7 +23,7 @@ const GetExecutionStepDetails = require('./commands/cloudmanager/execution/get-s
 const GetExecutionStepLog = require('./commands/cloudmanager/execution/get-step-log')
 const ListAvailableLogOptions = require('./commands/cloudmanager/environment/list-available-log-options')
 const DownloadLogs = require('./commands/cloudmanager/environment/download-logs')
-const TailLog = require('./commands/cloudmanager/environment/tail-log/tail-log')
+const TailLog = require('./commands/cloudmanager/environment/tail-log')
 const DeletePipeline = require('./commands/cloudmanager/pipeline/delete')
 const UpdatePipeline = require('./commands/cloudmanager/pipeline/update')
 const OpenDeveloperConsole = require('./commands/cloudmanager/environment/open-developer-console')

src/index.js

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 
 const { resetCurrentOrgId, setCurrentOrgId } = require('@adobe/aio-lib-ims')
 const { init, mockSdk } = require('@adobe/aio-lib-cloudmanager')
-const TailLog = require('../../../src/commands/cloudmanager/environment/tail-log/tail-log')
+const TailLog = require('../../../src/commands/cloudmanager/environment/tail-log')
 
 beforeEach(() => {
   resetCurrentOrgId()
@@ -47,3 +47,14 @@ test('tail-log - config', async () => {
   await expect(mockSdk.tailLog.mock.calls.length).toEqual(1)
   await expect(mockSdk.tailLog).toHaveBeenCalledWith('5', '17', 'author', 'aemerror', process.stdout)
 })
+
+test('tail-log - throw error after 5 attempts for 403 code status', async () => {
+  setCurrentOrgId('good')
+  mockSdk.tailLog.mockRejectedValue({ sdkDetails: { status: 403 } })
+
+  expect.assertions(1)
+
+  const runResult = TailLog.run(['17', 'author', 'aemerror', '--programId', '5'])
+  await runResult
+  await expect(mockSdk.tailLog.mock.calls.length).toEqual(5)
+})