Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions scripts/deploy/deploy.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,17 @@ void describe('deploy', () => {
'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',
env,
},
// Flagging bundle
{
command:
'aws s3 cp --cache-control max-age=14400, s-maxage=60 packages/flagging/bundle/datadog-flagging.js s3://browser-agent-artifacts-prod/datadog-flagging-v6.js',
env,
},
])

assert.deepEqual(getCloudfrontCommands(), [
{
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-v6.js,/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-v6.js,/datadog-rum-slim-v6.js`,
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /datadog-logs-v6.js,/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-v6.js,/datadog-rum-slim-v6.js,/datadog-flagging-v6.js`,
env,
},
])
Expand Down Expand Up @@ -110,10 +116,15 @@ void describe('deploy', () => {
'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',
env,
},
{
command:
'aws s3 cp --cache-control max-age=14400, s-maxage=60 packages/flagging/bundle/datadog-flagging.js s3://browser-agent-artifacts-prod/us1/v6/datadog-flagging.js',
env,
},
])
assert.deepEqual(getCloudfrontCommands(), [
{
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /us1/v6/datadog-logs.js,/us1/v6/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/datadog-rum.js,/us1/v6/datadog-rum-slim.js`,
command: `aws cloudfront create-invalidation --distribution-id EGB08BYCT1DD9 --paths /us1/v6/datadog-logs.js,/us1/v6/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/us1/v6/datadog-rum.js,/us1/v6/datadog-rum-slim.js,/us1/v6/datadog-flagging.js`,
env,
},
])
Expand Down Expand Up @@ -147,11 +158,16 @@ void describe('deploy', () => {
'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',
env,
},
{
command:
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/flagging/bundle/datadog-flagging.js s3://browser-agent-artifacts-staging/datadog-flagging-staging.js',
env,
},
])

assert.deepEqual(getCloudfrontCommands(), [
{
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /datadog-logs-staging.js,/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-staging.js,/datadog-rum-slim-staging.js`,
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /datadog-logs-staging.js,/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/datadog-rum-staging.js,/datadog-rum-slim-staging.js,/datadog-flagging-staging.js`,
env,
},
])
Expand Down Expand Up @@ -188,11 +204,16 @@ void describe('deploy', () => {
'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',
env,
},
{
command:
'aws s3 cp --cache-control max-age=900, s-maxage=60 packages/flagging/bundle/datadog-flagging.js s3://browser-agent-artifacts-staging/pull-request/123/datadog-flagging.js',
env,
},
])

assert.deepEqual(getCloudfrontCommands(), [
{
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /pull-request/123/datadog-logs.js,/pull-request/123/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/datadog-rum.js,/pull-request/123/datadog-rum-slim.js`,
command: `aws cloudfront create-invalidation --distribution-id E2FP11ZSCFD3EU --paths /pull-request/123/datadog-logs.js,/pull-request/123/chunks/profiler-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/chunks/recorder-${FAKE_CHUNK_HASH}-datadog-rum.js,/pull-request/123/datadog-rum.js,/pull-request/123/datadog-rum-slim.js,/pull-request/123/datadog-flagging.js`,
env,
},
])
Expand Down
1 change: 1 addition & 0 deletions scripts/deploy/lib/deploymentUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const packages = [
{ packageName: 'logs', service: 'browser-logs-sdk' },
{ packageName: 'rum', service: 'browser-rum-sdk' },
{ packageName: 'rum-slim', service: 'browser-rum-sdk' },
{ packageName: 'flagging', service: 'browser-flagging-sdk' },
]

// ex: datadog-rum-v4.js, chunks/recorder-8d8a8dfab6958424038f-datadog-rum.js
Expand Down
46 changes: 46 additions & 0 deletions scripts/deploy/upload-source-maps.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ void describe('upload-source-maps', () => {
command:
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-v6.js.map',
},
{
command: 'mv packages/flagging/bundle/datadog-flagging.js packages/flagging/bundle/datadog-flagging-v6.js',
},
{
command:
'mv packages/flagging/bundle/datadog-flagging.js.map packages/flagging/bundle/datadog-flagging-v6.js.map',
},
])

// no telemetry org yet
Expand All @@ -98,6 +105,11 @@ void describe('upload-source-maps', () => {
'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',
env,
},
{
command:
'datadog-ci sourcemaps upload packages/flagging/bundle --service browser-flagging-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-flagging/ --repository-url https://www.github.com/datadog/browser-sdk',
env,
},
])
})
})
Expand All @@ -121,6 +133,11 @@ void describe('upload-source-maps', () => {
'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',
env: ENV_PROD,
},
{
command:
'datadog-ci sourcemaps upload packages/flagging/bundle --service browser-flagging-sdk --release-version dev --minified-path-prefix /us1/v6 --project-path @datadog/browser-flagging/ --repository-url https://www.github.com/datadog/browser-sdk',
env: ENV_PROD,
},
])
})

Expand Down Expand Up @@ -148,6 +165,13 @@ void describe('upload-source-maps', () => {
command:
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-staging.js.map',
},
{
command: 'mv packages/flagging/bundle/datadog-flagging.js packages/flagging/bundle/datadog-flagging-staging.js',
},
{
command:
'mv packages/flagging/bundle/datadog-flagging.js.map packages/flagging/bundle/datadog-flagging-staging.js.map',
},
])

// upload the source maps
Expand Down Expand Up @@ -182,6 +206,16 @@ void describe('upload-source-maps', () => {
'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',
env: ENV_PROD,
},
{
command:
'datadog-ci sourcemaps upload packages/flagging/bundle --service browser-flagging-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-flagging/ --repository-url https://www.github.com/datadog/browser-sdk',
env: ENV_STAGING,
},
{
command:
'datadog-ci sourcemaps upload packages/flagging/bundle --service browser-flagging-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-flagging/ --repository-url https://www.github.com/datadog/browser-sdk',
env: ENV_PROD,
},
])
})

Expand Down Expand Up @@ -209,6 +243,13 @@ void describe('upload-source-maps', () => {
command:
'mv packages/rum-slim/bundle/datadog-rum-slim.js.map packages/rum-slim/bundle/datadog-rum-slim-canary.js.map',
},
{
command: 'mv packages/flagging/bundle/datadog-flagging.js packages/flagging/bundle/datadog-flagging-canary.js',
},
{
command:
'mv packages/flagging/bundle/datadog-flagging.js.map packages/flagging/bundle/datadog-flagging-canary.js.map',
},
])

// upload the source maps
Expand All @@ -228,6 +269,11 @@ void describe('upload-source-maps', () => {
'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',
env: ENV_PROD,
},
{
command:
'datadog-ci sourcemaps upload packages/flagging/bundle --service browser-flagging-sdk --release-version dev --minified-path-prefix / --project-path @datadog/browser-flagging/ --repository-url https://www.github.com/datadog/browser-sdk',
env: ENV_PROD,
},
])
})
})