Skip to content

testing #2410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

testing #2410

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
13 changes: 13 additions & 0 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4295,10 +4295,17 @@ functions:
params:
file: tmp/expansions.yaml
redacted: true
- 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:
DOWNLOAD_CENTER_AWS_KEY_NEW: ${AWS_ACCESS_KEY_ID}
DOWNLOAD_CENTER_AWS_SECRET_NEW: ${AWS_SECRET_ACCESS_KEY}
DOWNLOAD_CENTER_AWS_SESSION_TOKEN_NEW: ${AWS_SESSION_TOKEN}
script: |
set -e
{
Expand Down Expand Up @@ -4362,6 +4369,9 @@ functions:
params:
file: tmp/expansions.yaml
redacted: true
- command: ec2.assume_role
params:
role_arn: "arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass"
- command: shell.exec
# silent: true
params:
Expand All @@ -4370,6 +4380,9 @@ functions:
env:
devtoolsbot_npm_token: ${devtoolsbot_npm_token}
node_js_version: ${node_js_version}
DOWNLOAD_CENTER_AWS_KEY_NEW: ${AWS_ACCESS_KEY_ID}
DOWNLOAD_CENTER_AWS_SECRET_NEW: ${AWS_SECRET_ACCESS_KEY}
DOWNLOAD_CENTER_AWS_SESSION_TOKEN_NEW: ${AWS_SESSION_TOKEN}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
Expand Down
34 changes: 23 additions & 11 deletions .github/workflows/update-cta.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Update greeting CTA
on:
pull_request:
branches:
- main
push:
branches:
- main
Expand All @@ -19,6 +22,7 @@ on:
default: CTA-Production

permissions:
id-token: write
contents: read

jobs:
Expand All @@ -33,17 +37,25 @@ jobs:
DOWNLOAD_CENTER_AWS_KEY: ${{ secrets.DOWNLOAD_CENTER_AWS_KEY }}
DOWNLOAD_CENTER_AWS_SECRET: ${{ secrets.DOWNLOAD_CENTER_AWS_SECRET }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
# - uses: actions/checkout@v4
- name: configure aws credentials
uses: aws-actions/[email protected]
with:
node-version: ^20.x
cache: "npm"

- name: Install Dependencies and Compile
role-to-assume: arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass
aws-region: us-east-1
- name: Sts GetCallerIdentity
run: |
npm ci
npm run compile
aws sts get-caller-identity
# - uses: actions/setup-node@v4
# with:
# node-version: ^20.x
# cache: "npm"

- name: Update greeting CTA
run: |
npm run update-cta ${{ github.event.inputs.dry-run && '-- --dry-run' || '' }}
# - name: Install Dependencies and Compile
# run: |
# npm ci
# npm run compile

# - name: Update greeting CTA
# run: |
# npm run update-cta ${{ github.event.inputs.dry-run && '-- --dry-run' || '' }}
3 changes: 3 additions & 0 deletions config/build.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ module.exports = {
evgAwsSecret: process.env.AWS_SECRET,
downloadCenterAwsKey: process.env.DOWNLOAD_CENTER_AWS_KEY,
downloadCenterAwsSecret: process.env.DOWNLOAD_CENTER_AWS_SECRET,
downloadCenterAwsKeyNew: process.env.DOWNLOAD_CENTER_AWS_KEY_NEW,
downloadCenterAwsSecretNew: process.env.DOWNLOAD_CENTER_AWS_SECRET_NEW,
downloadCenterAwsSessionTokenNew: process.env.DOWNLOAD_CENTER_AWS_SESSION_TOKEN_NEW,
injectedJsonFeedFile: path.join(ROOT, 'config', 'mongosh-versions.json'),
githubToken: process.env.GITHUB_TOKEN,
segmentKey: process.env.SEGMENT_API_KEY,
Expand Down
26 changes: 25 additions & 1 deletion packages/build/src/download-center/artifacts.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { DownloadCenter as DownloadCenterCls } from '@mongodb-js/dl-center';
import * as fs from 'fs';
import path from 'path';
import { ARTIFACTS_BUCKET, ARTIFACTS_FOLDER } from './constants';
import {
ARTIFACTS_BUCKET,
ARTIFACTS_BUCKET_NEW,
ARTIFACTS_FOLDER,
} from './constants';

export async function uploadArtifactToDownloadCenter(
filePath: string,
Expand All @@ -20,3 +24,23 @@ export async function uploadArtifactToDownloadCenter(
fs.createReadStream(filePath)
);
}

export async function uploadArtifactToDownloadCenterNew(
filePath: string,
awsAccessKeyId: string,
awsSecretAccessKey: string,
awsSessionToken: string,
DownloadCenter: typeof DownloadCenterCls = DownloadCenterCls
): Promise<void> {
const dlcenter = new DownloadCenter({
bucket: ARTIFACTS_BUCKET_NEW,
accessKeyId: awsAccessKeyId,
secretAccessKey: awsSecretAccessKey,
sessionToken: awsSessionToken,
});

await dlcenter.uploadAsset(
`${ARTIFACTS_FOLDER}/${path.basename(filePath)}`,
fs.createReadStream(filePath)
);
}
30 changes: 30 additions & 0 deletions packages/build/src/download-center/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import type {
} from '@mongodb-js/dl-center/dist/download-center-config';
import {
ARTIFACTS_BUCKET,
ARTIFACTS_BUCKET_NEW,
JSON_FEED_ARTIFACT_KEY,
ARTIFACTS_URL_PUBLIC_BASE,
CONFIGURATION_KEY,
Expand Down Expand Up @@ -55,6 +56,9 @@ export async function createAndPublishDownloadCenterConfig(
packageInformation: PackageInformationProvider,
awsAccessKeyId: string,
awsSecretAccessKey: string,
awsAccessKeyIdNew: string,
awsSecretAccessKeyNew: string,
awsSessionTokenNew: string,
injectedJsonFeedFile: string,
isDryRun: boolean,
ctaConfig: CTAConfig,
Expand Down Expand Up @@ -100,6 +104,13 @@ export async function createAndPublishDownloadCenterConfig(
secretAccessKey: awsSecretAccessKey,
});

const dlcenterArtifactsNew = new DownloadCenter({
bucket: ARTIFACTS_BUCKET_NEW,
accessKeyId: awsAccessKeyIdNew,
secretAccessKey: awsSecretAccessKeyNew,
sessionToken: awsSessionTokenNew,
});

const existingJsonFeed = await getCurrentJsonFeed(dlcenterArtifacts);
const injectedJsonFeed: JsonFeed | undefined = injectedJsonFeedFile
? JSON.parse(await fs.readFile(injectedJsonFeedFile, 'utf8'))
Expand Down Expand Up @@ -135,12 +146,20 @@ export async function createAndPublishDownloadCenterConfig(
JSON.stringify(newJsonFeed, null, 2)
),
]);

await dlcenterArtifactsNew.uploadAsset(
JSON_FEED_ARTIFACT_KEY,
JSON.stringify(newJsonFeed, null, 2)
);
}

export async function updateJsonFeedCTA(
config: CTAConfig,
awsAccessKeyId: string,
awsSecretAccessKey: string,
awsAccessKeyIdNew: string,
awsSecretAccessKeyNew: string,
awsSessionTokenNew: string,
isDryRun: boolean,
DownloadCenter: typeof DownloadCenterCls = DownloadCenterCls
) {
Expand All @@ -150,6 +169,13 @@ export async function updateJsonFeedCTA(
secretAccessKey: awsSecretAccessKey,
});

const dlcenterArtifactsNew = new DownloadCenter({
bucket: ARTIFACTS_BUCKET_NEW,
accessKeyId: awsAccessKeyIdNew,
secretAccessKey: awsSecretAccessKeyNew,
sessionToken: awsSessionTokenNew,
});

const jsonFeed = await getCurrentJsonFeed(dlcenterArtifacts);
if (!jsonFeed) {
throw new Error('No existing JSON feed found');
Expand All @@ -165,6 +191,10 @@ export async function updateJsonFeedCTA(
}

await dlcenterArtifacts.uploadAsset(JSON_FEED_ARTIFACT_KEY, patchedJsonFeed);
await dlcenterArtifactsNew.uploadAsset(
JSON_FEED_ARTIFACT_KEY,
patchedJsonFeed
);
}

function populateJsonFeedCTAs(jsonFeed: JsonFeed, ctas: CTAConfig) {
Expand Down
5 changes: 5 additions & 0 deletions packages/build/src/download-center/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ export const CONFIGURATION_KEY =
*/
export const ARTIFACTS_BUCKET = 'downloads.10gen.com';

/**
* The S3 bucket for download center artifacts.
*/
export const ARTIFACTS_BUCKET_NEW = 'cdn-origin-compass';

/**
* The S3 "folder" for uploaded artifacts.
*/
Expand Down
6 changes: 6 additions & 0 deletions packages/build/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ if (require.main === module) {
ctaConfig,
downloadCenterAwsKey,
downloadCenterAwsSecret,
downloadCenterAwsKeyNew,
downloadCenterAwsSecretNew,
downloadCenterAwsSessionTokenNew,
isDryRun,
} = getBuildConfig();

Expand All @@ -92,6 +95,9 @@ if (require.main === module) {
ctaConfig,
downloadCenterAwsKey,
downloadCenterAwsSecret,
downloadCenterAwsKeyNew,
downloadCenterAwsSecretNew,
downloadCenterAwsSessionTokenNew,
!!isDryRun
);
break;
Expand Down
6 changes: 5 additions & 1 deletion packages/build/src/release.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { Octokit } from '@octokit/rest';
import { runCompile } from './compile';
import type { Config } from './config';
import { getReleaseVersionFromTag, redactConfig } from './config';
import { uploadArtifactToDownloadCenter } from './download-center';
import {
uploadArtifactToDownloadCenter,
uploadArtifactToDownloadCenterNew,
} from './download-center';
import {
downloadArtifactFromEvergreen,
uploadArtifactToEvergreen,
Expand Down Expand Up @@ -95,6 +98,7 @@ export async function release(
githubRepo,
new PackageBumper(),
uploadArtifactToDownloadCenter,
uploadArtifactToDownloadCenterNew,
downloadArtifactFromEvergreen
);
} else if (command === 'download-and-list-artifacts') {
Expand Down
9 changes: 9 additions & 0 deletions packages/build/src/run-draft.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import path from 'path';
import type { Config } from './config';
import { ALL_PACKAGE_VARIANTS, getReleaseVersionFromTag } from './config';
import { uploadArtifactToDownloadCenter as uploadArtifactToDownloadCenterFn } from './download-center';
import { uploadArtifactToDownloadCenterNew as uploadArtifactToDownloadCenterFnNew } from './download-center';
import { downloadArtifactFromEvergreen as downloadArtifactFromEvergreenFn } from './evergreen';
import { generateChangelog as generateChangelogFn } from './git';
import { getPackageFile } from './packaging';
Expand All @@ -14,6 +15,7 @@ export async function runDraft(
githubRepo: GithubRepo,
packageBumper: PackageBumper,
uploadToDownloadCenter: typeof uploadArtifactToDownloadCenterFn = uploadArtifactToDownloadCenterFn,
uploadToDownloadCenterNew: typeof uploadArtifactToDownloadCenterFnNew = uploadArtifactToDownloadCenterFnNew,
downloadArtifactFromEvergreen: typeof downloadArtifactFromEvergreenFn = downloadArtifactFromEvergreenFn,
ensureGithubReleaseExistsAndUpdateChangelog: typeof ensureGithubReleaseExistsAndUpdateChangelogFn = ensureGithubReleaseExistsAndUpdateChangelogFn
): Promise<void> {
Expand Down Expand Up @@ -88,6 +90,13 @@ export async function runDraft(
contentType,
}),
]);

await uploadToDownloadCenterNew(
downloadedArtifact,
config.downloadCenterAwsKeyNew as string,
config.downloadCenterAwsSecretNew as string,
config.downloadCenterAwsSessionTokenNew as string
);
})
);
}
Expand Down
Loading