Page MenuHomePhabricator
Differential D13005

[lib] fix usage of `userID` in DMOp messages
ClosedPublic
Actions

Authored by kamil on Aug 7 2024, 1:23 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 10:54 PM
Unknown Object (File)
Wed, Mar 12, 10:47 PM
Unknown Object (File)
Thu, Mar 6, 2:47 AM
Unknown Object (File)
Wed, Mar 5, 2:54 AM
Unknown Object (File)
Feb 17 2025, 6:51 PM
Unknown Object (File)
Feb 14 2025, 8:03 AM
Unknown Object (File)
Jan 27 2025, 5:26 AM
Unknown Object (File)
Jan 24 2025, 5:51 AM
View All 74 Files
Subscribers
None

Details

Reviewers
ashoat
tomek
Commits
rCOMMce71bd6e3ef1: [lib] fix usage of `userID` in DMOp messages
Summary

ENG-8965.

Test Plan

Described in ENG-8964

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Aug 7 2024, 1:23 AM
kamil held this revision as a draft.
kamil added a child revision: D13006: [lib] fix generating DM messages to peers.Aug 7 2024, 1:28 AM
kamil published this revision for review.Aug 7 2024, 1:39 AM
Harbormaster completed remote builds in B30975: Diff 43214.Aug 7 2024, 1:40 AM
tomek accepted this revision.Aug 7 2024, 2:37 AM
tomek added inline comments.
lib/shared/dm-ops/dm-op-utils.js
67–73 ↗(On Diff #43214)

How about renaming these and making the names consistent?

This revision is now accepted and ready to land.Aug 7 2024, 2:37 AM
kamil updated this revision to Diff 43245.Aug 8 2024, 1:07 AM

address review

Harbormaster failed remote builds in B30999: Diff 43245!Aug 8 2024, 1:46 AM
This revision was landed with ongoing or failed builds.Aug 8 2024, 2:33 AM
Closed by commit rCOMMce71bd6e3ef1: [lib] fix usage of `userID` in DMOp messages (authored by kamil). · Explain Why
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMce71bd6e3ef1: [lib] fix usage of `userID` in DMOp messages.

Revision Contents
Changeset List

PathSize
lib/
shared/
dm-ops/
41 lines
tunnelbroker/
7 lines

Diff 43248

View Options

lib/shared/dm-ops/dm-op-utils.js

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Linesresource "aws_scheduler_schedule" "blob_cleanup" {
# Task can run within 15 minutes window of the scheduled time # Task can run within 15 minutes window of the scheduled time
flexible_time_window { flexible_time_window {
mode = "FLEXIBLE" mode = "FLEXIBLE"
maximum_window_in_minutes = 15 maximum_window_in_minutes = 15
} }
target { target {
arn = aws_ecs_cluster.comm_services.arn arn = aws_ecs_cluster.comm_services.arn
role_arn = aws_iam_role.scheduler.arn role_arn = aws_iam_role.task_scheduler.arn
ecs_parameters { ecs_parameters {
task_definition_arn = aws_ecs_task_definition.blob_cleanup.arn_without_revision task_definition_arn = aws_ecs_task_definition.blob_cleanup.arn_without_revision
launch_type = "FARGATE" launch_type = "FARGATE"
network_configuration { network_configuration {
assign_public_ip = true assign_public_ip = true
security_groups = [aws_security_group.blob_service.id] security_groups = [aws_security_group.blob_service.id]
subnets = [ subnets = [
aws_subnet.public_a.id, aws_subnet.public_a.id,
aws_subnet.public_b.id, aws_subnet.public_b.id,
aws_subnet.public_c.id, aws_subnet.public_c.id,
] ]
} }
} }
retry_policy { retry_policy {
maximum_event_age_in_seconds = 300 maximum_event_age_in_seconds = 300
maximum_retry_attempts = 5 maximum_retry_attempts = 5
} }
} }
} }
resource "aws_iam_role" "scheduler" { resource "aws_iam_role_policy_attachment" "blob_cleanup_scheduler" {
name = "cron-scheduler-role" policy_arn = aws_iam_policy.blob_cleanup_scheduler.arn
assume_role_policy = jsonencode({ role = aws_iam_role.task_scheduler.name
Version = "2012-10-17"
Statement = [
{
Effect = "Allow"
Principal = {
Service = ["scheduler.amazonaws.com"]
}
Action = "sts:AssumeRole"
}
]
})
}
resource "aws_iam_role_policy_attachment" "scheduler" {
policy_arn = aws_iam_policy.scheduler.arn
role = aws_iam_role.scheduler.name
} }
resource "aws_iam_policy" "scheduler" { resource "aws_iam_policy" "blob_cleanup_scheduler" {
name = "cron-scheduler-policy" name = "blob-cleanup-cron-scheduler-policy"
policy = jsonencode({ policy = jsonencode({
Version = "2012-10-17" Version = "2012-10-17"
Statement = [ Statement = [
# Allow scheduler to execute the task # Allow scheduler to execute the task
{ {
Effect = "Allow", Effect = "Allow",
Action = [ Action = [
Show All 18 Lines
View Options

lib/tunnelbroker/peer-to-peer-context.js

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Linesresource "aws_scheduler_schedule" "blob_cleanup" {
# Task can run within 15 minutes window of the scheduled time # Task can run within 15 minutes window of the scheduled time
flexible_time_window { flexible_time_window {
mode = "FLEXIBLE" mode = "FLEXIBLE"
maximum_window_in_minutes = 15 maximum_window_in_minutes = 15
} }
target { target {
arn = aws_ecs_cluster.comm_services.arn arn = aws_ecs_cluster.comm_services.arn
role_arn = aws_iam_role.scheduler.arn role_arn = aws_iam_role.task_scheduler.arn
ecs_parameters { ecs_parameters {
task_definition_arn = aws_ecs_task_definition.blob_cleanup.arn_without_revision task_definition_arn = aws_ecs_task_definition.blob_cleanup.arn_without_revision
launch_type = "FARGATE" launch_type = "FARGATE"
network_configuration { network_configuration {
assign_public_ip = true assign_public_ip = true
security_groups = [aws_security_group.blob_service.id] security_groups = [aws_security_group.blob_service.id]
subnets = [ subnets = [
aws_subnet.public_a.id, aws_subnet.public_a.id,
aws_subnet.public_b.id, aws_subnet.public_b.id,
aws_subnet.public_c.id, aws_subnet.public_c.id,
] ]
} }
} }
retry_policy { retry_policy {
maximum_event_age_in_seconds = 300 maximum_event_age_in_seconds = 300
maximum_retry_attempts = 5 maximum_retry_attempts = 5
} }
} }
} }
resource "aws_iam_role" "scheduler" { resource "aws_iam_role_policy_attachment" "blob_cleanup_scheduler" {
name = "cron-scheduler-role" policy_arn = aws_iam_policy.blob_cleanup_scheduler.arn
assume_role_policy = jsonencode({ role = aws_iam_role.task_scheduler.name
Version = "2012-10-17"
Statement = [
{
Effect = "Allow"
Principal = {
Service = ["scheduler.amazonaws.com"]
}
Action = "sts:AssumeRole"
}
]
})
}
resource "aws_iam_role_policy_attachment" "scheduler" {
policy_arn = aws_iam_policy.scheduler.arn
role = aws_iam_role.scheduler.name
} }
resource "aws_iam_policy" "scheduler" { resource "aws_iam_policy" "blob_cleanup_scheduler" {
name = "cron-scheduler-policy" name = "blob-cleanup-cron-scheduler-policy"
policy = jsonencode({ policy = jsonencode({
Version = "2012-10-17" Version = "2012-10-17"
Statement = [ Statement = [
# Allow scheduler to execute the task # Allow scheduler to execute the task
{ {
Effect = "Allow", Effect = "Allow",
Action = [ Action = [
Show All 18 Lines