Skip to content

Commit 120ddfd

Browse files
watsonwatson
committed
👷 Add debugger bundle to deploy scripts
1 parent 4839750 commit 120ddfd

4 files changed

Lines changed: 127 additions & 7 deletions

File tree

‎scripts/deploy/deploy.spec.ts‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,16 @@ describe('deploy', () => {
7777
'aws s3 cp --cache-control max-age=14400, s-maxage=60 packages/rum-slim/bundle/datadog-rum-slim.js s3://browser-agent-artifacts-prod/datadog-rum-slim-v6.js',
7878
env,
7979
},
80+
{
81+
command:
82+
'aws s3 cp --cache-control max-age=14400, s-maxage=60 packages/debugger/bundle/datadog-debugger.js s3://browser-agent-artifacts-prod/datadog-debugger-v6.js',
83+
env,
84+
},
8085
])
8186

8287
assert.deepEqual(getCloudfrontCommands(), [
8388
{
84-
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-v6.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-v6.js,/datadog-rum-slim-v6.js`,
89+
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-v6.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-v6.js,/datadog-rum-slim-v6.js,/datadog-debugger-v6.js`,
8590
env,
8691
},
8792
])
@@ -115,10 +120,15 @@ describe('deploy', () => {
115120
'aws s3 cp --cache-control max-age=14400, s-maxage=60 packages/rum-slim/bundle/datadog-rum-slim.js s3://browser-agent-artifacts-prod/us1/v6/datadog-rum-slim.js',
116121
env,
117122
},
123+
{
124+
command:
125+
'aws s3 cp --cache-control max-age=14400, s-maxage=60 packages/debugger/bundle/datadog-debugger.js s3://browser-agent-artifacts-prod/us1/v6/datadog-debugger.js',
126+
env,
127+
},
118128
])
119129
assert.deepEqual(getCloudfrontCommands(), [
120130
{
121-
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /us1/v6/datadog-logs.js,/us1/v6/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/datadog-rum.js,/us1/v6/datadog-rum-slim.js`,
131+
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /us1/v6/datadog-logs.js,/us1/v6/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/datadog-rum.js,/us1/v6/datadog-rum-slim.js,/us1/v6/datadog-debugger.js`,
122132
env,
123133
},
124134
])
@@ -152,11 +162,16 @@ describe('deploy', () => {
152162
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/rum-slim/bundle/datadog-rum-slim.js s3://browser-agent-artifacts-staging/datadog-rum-slim-staging.js',
153163
env,
154164
},
165+
{
166+
command:
167+
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/debugger/bundle/datadog-debugger.js s3://browser-agent-artifacts-staging/datadog-debugger-staging.js',
168+
env,
169+
},
155170
])
156171

157172
assert.deepEqual(getCloudfrontCommands(), [
158173
{
159-
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /datadog-logs-staging.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-staging.js,/datadog-rum-slim-staging.js`,
174+
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /datadog-logs-staging.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-staging.js,/datadog-rum-slim-staging.js,/datadog-debugger-staging.js`,
160175
env,
161176
},
162177
])
@@ -189,11 +204,16 @@ describe('deploy', () => {
189204
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/rum-slim/bundle/datadog-rum-slim.js s3://browser-agent-artifacts-prod/datadog-rum-slim-canary.js',
190205
env,
191206
},
207+
{
208+
command:
209+
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/debugger/bundle/datadog-debugger.js s3://browser-agent-artifacts-prod/datadog-debugger-canary.js',
210+
env,
211+
},
192212
])
193213

194214
assert.deepEqual(getCloudfrontCommands(), [
195215
{
196-
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-canary.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-canary.js,/datadog-rum-slim-canary.js`,
216+
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-canary.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-canary.js,/datadog-rum-slim-canary.js,/datadog-debugger-canary.js`,
197217
env,
198218
},
199219
])
@@ -226,11 +246,16 @@ describe('deploy', () => {
226246
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/rum-slim/bundle/datadog-rum-slim.js s3://browser-agent-artifacts-prod/datadog-rum-slim-v7-canary.js',
227247
env,
228248
},
249+
{
250+
command:
251+
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/debugger/bundle/datadog-debugger.js s3://browser-agent-artifacts-prod/datadog-debugger-v7-canary.js',
252+
env,
253+
},
229254
])
230255

