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: add quotes around subnet ids #6

Merged
merged 7 commits into from
May 16, 2022
Merged

fix: add quotes around subnet ids #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4beac09
fix: add quotes around subnet ids
May 16, 2022
744d522
fix: use correct variable name
May 16, 2022
2bc002b
fix: remove extra quotes around subnets
May 16, 2022
a48ab58
chore: change order
May 16, 2022
6474bcb
chore: will path module prefix help?
May 16, 2022
134fadc
chore: try workaround
May 16, 2022
838b26f
feat: build lambda archive in ci
May 16, 2022
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: 6 additions & 0 deletions .github/workflows/cloud-asset-inventory-terragrunt-plan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ jobs:
- name: Get current date to determine if secrets need to be rotated
run: echo "TF_VAR_password_change_id=$(date +'%Y-%m')" >> $GITHUB_ENV

- name: Build Lambda archive
if: ${{ steps.filter.outputs.cloud_asset_inventory == 'true' || steps.filter.outputs.common == 'true' }}
working-directory: terragrunt/aws/cloud_asset_inventory/src/sentinel_ingestor
run: |
./build.sh

- name: Terragrunt plan cloud_asset_inventory
if: ${{ steps.filter.outputs.cloud_asset_inventory == 'true' || steps.filter.outputs.common == 'true' }}
uses: cds-snc/terraform-plan@v2
Expand Down
6 changes: 1 addition & 5 deletions terragrunt/aws/cloud_asset_inventory/lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@
#
data "archive_file" "neo4j_to_sentinel" {
type = "zip"
source_dir = "src/sentinel_ingestor/dist"
source_dir = "${path.module}/src/sentinel_ingestor/dist"
output_path = "/tmp/neo4j_to_sentinel.py.zip"

depends_on = [
null_resource.lambda_build
]
}

resource "aws_lambda_function" "neo4j_to_sentinel" {
Expand Down
2 changes: 1 addition & 1 deletion terragrunt/aws/cloud_asset_inventory/state-machines/cartography.json.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"NetworkConfiguration": {
"AwsvpcConfiguration": {
"SecurityGroups": ["${SECURITY_GROUPS}"],
"Subnets":["${SUBNETS}"]
"Subnets":[${SUBNETS}]
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion terragrunt/aws/cloud_asset_inventory/state_machine.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data "template_file" "asset_inventory_cartography_state_machine" {
MIN_ECS_CAPACITY = var.min_ecs_capacity
MAX_ECS_CAPACITY = var.max_ecs_capacity
SECURITY_GROUPS = aws_security_group.cartography.id
SUBNETS = join(", ", [for subnet in var.vpc_private_subnet_ids : subnet])
SUBNETS = join(", ", [for subnet in var.vpc_private_subnet_ids : format("%q", subnet)])
}
}

Expand Down