♻️[RUMF-1500] tweak deployment scripts

.gitlab-ci.yml

@@ -252,8 +252,8 @@ deploy-staging:
     - export BUILD_MODE=canary
     - yarn
     - yarn build:bundle
-    - ./scripts/deploy.sh staging staging
-    - node ./scripts/upload-source-maps.js datad0g.com,datadoghq.com staging
+    - node ./scripts/deploy.js staging staging
+    - node ./scripts/upload-source-maps.js staging
 
 deploy-prod-canary:
   stage: deploy:canary
@@ -264,8 +264,8 @@ deploy-prod-canary:
     - export BUILD_MODE=canary
     - yarn
     - yarn build:bundle
-    - ./scripts/deploy.sh prod canary
-    - node ./scripts/upload-source-maps.js datadoghq.com canary
+    - node ./scripts/deploy.js prod canary
+    - node ./scripts/upload-source-maps.js canary
 
 deploy-prod-stable:
   stage: deploy
@@ -279,8 +279,8 @@ deploy-prod-stable:
     - VERSION=$(node -p -e "require('./lerna.json').version")
     - yarn
     - yarn build:bundle
-    - ./scripts/deploy.sh prod v${VERSION%%.*}
-    - node ./scripts/upload-source-maps.js datadoghq.com,datadoghq.eu,us3.datadoghq.com,us5.datadoghq.com,ap1.datadoghq.com v${VERSION%%.*}
+    - node ./scripts/deploy.js prod v${VERSION%%.*}
+    - node ./scripts/upload-source-maps.js v${VERSION%%.*}
 
 publish-npm:
   stage: deploy

scripts/deploy.js

@@ -0,0 +1,74 @@
+'use strict'
+
+const { printLog, command, runMain } = require('./utils')
+
+const ONE_MINUTE_IN_SECOND = 60
+const ONE_HOUR_IN_SECOND = 60 * ONE_MINUTE_IN_SECOND
+const AWS_CONFIG = {
+  prod: {
+    accountId: 464622532012,
+    bucketName: 'browser-agent-artifacts-prod',
+    distributionId: 'EGB08BYCT1DD9',
+  },
+  staging: {
+    accountId: 727006795293,
+    bucketName: 'browser-agent-artifacts-staging',
+    distributionId: 'E2FP11ZSCFD3EU',
+  },
+}
+/**
+ * Deploy SDK files to CDN
+ * Usage:
+ * node deploy.js staging|prod staging|canary|vXXX
+ */
+const env = process.argv[2]
+const version = process.argv[3]
+
+const browserCache = version === 'staging' || version === 'canary' ? 15 * ONE_MINUTE_IN_SECOND : 4 * ONE_HOUR_IN_SECOND
+const cacheControl = `max-age=${browserCache}, s-maxage=60`
+
+const bundles = {
+  'packages/rum/bundle/datadog-rum.js': `datadog-rum-${version}.js`,
+  'packages/rum-slim/bundle/datadog-rum-slim.js': `datadog-rum-slim-${version}.js`,
+  'packages/logs/bundle/datadog-logs.js': `datadog-logs-${version}.js`,
+}
+
+function generateEnvironmentForRole(awsAccountId, roleName) {
+  const rawCredentials = command`
+  aws sts assume-role 
+    --role-arn arn:aws:iam::${awsAccountId}:role/${roleName} 
+    --role-session-name AWSCLI-Session`.run()
+  const credentials = JSON.parse(rawCredentials)['Credentials']
+  return {
+    AWS_ACCESS_KEY_ID: credentials['AccessKeyId'],
+    AWS_SECRET_ACCESS_KEY: credentials['SecretAccessKey'],
+    AWS_SESSION_TOKEN: credentials['SessionToken'],
+  }
+}
+
+function uploadToS3(awsConfig) {
+  const accessToS3 = generateEnvironmentForRole(awsConfig.accountId, 'build-stable-browser-agent-artifacts-s3-write')
+  for (const [filePath, bundleName] of Object.entries(bundles)) {
+    printLog(`Upload ${filePath} to s3://${awsConfig.bucketName}/${bundleName}`)
+    command`
+    aws s3 cp --cache-control ${cacheControl} ${filePath} s3://${awsConfig.bucketName}/${bundleName}`
+      .withEnvironment(accessToS3)
+      .run()
+  }
+}
+
+function invalidateCloudfront(awsConfig) {
+  const accessToCloudfront = generateEnvironmentForRole(awsConfig.accountId, 'build-stable-cloudfront-invalidation')
+  const pathsToInvalidate = Object.values(bundles).map((path) => `/${path}`)
+
+  printLog(`Trigger invalidation on ${awsConfig.distributionId} for: ${pathsToInvalidate.join(', ')}`)
+  command`
+    aws cloudfront create-invalidation --distribution-id ${awsConfig.distributionId} --paths ${pathsToInvalidate}`
+    .withEnvironment(accessToCloudfront)
+    .run()
+}
+
+runMain(() => {
+  uploadToS3(AWS_CONFIG[env])
+  invalidateCloudfront(AWS_CONFIG[env])
+})

