Skip to content

fix: fix release script to use endpoint url flag instead of env var for aws #2685

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

fix: fix release script to use endpoint url flag instead of env var for aws #2685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions scripts/release/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export async function updateArtifacts(opts: ReleaseOpts) {
Deno.env.get("R2_RELEASES_SECRET_ACCESS_KEY") ??
(await $`op read "op://Engineering/rivet-releases R2 Upload/password"`.text());

const endpointUrl = "https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com";

// Create AWS CLI command builder with credentials
const awsCommand = new CommandBuilder().env({
AWS_ACCESS_KEY_ID: awsAccessKeyId,
AWS_SECRET_ACCESS_KEY: awsSecretAccessKey,
AWS_ENDPOINT_URL:
"https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com",
AWS_DEFAULT_REGION: "auto",
});

Expand All @@ -27,7 +27,7 @@ export async function updateArtifacts(opts: ReleaseOpts) {
$.logStep("Listing Original Files", commitPrefix);
const commitFiles = await awsCommand
.command(
`aws s3api list-objects --bucket rivet-releases --prefix ${commitPrefix}`,
`aws s3api list-objects --bucket rivet-releases --prefix ${commitPrefix} --endpoint-url ${endpointUrl}`,
)
.json();
assert(
Expand All @@ -37,34 +37,35 @@ export async function updateArtifacts(opts: ReleaseOpts) {

// Copy files to version directory
const versionTarget = `rivet/${opts.version}/`;
await copyFiles(awsCommand, commitPrefix, versionTarget);
await generateInstallScripts(awsCommand, opts, opts.version);
await copyFiles(awsCommand, commitPrefix, versionTarget, endpointUrl);
await generateInstallScripts(awsCommand, opts, opts.version, endpointUrl);

// If this is the latest version, copy to latest directory
if (opts.latest) {
await copyFiles(awsCommand, commitPrefix, "rivet/latest/");
await generateInstallScripts(awsCommand, opts, "latest");
await copyFiles(awsCommand, commitPrefix, "rivet/latest/", endpointUrl);
await generateInstallScripts(awsCommand, opts, "latest", endpointUrl);
}
}

async function copyFiles(
awsCommand: CommandBuilder,
sourcePrefix: string,
targetPrefix: string,
endpointUrl: string,
) {
$.logStep("Copying Files", targetPrefix);
await $.logGroup(async () => {
// Delete existing files in target directory using --recursive
$.logStep("Deleting existing files in", targetPrefix);
await awsCommand
.command(`aws s3 rm s3://rivet-releases/${targetPrefix} --recursive`)
.command(`aws s3 rm s3://rivet-releases/${targetPrefix} --recursive --endpoint-url ${endpointUrl}`)
.spawn();

// Copy new files using --recursive
$.logStep("Copying files from", sourcePrefix, "to", targetPrefix);
await awsCommand
.command(
`aws s3 cp s3://rivet-releases/${sourcePrefix} s3://rivet-releases/${targetPrefix} --recursive --copy-props none`,
`aws s3 cp s3://rivet-releases/${sourcePrefix} s3://rivet-releases/${targetPrefix} --recursive --copy-props none --endpoint-url ${endpointUrl}`,
)
.spawn();
});
Expand All @@ -74,6 +75,7 @@ async function generateInstallScripts(
awsCommand: CommandBuilder,
opts: ReleaseOpts,
version: string,
endpointUrl: string,
) {
const installScriptPaths = [
resolve(opts.root, "scripts/release/static/install.sh"),
Expand All @@ -89,7 +91,7 @@ async function generateInstallScripts(
// Upload the install script to S3
$.logStep("Uploading Install Script", uploadKey);
await awsCommand
.command(`aws s3 cp - s3://rivet-releases/${uploadKey}`)
.command(`aws s3 cp - s3://rivet-releases/${uploadKey} --endpoint-url ${endpointUrl}`)
.stdinText(scriptContent)
.spawn();
}
Expand Down
Loading