chore: Ensure correct deploy order

.github/actions/internal-promotion/templates/postamble.js

@@ -1,14 +1,3 @@
-// Reset config values back to released
-window.NREUM.loader_config.agentID = '{{{args.appId}}}'
-window.NREUM.loader_config.applicationID = '{{{args.appId}}}'
-window.NREUM.loader_config.licenseKey = '{{{args.licenseKey}}}'
-window.NREUM.info.applicationID = '{{{args.appId}}}'
-window.NREUM.info.licenseKey = '{{{args.licenseKey}}}'
-window.NREUM.init.proxy = {}
-window.NREUM.init.session_replay.enabled = true
-window.NREUM.init.session_trace.enabled = true
-window.NREUM.init.user_actions = { elementAttributes: ['id', 'className', 'tagName', 'type', 'ariaLabel', 'alt', 'title'] }
-
 // Session replay entitlements check
 try {
   var xhr = new XMLHttpRequest()

.github/actions/nr-upload/args.js

@@ -19,9 +19,6 @@ export const args = yargs(hideBin(process.argv))
   .string('loader-version')
   .describe('loader-version', 'Browser Agent version number')
 
-  .string('local-dir')
-  .describe('local-dir', 'Local directory to read loader files from instead of fetching from CDN')
-
   .demandOption(['environment', 'loader-version'])
   .check((argv) => {
     if (argv.environment.includes('stage') && !argv.stageApiKey) {

.github/actions/nr-upload/index.js

@@ -1,12 +1,13 @@
 import { v4 as uuidv4 } from 'uuid'
-import { readFile } from 'fs/promises'
-import { join } from 'path'
 import { args } from './args.js'
 import { fetchRetry } from '../shared-utils/fetch-retry.js'
-import { constructLoaderFileNames, constructFuzzyVersions } from '../shared-utils/loaders.js'
+import {
+  expandLoaderFileNames,
+  constructLoaderFileNames
+} from '../shared-utils/loaders.js'
 
-const loaderFileNames = constructLoaderFileNames(args.loaderVersion)
-const fuzzyVersions = constructFuzzyVersions(args.loaderVersion)
+const loaderVersion = args.loaderVersion
+const loaderFileNames = constructLoaderFileNames(loaderVersion)
 const envOptions = {
   stage: {
     url: 'https://staging-api.newrelic.com/v2/js_agent_loaders/create.json',
@@ -24,58 +25,31 @@ const envOptions = {
   }
 }
 
-// Read loader contents from local directory or fetch from CDN
 const loaderFileContents = (await Promise.all(
   loaderFileNames.map(async loaderFileName => {
-    let fileContents
-
-    if (args.localDir) {
-      // Read from local build directory
-      const filePath = join(args.localDir, loaderFileName)
-      console.log(`Reading ${loaderFileName} from ${filePath}`)
-      try {
-        fileContents = await readFile(filePath, 'utf-8')
-      } catch (error) {
-        throw new Error(`Failed to read local file ${filePath}: ${error.message}`)
-      }
-    } else {
-      // Fetch from CDN
-      const fileContentsRequest = await fetchRetry(`https://js-agent.newrelic.com/${loaderFileName}?_nocache=${uuidv4()}`, { retry: 3 })
-
-      if (!fileContentsRequest.ok) {
-        throw new Error(`Download for loader ${loaderFileName} failed.`)
-      }
+    const fileContentsRequest = await fetchRetry(`https://js-agent.newrelic.com/${loaderFileName}?_nocache=${uuidv4()}`, { retry: 3 })
 
-      fileContents = await fileContentsRequest.text()
+    if (!fileContentsRequest.ok) {
+      throw new Error(`Download for loader ${loaderFileName} failed.`)
     }
 
-    return [loaderFileName, fileContents]
+    return [loaderFileName, await fileContentsRequest.text()]
   })
 )).reduce((aggregator, [loaderFileName, fileContents]) => {
   aggregator[loaderFileName] = fileContents
   return aggregator
 }, {})
 
 const uploadJobs = args.environment.map(env => {
-  return Object.entries(loaderFileContents).map(([loaderFileName, loaderFileContent]) => {
-    return [
-      {
-        env,
-        loaderFileName,
-        loaderFileContent
-      },
-      {
-        env,
-        loaderFileName: loaderFileName.replace(args.loaderVersion, fuzzyVersions.PATCH),
-        loaderFileContent
-      },
-      {
-        env,
-        loaderFileName: loaderFileName.replace(args.loaderVersion, fuzzyVersions.MINOR),
-        loaderFileContent
-      }
-    ]
-  }).flat()
+  return Object.entries(loaderFileContents).flatMap(([loaderFileName, loaderFileContent]) => {
+    const uploadLoaderFileNames = expandLoaderFileNames([loaderFileName], loaderVersion)
+
+    return uploadLoaderFileNames.map(uploadLoaderFileName => ({
+      env,
+      loaderFileName: uploadLoaderFileName,
+      loaderFileContent
+    }))
+  })
 }).flat()
 
 let jobs = 0, success = true

.github/actions/nr-verify/action.yml

@@ -10,7 +10,6 @@ inputs:
   loader_version:
     description: "Browser Agent version number"
     required: true
-
 runs:
   using: "composite"
   steps:

.github/actions/nr-verify/index.js

@@ -1,9 +1,12 @@
 import { args } from './args.js'
 import { fetchRetry } from '../shared-utils/fetch-retry.js'
-import { constructLoaderFileNames, constructFuzzyVersions } from '../shared-utils/loaders.js'
+import {
+  expandLoaderFileNames,
+  constructLoaderFileNames
+} from '../shared-utils/loaders.js'
 
-const loaderFileNames = constructLoaderFileNames(args.loaderVersion)
-const fuzzyVersions = constructFuzzyVersions(args.loaderVersion)
+const loaderVersion = args.loaderVersion
+const verifyFileNames = expandLoaderFileNames(constructLoaderFileNames(loaderVersion), loaderVersion)
 const envOptions = {
   stage: {
     url: 'https://staging-api.newrelic.com/v2/js_agent_loaders/version.json'
@@ -13,24 +16,12 @@ const envOptions = {
   }
 }
 
-const verifyJobs = args.environment.map(env => {
-  return loaderFileNames.map(loaderFileName => {
-    return [
-      {
-        env,
-        loaderFileName
-      },
-      {
-        env,
-        loaderFileName: loaderFileName.replace(args.loaderVersion, fuzzyVersions.PATCH)
-      },
-      {
-        env,
-        loaderFileName: loaderFileName.replace(args.loaderVersion, fuzzyVersions.MINOR)
-      }
-    ]
-  }).flat()
-}).flat()
+const verifyJobs = args.environment.flatMap(env => {
+  return verifyFileNames.map(loaderFileName => ({
+    env,
+    loaderFileName
+  }))
+})
 
 const results = await Promise.allSettled(
   verifyJobs.map(async jobDetails => {
@@ -51,7 +42,7 @@ const results = await Promise.allSettled(
         console.log(`Verified existence of ${jobDetails.loaderFileName} in ${jobDetails.env} NR environment.`)
         return true
       }
-    } catch(err){
+    } catch (err) {
       console.log(`FAILURE: ${jobDetails.loaderFileName}\n\n`)
       throw new Error(err)
     }
@@ -62,7 +53,7 @@ if (
   results.find(result => result.status === 'rejected') ||
   results.find(result => result.value === false)
 ) {
-  throw new Error(`Not all loaders could be verified in NR.`)
+  throw new Error('Not all loaders could be verified in NR.')
 } else {
   console.log(`Verified ${results.length} loaders in NR`)
   process.exit(0)

.github/actions/shared-utils/loaders.js

@@ -1,6 +1,13 @@
 export const loaderTypes = ['rum', 'full', 'spa']
 
 export function constructLoaderFileNames (loaderVersion) {
+  if (!loaderVersion) {
+    return loaderTypes.map(type => [
+      `nr-loader-${type}.min.js`,
+      `nr-loader-${type}.js`,
+    ]).flat()
+  }
+
   return loaderTypes.map(type => [
     `nr-loader-${type}-${loaderVersion}.min.js`,
     `nr-loader-${type}-${loaderVersion}.js`,
@@ -15,3 +22,17 @@ export function constructFuzzyVersions (loaderVersion) {
     PATCH: `${pieces[0]}.${pieces[1]}.x`
   }
 }
+
+export function expandLoaderFileNames (loaderFileNames, loaderVersion) {
+  if (!loaderVersion) {
+    return loaderFileNames
+  }
+
+  const fuzzyVersions = constructFuzzyVersions(loaderVersion)
+
+  return loaderFileNames.flatMap(loaderFileName => [
+    loaderFileName,
+    loaderFileName.replace(loaderVersion, fuzzyVersions.PATCH),
+    loaderFileName.replace(loaderVersion, fuzzyVersions.MINOR)
+  ])
+}