Skip to content

Commit 0ada8e7

Browse files
maclarensgmaclarensg
committed
fix-taskfile-and-others
1 parent f16f647 commit 0ada8e7

File tree

3 files changed

+24
-126
lines changed

3 files changed

+24
-126
lines changed

‎boiler/Taskfile.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ tasks:
1515
debug:
1616
desc: "Print out viarables set before exexuting tasks"
1717
cmds:
18-
- echo "TIER:{{.TIER}}"
19-
- echo "TF_VERSION:{{.TF_VERSION}}"
20-
- echo "DOMAIN:{{.DOMAIN}}"
21-
- echo "CMD:{{.CMD}}"
22-
- echo "IMAGE:{{.IMAGE}}"
23-
- echo "PLATFORM:{{.PLATFORM}}"
18+
- |
19+
echo "TIER:{{.TIER}}"
20+
echo "TF_VERSION:{{.TF_VERSION}}"
21+
echo "DOMAIN:{{.DOMAIN}}"
22+
echo "CMD:{{.CMD}}"
23+
echo "IMAGE:{{.IMAGE}}"
24+
echo "PLATFORM:{{.PLATFORM}}"
2425
2526
shell:
2627
desc: "Run a shell in the container"
@@ -29,17 +30,18 @@ tasks:
2930
region: '{{default "ap-southeast-1" .region}}'
3031
group: '{{default "" .group}}'
3132
WS_PATH: '$(case ${TIER} in 1) echo "{{.account}}" ;; 2) echo "{{.account}}/{{.region}}" ;; 3) echo "{{.account}}/{{.region}}/{{.region}}" ;; *) echo "Unsupported tier" && exit 1 ;; esac)'
32-
COMMAND: '{{.CMD}} run --platform {{.PLATFORM}} --rm -it -e AWS_PROFILE=devops -v {{.HOME}}/.aws:/root/.aws -v {{.PWD}}/.gitconfig:/root/.gitconfig -v {{.PWD}}:/tf -v {{.PWD}}/local_modules:/tf/workspaces/{{.WS_PATH}}/local_modules -w /tf/workspaces/{{.WS_PATH}} --entrypoint \"\" {{.IMAGE}}'
33+
COMMAND: '{{.CMD}} run --platform {{.PLATFORM}} --rm -it -e USER=$(id -u) -e GROUP=$(id -g) -e AWS_PROFILE={{.account}} -v {{.HOME}}/.aws:/root/.aws -v {{.HOME}}/.gitconfig:/root/.gitconfig -v {{.PWD}}:/tf -v {{.PWD}}/local_modules:/tf/workspaces/{{.WS_PATH}}/local_modules -w /tf/workspaces/{{.WS_PATH}} --entrypoint \"\" {{.IMAGE}}'
3334
cmds:
3435
- |
35-
[ "{{.account}}" ] || ( echo "ACCOUNT is required."; exit 1 )
36+
[ "{{.account}}" ] || { echo "account is required."; exit 1; }
3637
[ "{{.TIER}}" -ge 2 ] && [ -z "{{.region}}" ] && echo "REGION is required." && exit 1 || true
3738
[ "{{.TIER}}" -eq 3 ] && [ -z "{{.region}}" ] && echo "GROUP is required." && exit 1 || true
38-
- echo "{{.account}}"
39-
- echo "{{.region}}"
40-
- echo "{{.WS_PATH}}"
41-
# - echo "{{.COMMAND}}" /bin/sh
42-
- eval "{{.COMMAND}}" /bin/sh
39+
echo "{{.account}}"
40+
echo "{{.region}}"
41+
echo "{{.WS_PATH}}"
42+
echo "{{.COMMAND}}"
43+
eval "{{.COMMAND}}" /bin/sh
44+
eval "{{.COMMAND}}" chown -R $(id -u):$(id -g) .
4345
4446
scaffold:
4547
desc: "Scaffold a workspace"
@@ -51,21 +53,19 @@ tasks:
5153
WS_PATH: '$(case ${TIER} in 1) echo "{{.account}}" ;; 2) echo "{{.account}}/{{.region}}" ;; 3) echo "{{.account}}/{{.region}}/{{.region}}" ;; *) echo "Unsupported tier" && exit 1 ;; esac)'
5254
KEY_PATH: '$(case ${TIER} in 1) echo "{{.account}}/{{.PROJECT}}" ;; 2) echo "{{.account}}/{{.PROJECT}}/{{.region}}" ;; 3) echo "{{.account}}/{{.PROJECT}}/{{.region}}/{{.region}}" ;; *) echo "Unsupported tier" && exit 1 ;; esac)'
5355
RELATIVE_WS_PATH: '$(case "${TIER}" in 1) echo "../..";; 2) echo "../../..";; 3) echo "../../../../";; esac)'
54-
RENDER: '{{.CMD}} run --platform {{ .PLATFORM }} --rm -it -v {{.PWD}}:/tf -w /tf {{.TEMPLATER}}'
56+
RENDER: '{{.CMD}} run --platform {{ .PLATFORM }} --user $(id -u):$(id -g) --rm -it -v {{.PWD}}:/tf -w /tf {{.TEMPLATER}}'
5557
cmds:
5658
- |
57-
[ "{{.account}}" ] || ( echo "ACCOUNT is required."; exit 1 )
58-
[ "{{.account_id}}" ] || ( echo "ACCOUNT_ID is required."; exit 1 )
59-
[ "{{.TIER}}" -ge 2 ] && [ -z "{{.region}}" ] && echo "REGION is required." && exit 1 || true
60-
[ "{{.TIER}}" -eq 3 ] && [ -z "{{.region}}" ] && echo "GROUP is required." && exit 1 || true
61-
- |
59+
[ "{{.account}}" ] || { echo "account is required."; exit 1; }
60+
[ "{{.account_id}}" ] || { echo "account_id is required."; exit 1; }
61+
[ "{{.TIER}}" -ge 2 ] && [ -z "{{.region}}" ] && echo "region is required." && exit 1 || true
62+
[ "{{.TIER}}" -eq 3 ] && [ -z "{{.region}}" ] && [ -z "{{.group}}" ] && echo "group is required." && exit 1 || true
6263
[ -d "workspaces/{{.WS_PATH}}" ] && echo "Workspace already exists." && exit 1 || mkdir -p workspaces/{{.WS_PATH}}
6364
[ -d "workspaces/{{.WS_PATH}}/local_modules" ] || ( cd workspaces/{{.WS_PATH}}; ln -s {{.RELATIVE_WS_PATH}}/local_modules . )
6465
[ -f "workspaces/{{.WS_PATH}}/auto.tf" ] || ( cd workspaces/{{.WS_PATH}}; ln -s {{.RELATIVE_WS_PATH}}/base/auto.tf . )
6566
[ -f "workspaces/{{.WS_PATH}}/main.tf" ] || ( touch ./workspaces/{{.WS_PATH}}/main.tf )
6667
[ -f "workspaces/{{.WS_PATH}}/vars.tf" ] || ( cp ./base/vars.tf ./workspaces/{{.WS_PATH}}/ )
6768
[ -d "workspaces/{{.WS_PATH}}/resources" ] || ( mkdir -p ./workspaces/{{.WS_PATH}}/resources ; cp -r ./base/skeleton/* ./workspaces/{{.WS_PATH}}/resources )
68-
- |
6969
echo "ACCOUNT: {{.account}}" > tmp/config.yaml
7070
echo "ACCOUNT_ID: \"{{.account_id}}\"" >> tmp/config.yaml
7171
[ "{{.TIER}}" -ge 2 ] && echo "REGION: {{.region}}" >> tmp/config.yaml
@@ -75,7 +75,8 @@ tasks:
7575
echo "TIER: {{.TIER}}" >> tmp/config.yaml
7676
echo "KEY_PATH: {{.KEY_PATH}}" >> tmp/config.yaml
7777
{{.RENDER}} -c .=/tf/tmp/config.yaml -f /tf/base/provider.tf.tmpl -o /tf/workspaces/{{.WS_PATH}}/provider.tf
78-
{{.RENDER}} -c .=/tf/tmp/config.yaml -f /tf/base/terraform.auto.tfvars.tmpl -o /tf/workspaces/{{.WS_PATH}}/terraform.auto.tfvars
78+
[ "{{.TIER}}" -ge 2 ] && {{.RENDER}} -c .=/tf/tmp/config.yaml -f /tf/base/terraform.auto.tfvars.tmpl -o /tf/workspaces/{{.WS_PATH}}/terraform.auto.tfvars || true
79+
echo "Scaffold complete."
7980
8081
unscaffold:
8182
desc: "Unscaffold a workspace"
@@ -89,7 +90,6 @@ tasks:
8990
[ "{{.account}}" ] || ( echo "ACCOUNT is required."; exit 1 )
9091
[ "{{.TIER}}" -ge 2 ] && [ -z "{{.region}}" ] && echo "REGION is required." && exit 1 || true
9192
[ "{{.TIER}}" -eq 3 ] && [ -z "{{.region}}" ] && echo "GROUP is required." && exit 1 || true
92-
- |
9393
echo "{{.WS_PATH}}"
9494
[ -d "workspaces/{{.WS_PATH}}" ] || ( echo "Workspace does not exist."; exit 1 )
9595
rm -rf workspaces/{{.WS_PATH}}

‎boiler/base/auto.tf

-102
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,3 @@
11
# Automation goes here
22

3-
locals {
4-
# Read bucket definitions
5-
definitions = merge([for f in fileset(path.module, "./resources/*.yaml") : yamldecode(file("${path.module}/${f}"))]...)
6-
buckets = { for key, bucket in local.definitions : key => bucket if(try(bucket.disable_s3, false) == false) }
7-
notification_buckets = { for key, bucket in local.definitions : key => bucket if(try(length(bucket.notifications) > 0, false)) }
83

9-
# Read bucket policies
10-
policies = merge([for f in fileset(path.module, "./resources/policies/*.json") : { "${f}" : file("${path.module}/${f}") }]...)
11-
12-
# Read transfer definitions
13-
transfer_families = { for key, configs in local.definitions : key => configs.transfer if(try(length(configs.transfer) > 0, false)) }
14-
}
15-
16-
17-
18-
module "s3-bucket" {
19-
source = "terraform-aws-modules/s3-bucket/aws"
20-
version = "4.1.2"
21-
22-
for_each = local.buckets
23-
24-
bucket = can(each.value.bucket_prefix) ? null : each.key
25-
26-
acceleration_status = try(each.value.acceleration_status, null)
27-
acl = try(each.value.acl, null)
28-
analytics_configuration = try(each.value.analytics_configuration, {})
29-
attach_deny_insecure_transport_policy = try(each.value.attach_deny_insecure_transport_policy, false)
30-
attach_deny_unencrypted_object_uploads = try(each.value.attach_deny_unencrypted_object_uploads, false)
31-
attach_elb_log_delivery_policy = try(each.value.attach_elb_log_delivery_policy, false)
32-
attach_inventory_destination_policy = try(each.value.attach_inventory_destination_policy, false)
33-
attach_lb_log_delivery_policy = try(each.value.attach_lb_log_delivery_policy, false)
34-
attach_policy = try(each.value.attach_policy, false)
35-
attach_public_policy = try(each.value.attach_public_policy, true)
36-
attach_require_latest_tls_policy = try(each.value.attach_require_latest_tls_policy, false)
37-
block_public_acls = try(each.value.block_public_acls, false)
38-
block_public_policy = try(each.value.block_public_policy, false)
39-
bucket_prefix = try(each.value.bucket_prefix, null)
40-
control_object_ownership = try(each.value.control_object_ownership, false)
41-
cors_rule = try(each.value.cors_rule, [])
42-
create_bucket = try(each.value.create_bucket, true)
43-
expected_bucket_owner = try(each.value.expected_bucket_owner, null)
44-
force_destroy = try(each.value.force_destroy, false)
45-
grant = try(each.value.grant, [])
46-
ignore_public_acls = try(each.value.ignore_public_acls, false)
47-
intelligent_tiering = try(each.value.intelligent_tiering, {})
48-
inventory_configuration = try(each.value.inventory_configuration, {})
49-
lifecycle_rule = try(each.value.lifecycle_rule, [])
50-
logging = try(each.value.logging, {})
51-
metric_configuration = try(each.value.metric_configuration, [])
52-
object_lock_configuration = try(each.value.object_lock_configuration, {})
53-
object_lock_enabled = try(each.value.object_lock_enabled, false)
54-
object_ownership = try(each.value.object_ownership, "ObjectWriter")
55-
policy = try(local.policies["resources/policies/${each.key}.json"], null)
56-
replication_configuration = try(each.value.replication_configuration, {})
57-
request_payer = try(each.value.request_payer, null)
58-
restrict_public_buckets = try(each.value.restrict_public_buckets, false)
59-
server_side_encryption_configuration = try(each.value.server_side_encryption_configuration, {})
60-
tags = merge(var.default_tags, try(each.value.tags, {}))
61-
versioning = try(each.value.versioning, {})
62-
website = try(each.value.website, {})
63-
}
64-
65-
66-
module "s3_notification" {
67-
source = "terraform-aws-modules/s3-bucket/aws//modules/notification"
68-
version = "4.1.2"
69-
70-
for_each = local.notification_buckets
71-
72-
bucket = each.key
73-
create = try(each.value.notifications.create, false)
74-
bucket_arn = can(try(each.value.notifications.attach_s3_arn, true)) ? module.s3-bucket[each.key].s3_bucket_arn : null
75-
76-
# SNS
77-
create_sns_policy = try(each.value.notifications.sns.attach_policy, false)
78-
sns_notifications = try(each.value.notifications.sns.definitions, {})
79-
80-
# SQS
81-
create_sqs_policy = try(each.value.notifications.sqs.attach_policy, false)
82-
sqs_notifications = try(each.value.notifications.sqs.definitions, {})
83-
84-
# EventBridge
85-
eventbridge = try(each.value.notifications.eventbridge, false)
86-
87-
# Lambda
88-
lambda_notifications = try(each.value.notifications.lambda, {})
89-
}
90-
91-
module "transfer_family" {
92-
source = "./local_modules/transfer-family"
93-
94-
for_each = local.transfer_families
95-
name = each.key
96-
vpc_name = each.value.vpc_name
97-
config = try(each.value, {})
98-
99-
region = var.region
100-
default_tags = var.default_tags
101-
102-
providers = {
103-
aws = aws
104-
}
105-
}

‎boiler/base/provider.tf.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "s3" {
3-
bucket = "sandbox-iac-opentofu"
3+
bucket = "<Replace With Your Bucket>"
44
key = "{{ .KEY_PATH }}/state.tfstate"
55
region = "ap-southeast-1"
66
#dynamodb_table = ""
@@ -13,4 +13,4 @@ provider "aws" {
1313

1414
variable "region" {
1515
default = "ap-southeast-1"
16-
}
16+
}

0 commit comments

Comments
 (0)