Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,18 @@ functions:
content_type: application/x-gzip

publish:
- command: ec2.assume_role
params:
role_arn: "arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass"
- command: shell.exec
params:
working_dir: src
shell: bash
env:
<<: *compass-env
DOWNLOAD_CENTER_NEW_AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
DOWNLOAD_CENTER_NEW_AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
DOWNLOAD_CENTER_NEW_AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
script: |
set -e
# Load environment variables
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/hadron-build/commands/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const {
getKeyPrefix,
downloadManifest,
uploadAsset,
uploadAssetNew,
uploadManifest,
} = require('../lib/download-center');

Expand Down Expand Up @@ -235,6 +236,7 @@ async function uploadAssetsToDownloadCenter(assets, channel, dryRun) {
);
if (!dryRun) {
await uploadAsset(channel, asset);
await uploadAssetNew(channel, asset);
}
cli.info(`${asset.name}: upload to download center completed.`);
});
Expand Down
23 changes: 23 additions & 0 deletions packages/hadron-build/lib/download-center.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const { DownloadCenter } = require('@mongodb-js/dl-center');
const download = require('download');

const DOWNLOADS_BUCKET = 'downloads.10gen.com';
const DOWNLOADS_BUCKET_NEW = 'cdn-origin-compass';
const MANIFEST_BUCKET = 'info-mongodb-com';
const MANIFEST_OBJECT_KEY = 'com-download-center/compass.json';

Expand All @@ -32,10 +33,31 @@ const getDownloadCenter = (bucketConfig) => {
});
};

const getDownloadCenterNew = (bucketConfig) => {
requireEnvironmentVariables([
'DOWNLOAD_CENTER_NEW_AWS_ACCESS_KEY_ID',
'DOWNLOAD_CENTER_NEW_AWS_SECRET_ACCESS_KEY',
'DOWNLOAD_CENTER_NEW_AWS_SESSION_TOKEN',
]);

return new DownloadCenter({
...bucketConfig,
accessKeyId: process.env.DOWNLOAD_CENTER_NEW_AWS_ACCESS_KEY_ID,
secretAccessKey: process.env.DOWNLOAD_CENTER_NEW_AWS_SECRET_ACCESS_KEY,
sessionToken: process.env.DOWNLOAD_CENTER_NEW_AWS_SESSION_TOKEN,
});
};

const getKeyPrefix = (channel) => {
return channel && channel !== 'stable' ? `compass/${channel}` : 'compass';
};

const uploadAssetNew = async (channel, asset) => {
const dlCenterNew = getDownloadCenterNew({ bucket: DOWNLOADS_BUCKET_NEW });
const objectKey = `${getKeyPrefix(channel)}/${asset.name}`;
return dlCenterNew.uploadAsset(objectKey, fs.createReadStream(asset.path));
};

const uploadAsset = async (channel, asset) => {
const dlCenter = getDownloadCenter({ bucket: DOWNLOADS_BUCKET });
const objectKey = `${getKeyPrefix(channel)}/${asset.name}`;
Expand Down Expand Up @@ -75,6 +97,7 @@ module.exports = {
getDownloadCenter,
getKeyPrefix,
uploadAsset,
uploadAssetNew,
downloadManifest,
uploadManifest,
downloadAssetFromEvergreen,
Expand Down
2 changes: 1 addition & 1 deletion packages/hadron-build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@electron/rebuild": "^3.7.1",
"@mongodb-js/devtools-github-repo": "^1.4.1",
"@mongodb-js/dl-center": "^1.1.7",
"@mongodb-js/dl-center": "^1.2.0",
"@mongodb-js/electron-wix-msi": "^3.0.0",
"@mongodb-js/signing-utils": "^0.3.8",
"@npmcli/arborist": "^6.2.0",
Expand Down
Loading