scripts/upload-source-maps.js

@@ -6,25 +6,29 @@ const { SDK_VERSION } = require('./build-env')
 /**
  * Upload source maps to datadog
  * Usage:
- * BUILD_MODE=canary|release node upload-source-maps.js site1,site2,... staging|canary|vXXX
+ * BUILD_MODE=canary|release node upload-source-maps.js staging|canary|vXXX
  */
 
-const sites = process.argv[2].split(',')
-const suffix = process.argv[3]
+const version = process.argv[2]
 const packages = [
   { name: 'logs', service: 'browser-logs-sdk' },
   { name: 'rum', service: 'browser-rum-sdk' },
   { name: 'rum-slim', service: 'browser-rum-sdk' },
 ]
+const sitesByVersion = {
+  staging: ['datad0g.com', 'datadoghq.com'],
+  canary: ['datadoghq.com'],
+  v4: ['datadoghq.com', 'datadoghq.eu', 'us3.datadoghq.com', 'us5.datadoghq.com', 'ap1.datadoghq.com'],
+}
 
-function renameFiles(bundleFolder, packageName) {
+function renameFilesWithVersionSuffix(bundleFolder, packageName) {
   // The datadog-ci CLI is taking a directory as an argument. It will scan every source map files in
   // it and upload those along with the minified bundle. The file names must match the one from the
   // CDN, thus we need to rename the bundles with the right suffix.
   for (const ext of ['js', 'js.map']) {
-    const filePath = `${bundleFolder}/datadog-${packageName}.${ext}`
-    const suffixedFilePath = `${bundleFolder}/datadog-${packageName}-${suffix}.${ext}`
-    command`mv ${filePath} ${suffixedFilePath}`.run()
+    const sourceFilePath = `${bundleFolder}/datadog-${packageName}.${ext}`
+    const targetFilePath = `${bundleFolder}/datadog-${packageName}-${version}.${ext}`
+    command`mv ${sourceFilePath} ${targetFilePath}`.run()
   }
 }
 
@@ -49,8 +53,8 @@ function uploadSourceMaps(site, apiKey, packageName, service, bundleFolder) {
 runMain(() => {
   for (const { name, service } of packages) {
     const bundleFolder = `packages/${name}/bundle`
-    renameFiles(bundleFolder, name)
-    for (const site of sites) {
+    renameFilesWithVersionSuffix(bundleFolder, name)
+    for (const site of sitesByVersion[version]) {
       const normalizedSite = site.replaceAll('.', '-')
       const apiKey = getSecretKey(`ci.browser-sdk.source-maps.${normalizedSite}.ci_api_key`)
 

scripts/utils.js

@@ -164,6 +164,11 @@ function command(...templateArguments) {
  *
  * parseCommandTemplateArguments`foo ${'bar baz'}` == ['foo', 'bar baz']
  *
+ * To pass template variables as different command arguments use an array as template argument:
+ *
+ * parseCommandTemplateArguments`foo ${['bar', 'baz']}` == ['foo', 'bar', 'baz']
+ *
+ *
  * const commitMessage = 'my commit message'
  * parseCommandTemplateArguments`git commit -c ${commitMessage}` == ['git', 'commit', '-c', 'my commit message']
  *
@@ -175,8 +180,13 @@ function parseCommandTemplateArguments(templateStrings, ...templateVariables) {
     if (i > 0) {
       // Interleave variables with template strings
       if (!parsedArguments.length || templateStrings[i - 1].match(/\s$/)) {
-        // If the latest string ends with a space, consider the variable as a separate argument
-        parsedArguments.push(templateVariables[i - 1])
+        // If the latest string ends with a space, consider the variable as separate argument(s)
+        const variable = templateVariables[i - 1]
+        if (Array.isArray(variable)) {
+          parsedArguments.push(...variable)
+        } else {
+          parsedArguments.push(variable)
+        }
       } else {
         // Else, append the variable to the latest argument
         parsedArguments[parsedArguments.length - 1] += templateVariables[i - 1]