Skip to content
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

chore: staging to main #322

Merged
merged 19 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
21740b6
fix: adds try/catch for verify
glamperd Jul 5, 2024
ac0f556
Merge tag 'v1.2.4' into better-error-in-func
glamperd Jul 5, 2024
e7dac85
chore: update actions version
glamperd Jul 5, 2024
6f686a5
Merge remote-tracking branch 'origin/dev' into better-error-in-func
glamperd Jul 5, 2024
6178e88
Merge branch 'dev' into better-error-in-func
NicoSerranoP Jul 24, 2024
7b7f1af
Merge pull request #310 from privacy-scaling-explorations/better-erro…
NicoSerranoP Jul 24, 2024
e502145
Merge pull request #312 from privacy-scaling-explorations/staging
NicoSerranoP Jul 24, 2024
f3a7b62
fix tweet url when ceremony name includes spaces
0xturboblitz Aug 13, 2024
9239207
feat: use AWS tag to comply to PSE policies
NicoSerranoP Aug 16, 2024
547aa03
Merge pull request #315 from privacy-scaling-explorations/dev
NicoSerranoP Aug 16, 2024
e22d20d
fix: set tag to AWS instance volume
NicoSerranoP Aug 18, 2024
21824a7
Merge pull request #316 from privacy-scaling-explorations/dev
NicoSerranoP Aug 18, 2024
6905bc6
Merge branch 'dev' into dev
glamperd Aug 19, 2024
f1b446d
Merge pull request #314 from 0xturboblitz/dev
glamperd Aug 19, 2024
efb9e3a
fix: hardcode aws tag to test new policy
NicoSerranoP Aug 22, 2024
ec0a079
Merge branch 'dev' of https://github.com/privacy-scaling-explorations…
NicoSerranoP Aug 22, 2024
7679fe7
fix: do not timeout when completed
ctrlc03 Aug 22, 2024
e312890
Merge pull request #319 from privacy-scaling-explorations/fix/timeout
glamperd Aug 23, 2024
49f0841
Merge branch 'dev' into staging
glamperd Aug 23, 2024
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
2 changes: 2 additions & 0 deletions packages/actions/.env.default
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ AWS_REGION="YOUR-AWS-REGION"
AWS_AMI_ID="ami-022e1a32d3f742bd8"
# The IAM instance profile for the EC2 instance to assume
AWS_INSTANCE_PROFILE_ARN="YOUR-AWS-INSTANCE-PROFILE-ARN"
# The AWS tag key for each element to create (comply to PSE's AWS policy)
AWS_TAG_VALUE="trusted-setup"

### AUTHENTICATION ###
### These configs are related to the authentication of users.
Expand Down
14 changes: 14 additions & 0 deletions packages/actions/src/helpers/vm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ export const createEC2Instance = async (
const { amiId, instanceProfileArn } = getAWSVariables()

// Parametrize the VM EC2 instance.
console.log("\nLAUNCHING AWS EC2 INSTANCE\n")
const params: RunInstancesCommandInput = {
ImageId: amiId,
InstanceType: instanceType as _InstanceType,
Expand Down Expand Up @@ -196,6 +197,19 @@ export const createEC2Instance = async (
{
Key: "Initialized",
Value: "false"
},
{
Key: "ProjectName",
Value: "trusted-setup"
}
]
},
{
ResourceType: "volume",
Tags: [
{
Key: "ProjectName",
Value: "trusted-setup"
}
]
}
Expand Down
Loading
Loading