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.

Sign up for GitHub

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

fix: kms policy fixed #55

Merged
merged 2 commits into from
Sep 15, 2023
Merged

fix: kms policy fixed #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b9c25
fix: kms policy fixed
d4kverma Sep 15, 2023
705632f
tflint error fixed
d4kverma Sep 15, 2023
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
6 changes: 3 additions & 3 deletions _example/complete/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## Provider block added, Use the Amazon Web Services (AWS) provider to interact with the many resources supported by AWS.
####----------------------------------------------------------------------------------
provider "aws" {
region = "eu-west-1"
region = "us-west-1"
}

locals {
Expand Down Expand Up @@ -31,7 +31,7 @@ module "public_subnets" {
name = "public-subnet"
environment = local.environment
label_order = local.label_order
availability_zones = ["eu-west-1b", "eu-west-1c"]
availability_zones = ["us-west-1b", "us-west-1c"]
vpc_id = module.vpc.vpc_id
cidr_block = module.vpc.vpc_cidr_block
type = "public"
Expand Down Expand Up @@ -91,7 +91,7 @@ module "ec2" {
ssh_allowed_ports = [22]
#Instance
instance_count = 1
ami = "ami-08d658f84a6d84a80"
ami = "ami-0f8e81a3da6e2510a"
instance_type = "t2.nano"

#Keypair
Expand Down
5 changes: 3 additions & 2 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ resource "aws_kms_key" "default" {
tags = module.labels.tags
}

data "aws_caller_identity" "this" {}

resource "aws_kms_alias" "default" {
count = var.enable && var.kms_key_enabled && var.kms_key_id == "" ? 1 : 0
name = coalesce(var.alias, format("alias/%v", module.labels.id))
Expand All @@ -133,12 +135,11 @@ data "aws_iam_policy_document" "kms" {
effect = "Allow"
principals {
type = "AWS"
identifiers = ["*"]
identifiers = [format("arn:aws:iam::%s:root", data.aws_caller_identity.this.account_id)]
}
actions = ["kms:*"]
resources = ["*"]
}

}

##----------------------------------------------------------------------------------
Expand Down
8 changes: 1 addition & 7 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ variable "cpu_core_count" {

variable "iam_instance_profile" {
type = string
default = ""
default = null
description = "The IAM Instance Profile to launch the instance with. Specified as the name of the Instance Profile."
}

Expand Down Expand Up @@ -495,12 +495,6 @@ variable "public_key" {
sensitive = true
}

variable "key_path" {
type = string
default = ""
description = "Name (e.g. `~/.ssh/id_rsa.pub`)."
}

###### spot
variable "spot_instance_enabled" {
type = bool
Expand Down