Skip to content
Merged
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
7 changes: 0 additions & 7 deletions terraform/api.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ resource "heroku_formation" "api_checksum_worker" {
quantity = 1
}

resource "heroku_formation" "api_analytics_worker" {
app_id = module.api.heroku_app_id
type = "analytics-worker"
size = "standard-1x"
quantity = 1
}

data "aws_iam_user" "api" {
user_name = module.api.heroku_iam_user_id
}
18 changes: 0 additions & 18 deletions terraform/modules/dandiset_bucket/log_bucket.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,6 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "log_bucket" {
}

data "aws_iam_policy_document" "dandiset_log_bucket_policy" {
statement {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry -- just want to make sure we do not remove some used IAM:

I wonder if this is anyhow relates to IAM key/secret for which @satra recently shared with me and @CodyCBakerPhD to setup our processing? is there a way to check if this IAM was used recently?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is removing a bucket policy, not an IAM role, so technically there is no concept of "last used". The associated IAM role that the policy is attached to, dandi-api-heroku, is used by the Django app and all the celery workers for AWS access. If it's being used elsewhere, we should phase that out and create a new IAM role/policy for it (I imagine this is not the case though).

resources = [
"${aws_s3_bucket.log_bucket.arn}",
"${aws_s3_bucket.log_bucket.arn}/*",
]

actions = [
# Needed for the app to process logs for collecting download analytics
"s3:GetObject",
"s3:ListBucket",
]

principals {
type = "AWS"
identifiers = [var.heroku_user.arn]
}
}
Comment thread
jjnesbitt marked this conversation as resolved.

statement {
sid = "S3ServerAccessLogsPolicy"
effect = "Allow"
Expand Down
7 changes: 0 additions & 7 deletions terraform/staging_pipeline.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,6 @@ resource "heroku_formation" "api_staging_checksum_worker" {
quantity = 1
}

resource "heroku_formation" "api_staging_analytics_worker" {
app_id = module.api_staging.heroku_app_id
type = "analytics-worker"
size = "basic"
quantity = 1
}

data "aws_iam_user" "api_staging" {
user_name = module.api_staging.heroku_iam_user_id
}
Expand Down