231256
assert.deepEqual(getCloudfrontCommands(), [
232257
{
233-
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-v7-canary.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-v7-canary.js,/datadog-rum-slim-v7-canary.js`,
258+
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-v7-canary.js,/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-v7-canary.js,/datadog-rum-slim-v7-canary.js,/datadog-debugger-v7-canary.js`,
234259
env,
235260
},
236261
])
@@ -267,11 +292,16 @@ describe('deploy', () => {
267292
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/rum-slim/bundle/datadog-rum-slim.js s3://browser-agent-artifacts-staging/pull-request/123/datadog-rum-slim.js',
268293
env,
269294
},
295+
{
296+
command:
297+
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/debugger/bundle/datadog-debugger.js s3://browser-agent-artifacts-staging/pull-request/123/datadog-debugger.js',
298+
env,
299+
},
270300
])
271301

272302
assert.deepEqual(getCloudfrontCommands(), [
273303
{
274-
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /pull-request/123/datadog-logs.js,/pull-request/123/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/datadog-rum.js,/pull-request/123/datadog-rum-slim.js`,
304+
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /pull-request/123/datadog-logs.js,/pull-request/123/chunks/datadogProfiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/chunks/datadogRecorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/datadog-rum.js,/pull-request/123/datadog-rum-slim.js,/pull-request/123/datadog-debugger.js`,
275305
env,
276306
},
277307
])

‎scripts/deploy/lib/deploymentUtils.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const packages: Package[] = [
77
{ packageName: 'logs', service: 'browser-logs-sdk' },
88
{ packageName: 'rum', service: 'browser-rum-sdk' },
99
{ packageName: 'rum-slim', service: 'browser-rum-sdk' },
10+
{ packageName: 'debugger', service: 'browser-debugger-sdk' },
1011
]
1112

1213
// ex: datadog-rum-v4.js, chunks/datadogRecorder-8d8a8dfab6958424038f-datadog-rum.js

‎scripts/deploy/upload-source-maps.spec.ts‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ describe('upload-source-maps', () => {
112112
command:
113113
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-v6.js.map',
114114
},
115+
{
116+
command: 'mv packages/debugger/bundle/datadog-debugger.js packages/debugger/bundle/datadog-debugger-v6.js',
117+
},
118+
{
119+
command:
120+
'mv packages/debugger/bundle/datadog-debugger.js.map packages/debugger/bundle/datadog-debugger-v6.js.map',
121+
},
115122
])
116123

117124
// upload the source maps
@@ -131,6 +138,11 @@ describe('upload-source-maps', () => {
131138
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
132139
env,
133140
},
141+
{
142+
command:
143+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
144+
env,
145+
},
134146
])
135147
})
136148

@@ -151,6 +163,11 @@ describe('upload-source-maps', () => {
151163
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
152164
env: ENV_ORG2_PROD,
153165
},
166+
{
167+
command:
168+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
169+
env: ENV_ORG2_PROD,
170+
},
154171
])
155172
})
156173

@@ -173,6 +190,11 @@ describe('upload-source-maps', () => {
173190
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix /us1/v6 --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
174191
env: ENV_PROD,
175192
},
193+
{
194+
command:
195+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix /us1/v6 --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
196+
env: ENV_PROD,
197+
},
176198
])
177199

178200
assert.deepEqual(getOrg2SourceMapCommands(), [
@@ -191,6 +213,11 @@ describe('upload-source-maps', () => {
191213
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net/us1/v6 --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
192214
env: ENV_ORG2_PROD,
193215
},
216+
{
217+
command:
218+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net/us1/v6 --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
219+
env: ENV_ORG2_PROD,
220+
},
194221
])
195222
})
196223

@@ -218,6 +245,13 @@ describe('upload-source-maps', () => {
218245
command:
219246
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-staging.js.map',
220247
},
248+
{
249+
command: 'mv packages/debugger/bundle/datadog-debugger.js packages/debugger/bundle/datadog-debugger-staging.js',
250+
},
251+
{
252+
command:
253+
'mv packages/debugger/bundle/datadog-debugger.js.map packages/debugger/bundle/datadog-debugger-staging.js.map',
254+
},
221255
])
222256

