MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate S3 bucket

This commit is contained in:
Radon Rosborough 2021-03-27 16:27:50 -07:00
parent 0e5fd407b9
commit 67299ce6fe
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -8,7 +8,7 @@ export
BUILD := build/$(T)/$(L) BUILD := build/$(T)/$(L)
DEB := riju-$(T)-$(L).deb DEB := riju-$(T)-$(L).deb
S3_DEBS := s3://$(S3_BUCKET)-debs S3_DEBS := s3://$(S3_BUCKET)
S3_DEB := $(S3_DEBS)/debs/$(DEB) S3_DEB := $(S3_DEBS)/debs/$(DEB)
S3_HASH := $(S3_DEBS)/hashes/riju-$(T)-$(L) S3_HASH := $(S3_DEBS)/hashes/riju-$(T)-$(L)
@ -146,9 +146,9 @@ pkg-deb: # L=<lang> T=<type> [Z=gzip|xz] : Build .deb from packaging environment
@: $${L} $${T} @: $${L} $${T}
fakeroot dpkg-deb --build -Z$(Z) $(BUILD)/pkg $(BUILD)/$(DEB) fakeroot dpkg-deb --build -Z$(Z) $(BUILD)/pkg $(BUILD)/$(DEB)
## This is equivalent to the sequence 'pkg-clean', 'pkg-build', 'pkg-deb'. ## This is equivalent to the sequence 'script', 'pkg-clean', 'pkg-build', 'pkg-deb'.
pkg: pkg-clean pkg-build pkg-deb # L=<lang> T=<type> [Z=gzip|xz] : Build fresh .deb pkg: script pkg-clean pkg-build pkg-deb # L=<lang> T=<type> [Z=gzip|xz] : Build fresh .deb
## This is equivalent to 'make pkg T=lang', 'make pkg T=config'. For ## This is equivalent to 'make pkg T=lang', 'make pkg T=config'. For
## shared dependencies, use 'make pkg T=shared' directly. ## shared dependencies, use 'make pkg T=shared' directly.

20
tf/infra.tf
View File

@ -43,7 +43,7 @@ data "aws_iam_policy_document" "deploy" {
] ]
resources = [ resources = [
"arn:aws:s3:::${aws_s3_bucket.riju_debs.bucket}", "arn:aws:s3:::${aws_s3_bucket.riju.bucket}",
] ]
} }
@ -53,7 +53,7 @@ data "aws_iam_policy_document" "deploy" {
] ]
resources = [ resources = [
"arn:aws:s3:::${aws_s3_bucket.riju_debs.bucket}/*", "arn:aws:s3:::${aws_s3_bucket.riju.bucket}/*",
] ]
} }
} }
@ -69,7 +69,7 @@ resource "aws_iam_user_policy_attachment" "deploy" {
policy_arn = aws_iam_policy.deploy.arn policy_arn = aws_iam_policy.deploy.arn
} }
data "aws_iam_policy_document" "riju_debs" { data "aws_iam_policy_document" "riju" {
statement { statement {
principals { principals {
type = "*" type = "*"
@ -81,7 +81,7 @@ data "aws_iam_policy_document" "riju_debs" {
] ]
resources = [ resources = [
"arn:aws:s3:::${aws_s3_bucket.riju_debs.bucket}", "arn:aws:s3:::${aws_s3_bucket.riju.bucket}",
] ]
} }
@ -96,19 +96,19 @@ data "aws_iam_policy_document" "riju_debs" {
] ]
resources = [ resources = [
"arn:aws:s3:::${aws_s3_bucket.riju_debs.bucket}/*", "arn:aws:s3:::${aws_s3_bucket.riju.bucket}/*",
] ]
} }
} }
resource "aws_s3_bucket" "riju_debs" { resource "aws_s3_bucket" "riju" {
bucket = "${data.external.env.result.S3_BUCKET}-debs" bucket = data.external.env.result.S3_BUCKET
tags = local.tags tags = local.tags
} }
resource "aws_s3_bucket_policy" "riju_debs" { resource "aws_s3_bucket_policy" "riju" {
bucket = aws_s3_bucket.riju_debs.id bucket = aws_s3_bucket.riju.id
policy = data.aws_iam_policy_document.riju_debs.json policy = data.aws_iam_policy_document.riju.json
} }
data "aws_ami" "server" { data "aws_ami" "server" {

4
tools/depgraph.js
View File

@ -37,7 +37,7 @@ function getInformationalDependencies() {
JSON.parse( JSON.parse(
( (
await runCommand( await runCommand(
`aws s3api list-objects-v2 --bucket riju-debs --prefix hashes`, `aws s3api list-objects-v2 --bucket '${getS3Bucket()}' --prefix hashes`,
{ getStdout: true } { getStdout: true }
) )
).stdout || '{"Contents": []}' ).stdout || '{"Contents": []}'
@ -52,7 +52,7 @@ function getInformationalDependencies() {
JSON.parse( JSON.parse(
( (
await runCommand( await runCommand(
`aws s3api list-objects-v2 --bucket riju-debs --prefix test-hashes/lang`, `aws s3api list-objects-v2 --bucket '${getS3Bucket()}' --prefix test-hashes/lang`,
{ getStdout: true } { getStdout: true }
) )
).stdout || '{"Contents": []}' ).stdout || '{"Contents": []}'

4
tools/generate-build-script.js
View File

@ -349,9 +349,7 @@ async function main() {
"package category (lang, config, shared)" "package category (lang, config, shared)"
); );
program.parse(process.argv); program.parse(process.argv);
console.log( console.log(await generateBuildScript(program.opts()));
await generateBuildScript({ lang: program.lang, type: program.type })
);
process.exit(0); process.exit(0);
} }