From c08a2052b276550bf954e250b96e9ff09a6d260b Mon Sep 17 00:00:00 2001 From: zakhar Date: Tue, 2 Sep 2025 16:43:21 +0300 Subject: [PATCH 1/2] added required task resources --- main.tf | 40 ++++++++++++++++++++++++++++++++++++++++ outputs.tf | 4 ++-- variables.tf | 4 ++-- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/main.tf b/main.tf index fc60f38..eecaf96 100644 --- a/main.tf +++ b/main.tf @@ -1,3 +1,43 @@ # 1. Deploy an S3 storage bucket +resource "aws_s3_bucket" "grafana-backups" { + bucket = "s3bucketformatetask6" +} # 2. Confugure bucket policy to allow grafana iam role to use storage +resource "aws_s3_bucket_policy" "grafana-backups-bucket-policy" { + bucket = aws_s3_bucket.grafana-backups.id + policy = data.aws_iam_policy_document.allow_access_from_another_account.json +} + +data "aws_iam_policy_document" "allow_access_from_another_account" { + statement { + principals { + type = "AWS" + identifiers = [var.grafana_iam_role_arn] + } + + actions = [ + "s3:ListBucket", + ] + + resources = [ + aws_s3_bucket.grafana-backups.arn, + ] + } + statement { + principals { + type = "AWS" + identifiers = [var.grafana_iam_role_arn] + } + + actions = [ + "s3:GetObject", + "s3:PutObject", + ] + + resources = [ + aws_s3_bucket.grafana-backups.arn, + "${aws_s3_bucket.grafana-backups.arn}/*", + ] + } +} diff --git a/outputs.tf b/outputs.tf index df85631..ef2edd2 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,4 +1,4 @@ output "bucket_name" { - value = aws_s3_bucket.grafana_backups.bucket - sensitive = false + value = aws_s3_bucket.grafana-backups.bucket + sensitive = false } diff --git a/variables.tf b/variables.tf index cea62a6..17fc6c5 100644 --- a/variables.tf +++ b/variables.tf @@ -1,4 +1,4 @@ variable "grafana_iam_role_arn" { - type = string - description = "" + type = string + description = "" } From 165b19fb43f3551961a4773176815c923f1bc577 Mon Sep 17 00:00:00 2001 From: zakhar Date: Tue, 2 Sep 2025 16:43:32 +0300 Subject: [PATCH 2/2] added tfplan.json file for validation task --- tfplan.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 tfplan.json diff --git a/tfplan.json b/tfplan.json new file mode 100644 index 0000000..bdb1c24 --- /dev/null +++ b/tfplan.json @@ -0,0 +1 @@ +{"format_version":"1.2","terraform_version":"1.13.1","variables":{"grafana_iam_role_arn":{"value":"arn:aws:iam::375612486415:role/grafana-role"}},"planned_values":{"outputs":{"bucket_name":{"sensitive":false,"type":"string","value":"s3bucketformatetask6"}},"root_module":{"resources":[{"address":"aws_s3_bucket.grafana-backups","mode":"managed","type":"aws_s3_bucket","name":"grafana-backups","provider_name":"registry.terraform.io/hashicorp/aws","schema_version":0,"values":{"bucket":"s3bucketformatetask6","force_destroy":false,"tags":null,"timeouts":null},"sensitive_values":{"cors_rule":[],"grant":[],"lifecycle_rule":[],"logging":[],"object_lock_configuration":[],"replication_configuration":[],"server_side_encryption_configuration":[],"tags_all":{},"versioning":[],"website":[]}},{"address":"aws_s3_bucket_policy.grafana-backups-bucket-policy","mode":"managed","type":"aws_s3_bucket_policy","name":"grafana-backups-bucket-policy","provider_name":"registry.terraform.io/hashicorp/aws","schema_version":0,"sensitive_values":{}},{"address":"data.aws_iam_policy_document.allow_access_from_another_account","mode":"data","type":"aws_iam_policy_document","name":"allow_access_from_another_account","provider_name":"registry.terraform.io/hashicorp/aws","schema_version":0,"values":{"override_json":null,"override_policy_documents":null,"policy_id":null,"source_json":null,"source_policy_documents":null,"statement":[{"actions":["s3:ListBucket"],"condition":[],"effect":null,"not_actions":null,"not_principals":[],"not_resources":null,"principals":[{"identifiers":["arn:aws:iam::375612486415:role/grafana-role"],"type":"AWS"}],"resources":[null],"sid":null},{"actions":["s3:GetObject","s3:PutObject"],"condition":[],"effect":null,"not_actions":null,"not_principals":[],"not_resources":null,"principals":[{"identifiers":["arn:aws:iam::375612486415:role/grafana-role"],"type":"AWS"}],"resources":[null,null],"sid":null}],"version":null},"sensitive_values":{"statement":[{"actions":[false],"condition":[],"not_principals":[],"principals":[{"identifiers":[false]}],"resources":[false]},{"actions":[false,false],"condition":[],"not_principals":[],"principals":[{"identifiers":[false]}],"resources":[false,false]}]}}]}},"resource_changes":[{"address":"data.aws_iam_policy_document.allow_access_from_another_account","mode":"data","type":"aws_iam_policy_document","name":"allow_access_from_another_account","provider_name":"registry.terraform.io/hashicorp/aws","change":{"actions":["read"],"before":null,"after":{"override_json":null,"override_policy_documents":null,"policy_id":null,"source_json":null,"source_policy_documents":null,"statement":[{"actions":["s3:ListBucket"],"condition":[],"effect":null,"not_actions":null,"not_principals":[],"not_resources":null,"principals":[{"identifiers":["arn:aws:iam::375612486415:role/grafana-role"],"type":"AWS"}],"resources":[null],"sid":null},{"actions":["s3:GetObject","s3:PutObject"],"condition":[],"effect":null,"not_actions":null,"not_principals":[],"not_resources":null,"principals":[{"identifiers":["arn:aws:iam::375612486415:role/grafana-role"],"type":"AWS"}],"resources":[null,null],"sid":null}],"version":null},"after_unknown":{"id":true,"json":true,"minified_json":true,"statement":[{"actions":[false],"condition":[],"not_principals":[],"principals":[{"identifiers":[false]}],"resources":[true]},{"actions":[false,false],"condition":[],"not_principals":[],"principals":[{"identifiers":[false]}],"resources":[true,true]}]},"before_sensitive":false,"after_sensitive":{"statement":[{"actions":[false],"condition":[],"not_principals":[],"principals":[{"identifiers":[false]}],"resources":[false]},{"actions":[false,false],"condition":[],"not_principals":[],"principals":[{"identifiers":[false]}],"resources":[false,false]}]}},"action_reason":"read_because_config_unknown"},{"address":"aws_s3_bucket.grafana-backups","mode":"managed","type":"aws_s3_bucket","name":"grafana-backups","provider_name":"registry.terraform.io/hashicorp/aws","change":{"actions":["create"],"before":null,"after":{"bucket":"s3bucketformatetask6","force_destroy":false,"tags":null,"timeouts":null},"after_unknown":{"acceleration_status":true,"acl":true,"arn":true,"bucket_domain_name":true,"bucket_prefix":true,"bucket_regional_domain_name":true,"cors_rule":true,"grant":true,"hosted_zone_id":true,"id":true,"lifecycle_rule":true,"logging":true,"object_lock_configuration":true,"object_lock_enabled":true,"policy":true,"region":true,"replication_configuration":true,"request_payer":true,"server_side_encryption_configuration":true,"tags_all":true,"versioning":true,"website":true,"website_domain":true,"website_endpoint":true},"before_sensitive":false,"after_sensitive":{"cors_rule":[],"grant":[],"lifecycle_rule":[],"logging":[],"object_lock_configuration":[],"replication_configuration":[],"server_side_encryption_configuration":[],"tags_all":{},"versioning":[],"website":[]}}},{"address":"aws_s3_bucket_policy.grafana-backups-bucket-policy","mode":"managed","type":"aws_s3_bucket_policy","name":"grafana-backups-bucket-policy","provider_name":"registry.terraform.io/hashicorp/aws","change":{"actions":["create"],"before":null,"after":{},"after_unknown":{"bucket":true,"id":true,"policy":true},"before_sensitive":false,"after_sensitive":{}}}],"output_changes":{"bucket_name":{"actions":["create"],"before":null,"after":"s3bucketformatetask6","after_unknown":false,"before_sensitive":false,"after_sensitive":false}},"prior_state":{"format_version":"1.0","terraform_version":"1.13.1","values":{"outputs":{"bucket_name":{"sensitive":false,"value":"s3bucketformatetask6","type":"string"}},"root_module":{}}},"configuration":{"provider_config":{"aws":{"name":"aws","full_name":"registry.terraform.io/hashicorp/aws","version_constraint":"~\u003e 5.0"}},"root_module":{"outputs":{"bucket_name":{"expression":{"references":["aws_s3_bucket.grafana-backups.bucket","aws_s3_bucket.grafana-backups"]}}},"resources":[{"address":"aws_s3_bucket.grafana-backups","mode":"managed","type":"aws_s3_bucket","name":"grafana-backups","provider_config_key":"aws","expressions":{"bucket":{"constant_value":"s3bucketformatetask6"}},"schema_version":0},{"address":"aws_s3_bucket_policy.grafana-backups-bucket-policy","mode":"managed","type":"aws_s3_bucket_policy","name":"grafana-backups-bucket-policy","provider_config_key":"aws","expressions":{"bucket":{"references":["aws_s3_bucket.grafana-backups.id","aws_s3_bucket.grafana-backups"]},"policy":{"references":["data.aws_iam_policy_document.allow_access_from_another_account.json","data.aws_iam_policy_document.allow_access_from_another_account"]}},"schema_version":0},{"address":"data.aws_iam_policy_document.allow_access_from_another_account","mode":"data","type":"aws_iam_policy_document","name":"allow_access_from_another_account","provider_config_key":"aws","expressions":{"statement":[{"actions":{"constant_value":["s3:ListBucket"]},"principals":[{"identifiers":{"references":["var.grafana_iam_role_arn"]},"type":{"constant_value":"AWS"}}],"resources":{"references":["aws_s3_bucket.grafana-backups.arn","aws_s3_bucket.grafana-backups"]}},{"actions":{"constant_value":["s3:GetObject","s3:PutObject"]},"principals":[{"identifiers":{"references":["var.grafana_iam_role_arn"]},"type":{"constant_value":"AWS"}}],"resources":{"references":["aws_s3_bucket.grafana-backups.arn","aws_s3_bucket.grafana-backups","aws_s3_bucket.grafana-backups.arn","aws_s3_bucket.grafana-backups"]}}]},"schema_version":0}],"variables":{"grafana_iam_role_arn":{}}}},"relevant_attributes":[{"resource":"aws_s3_bucket.grafana-backups","attribute":["arn"]},{"resource":"data.aws_iam_policy_document.allow_access_from_another_account","attribute":["json"]},{"resource":"aws_s3_bucket.grafana-backups","attribute":["id"]},{"resource":"aws_s3_bucket.grafana-backups","attribute":["bucket"]}],"timestamp":"2025-09-02T13:42:07Z","applyable":true,"complete":true,"errored":false}