223257
// upload the source maps
@@ -252,6 +286,16 @@ describe('upload-source-maps', () => {
252286
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
253287
env: ENV_PROD,
254288
},
289+
{
290+
command:
291+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
292+
env: ENV_STAGING,
293+
},
294+
{
295+
command:
296+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
297+
env: ENV_PROD,
298+
},
255299
])
256300

257301
assert.deepEqual(getOrg2SourceMapCommands(), [
@@ -270,6 +314,11 @@ describe('upload-source-maps', () => {
270314
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
271315
env: ENV_ORG2_PROD,
272316
},
317+
{
318+
command:
319+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
320+
env: ENV_ORG2_PROD,
321+
},
273322
])
274323
})
275324

@@ -297,6 +346,13 @@ describe('upload-source-maps', () => {
297346
command:
298347
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-canary.js.map',
299348
},
349+
{
350+
command: 'mv packages/debugger/bundle/datadog-debugger.js packages/debugger/bundle/datadog-debugger-canary.js',
351+
},
352+
{
353+
command:
354+
'mv packages/debugger/bundle/datadog-debugger.js.map packages/debugger/bundle/datadog-debugger-canary.js.map',
355+
},
300356
])
301357

302358
// upload the source maps only to datadoghq.com
@@ -316,6 +372,11 @@ describe('upload-source-maps', () => {
316372
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
317373
env: ENV_PROD,
318374
},
375+
{
376+
command:
377+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
378+
env: ENV_PROD,
379+
},
319380
])
320381

321382
assert.deepEqual(getOrg2SourceMapCommands(), [
@@ -334,6 +395,11 @@ describe('upload-source-maps', () => {
334395
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
335396
env: ENV_ORG2_PROD,
336397
},
398+
{
399+
command:
400+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
401+
env: ENV_ORG2_PROD,
402+
},
337403
])
338404
})
339405

@@ -362,6 +428,14 @@ describe('upload-source-maps', () => {
362428
command:
363429
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-v7-canary.js.map',
364430
},
431+
{
432+
command:
433+
'mv packages/debugger/bundle/datadog-debugger.js packages/debugger/bundle/datadog-debugger-v7-canary.js',
434+
},
435+
{
436+
command:
437+
'mv packages/debugger/bundle/datadog-debugger.js.map packages/debugger/bundle/datadog-debugger-v7-canary.js.map',
438+
},
365439
])
366440

367441
// upload the source maps only to datadoghq.com (same as plain 'canary')
@@ -381,6 +455,11 @@ describe('upload-source-maps', () => {
381455
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
382456
env: ENV_PROD,
383457
},
458+
{
459+
command:
460+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
461+
env: ENV_PROD,
462+
},
384463
])
385464

386465
assert.deepEqual(getOrg2SourceMapCommands(), [
@@ -399,6 +478,11 @@ describe('upload-source-maps', () => {
399478
'datadog-ci sourcemaps upload packages/rum-slim/bundle --service browser-rum-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-rum-slim/ --repository-url https://www.github.com/datadog/browser-sdk',
400479
env: ENV_ORG2_PROD,
401480
},
481+
{
482+
command:
483+
'datadog-ci sourcemaps upload packages/debugger/bundle --service browser-debugger-sdk --release-version dev --minified-path-prefix https://d20xtzwzcl0ceb.cloudfront.net --project-path @datadog/browser-debugger/ --repository-url https://www.github.com/datadog/browser-sdk',
484+
env: ENV_ORG2_PROD,
485+
},
402486
])
403487
})
404488
})

‎scripts/deploy/upload-source-maps.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ import { getBuildEnvValue } from '../lib/buildEnv.ts'
55
import { getTelemetryOrgApiKey, getOrg2ApiKey } from '../lib/secrets.ts'
66
import { getAllDatacentersMetadata, getDatacenterMetadata } from '../lib/datacenter.ts'
77
import { forEachFile } from '../lib/filesUtils.ts'
8-
import { buildRootUploadPath, buildDatacenterUploadPath, buildBundleFolder, packages } from './lib/deploymentUtils.ts'
8+
import {
9+
buildRootUploadPath,
10+
buildDatacenterUploadPath,
11+
buildBundleFolder,
12+
packages,
13+
} from './lib/deploymentUtils.ts'
914

1015
/**
1116
* Upload source maps to datadog

0 commit comments

Comments
 (0)