Skip to content

Commit 1af44b2

Browse files
akerlakerl
committed
update
1 parent fd57147 commit 1af44b2

File tree

3 files changed

+250
-15
lines changed

3 files changed

+250
-15
lines changed

‎frame.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "akerl-frame-site" {
22
source = "armorfret/lambda-frame/aws"
3-
version = "0.3.2"
3+
version = "0.3.3"
44
logging_bucket = aws_s3_bucket.logging.id
55
config_bucket = "akerl-frame-data"
66
data_bucket = "akerl-frame-photos"

‎terraform.tfstate

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 4,
33
"terraform_version": "1.5.2",
4-
"serial": 12826,
4+
"serial": 12828,
55
"lineage": "6a6e3f47-d4c8-46eb-a34e-885062b7c62a",
66
"outputs": {
77
"domains": {
@@ -4170,6 +4170,7 @@
41704170
"sensitive_attributes": [],
41714171
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==",
41724172
"dependencies": [
4173+
"aws_route53_delegation_set.main",
41734174
"module.zones.aws_route53_zone.this"
41744175
]
41754176
}
@@ -12989,7 +12990,7 @@
1298912990
],
1299012991
"primary_name_server": "ns-1505.awsdns-60.org",
1299112992
"private_zone": false,
12992-
"resource_record_set_count": 189,
12993+
"resource_record_set_count": 191,
1299312994
"tags": {},
1299412995
"vpc_id": null,
1299512996
"zone_id": "Z06324102J3IVSSCKNZ4A"
@@ -13249,7 +13250,7 @@
1324913250
],
1325013251
"primary_name_server": "ns-1505.awsdns-60.org",
1325113252
"private_zone": false,
13252-
"resource_record_set_count": 189,
13253+
"resource_record_set_count": 191,
1325313254
"tags": {},
1325413255
"vpc_id": null,
1325513256
"zone_id": "Z06324102J3IVSSCKNZ4A"
@@ -20980,7 +20981,7 @@
2098020981
"image_uri": "",
2098120982
"invoke_arn": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:764218738161:function:frame_akerl-frame-photos/invocations",
2098220983
"kms_key_arn": "",
20983-
"last_modified": "2023-09-03T04:59:34.000+0000",
20984+
"last_modified": "2024-04-07T17:23:13.000+0000",
2098420985
"layers": [],
2098520986
"logging_config": [
2098620987
{
@@ -21001,14 +21002,14 @@
2100121002
"role": "arn:aws:iam::764218738161:role/frame_akerl-frame-photos",
2100221003
"runtime": "provided.al2",
2100321004
"s3_bucket": "akerl-frame",
21004-
"s3_key": "v0.2.0.zip",
21005+
"s3_key": "v0.2.1.zip",
2100521006
"s3_object_version": null,
2100621007
"signing_job_arn": "",
2100721008
"signing_profile_version_arn": "",
2100821009
"skip_destroy": false,
2100921010
"snap_start": [],
21010-
"source_code_hash": "1teEqfNxUx/BGp1EERUsRFsN8feFVC5zreHR3cOh6po=",
21011-
"source_code_size": 8684545,
21011+
"source_code_hash": "s094HyzZUHf4ZLnxuQXg4ijDb74Pp8ED1oW2CUiTpSA=",
21012+
"source_code_size": 8973847,
2101221013
"tags": {},
2101321014
"tags_all": {},
2101421015
"timeout": 10,
@@ -21024,10 +21025,8 @@
2102421025
"sensitive_attributes": [],
2102521026
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
2102621027
"dependencies": [
21027-
"module.akerl-frame-site.module.apigw.module.lambda.aws_iam_role.lambda",
21028-
"module.akerl-frame-site.module.apigw.module.lambda.data.aws_iam_policy_document.trust"
21029-
],
21030-
"create_before_destroy": true
21028+
"module.akerl-frame-site.module.apigw.module.lambda.aws_iam_role.lambda"
21029+
]
2103121030
}
2103221031
]
2103321032
},
@@ -36454,7 +36453,7 @@
3645436453
"name": "certbot_frameproxy.a-rwx.org",
3645536454
"path": "/",
3645636455
"permissions_boundary": "",
36457-
"tags": null,
36456+
"tags": {},
3645836457
"tags_all": {},
3645936458
"unique_id": "AIDA3D3X4QXYTS67RMN3D"
3646036459
},
@@ -36482,8 +36481,10 @@
3648236481
"sensitive_attributes": [],
3648336482
"private": "bnVsbA==",
3648436483
"dependencies": [
36484+
"aws_route53_delegation_set.main",
3648536485
"module.frameproxy_proxy_validation.aws_iam_user.this",
36486-
"module.frameproxy_proxy_validation.data.aws_iam_policy_document.certbot_validation"
36486+
"module.frameproxy_proxy_validation.data.aws_iam_policy_document.certbot_validation",
36487+
"module.zones.aws_route53_zone.this"
3648736488
]
3648836489
}
3648936490
]
@@ -36524,6 +36525,7 @@
3652436525
"sensitive_attributes": [],
3652536526
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==",
3652636527
"dependencies": [
36528+
"aws_route53_delegation_set.main",
3652736529
"module.zones.aws_route53_zone.this"
3652836530
]
3652936531
}

‎terraform.tfstate.backup

+234-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 4,
33
"terraform_version": "1.5.2",
4-
"serial": 12820,
4+
"serial": 12826,
55
"lineage": "6a6e3f47-d4c8-46eb-a34e-885062b7c62a",
66
"outputs": {
77
"domains": {
@@ -4137,6 +4137,44 @@
41374137
}
41384138
]
41394139
},
4140+
{
4141+
"mode": "managed",
4142+
"type": "aws_route53_record",
4143+
"name": "frameproxy_a-rwx_org",
4144+
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
4145+
"instances": [
4146+
{
4147+
"schema_version": 2,
4148+
"attributes": {
4149+
"alias": [],
4150+
"allow_overwrite": null,
4151+
"cidr_routing_policy": [],
4152+
"failover_routing_policy": [],
4153+
"fqdn": "frameproxy.a-rwx.org",
4154+
"geolocation_routing_policy": [],
4155+
"geoproximity_routing_policy": [],
4156+
"health_check_id": "",
4157+
"id": "Z06324102J3IVSSCKNZ4A_frameproxy.a-rwx.org_A",
4158+
"latency_routing_policy": [],
4159+
"multivalue_answer_routing_policy": false,
4160+
"name": "frameproxy.a-rwx.org",
4161+
"records": [
4162+
"10.0.1.80"
4163+
],
4164+
"set_identifier": "",
4165+
"ttl": 60,
4166+
"type": "A",
4167+
"weighted_routing_policy": [],
4168+
"zone_id": "Z06324102J3IVSSCKNZ4A"
4169+
},
4170+
"sensitive_attributes": [],
4171+
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==",
4172+
"dependencies": [
4173+
"module.zones.aws_route53_zone.this"
4174+
]
4175+
}
4176+
]
4177+
},
41404178
{
41414179
"mode": "managed",
41424180
"type": "aws_route53_record",
@@ -36319,6 +36357,200 @@
3631936357
}
3632036358
]
3632136359
},
36360+
{
36361+
"module": "module.frameproxy_proxy_validation",
36362+
"mode": "data",
36363+
"type": "aws_iam_policy_document",
36364+
"name": "certbot_validation",
36365+
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
36366+
"instances": [
36367+
{
36368+
"schema_version": 0,
36369+
"attributes": {
36370+
"id": "4158311214",
36371+
"json": "{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Effect\": \"Allow\",\n \"Action\": [\n \"route53:ListHostedZonesByName\",\n \"route53:ListHostedZones\",\n \"route53:GetChange\"\n ],\n \"Resource\": \"*\"\n },\n {\n \"Effect\": \"Allow\",\n \"Action\": [\n \"route53:ListResourceRecordSets\",\n \"route53:GetHostedZone\"\n ],\n \"Resource\": \"arn:aws:route53:::hostedzone/Z06324102J3IVSSCKNZ4A\"\n },\n {\n \"Effect\": \"Allow\",\n \"Action\": \"route53:ChangeResourceRecordSets\",\n \"Resource\": \"arn:aws:route53:::hostedzone/Z06324102J3IVSSCKNZ4A\",\n \"Condition\": {\n \"ForAllValues:StringEquals\": {\n \"route53:ChangeResourceRecordSetsNormalizedRecordNames\": \"_acme-challenge.frameproxy.a-rwx.org\"\n }\n }\n }\n ]\n}",
36372+
"override_json": null,
36373+
"override_policy_documents": null,
36374+
"policy_id": null,
36375+
"source_json": null,
36376+
"source_policy_documents": null,
36377+
"statement": [
36378+
{
36379+
"actions": [
36380+
"route53:GetChange",
36381+
"route53:ListHostedZones",
36382+
"route53:ListHostedZonesByName"
36383+
],
36384+
"condition": [],
36385+
"effect": "Allow",
36386+
"not_actions": [],
36387+
"not_principals": [],
36388+
"not_resources": [],
36389+
"principals": [],
36390+
"resources": [
36391+
"*"
36392+
],
36393+
"sid": ""
36394+
},
36395+
{
36396+
"actions": [
36397+
"route53:GetHostedZone",
36398+
"route53:ListResourceRecordSets"
36399+
],
36400+
"condition": [],
36401+
"effect": "Allow",
36402+
"not_actions": [],
36403+
"not_principals": [],
36404+
"not_resources": [],
36405+
"principals": [],
36406+
"resources": [
36407+
"arn:aws:route53:::hostedzone/Z06324102J3IVSSCKNZ4A"
36408+
],
36409+
"sid": ""
36410+
},
36411+
{
36412+
"actions": [
36413+
"route53:ChangeResourceRecordSets"
36414+
],
36415+
"condition": [
36416+
{
36417+
"test": "ForAllValues:StringEquals",
36418+
"values": [
36419+
"_acme-challenge.frameproxy.a-rwx.org"
36420+
],
36421+
"variable": "route53:ChangeResourceRecordSetsNormalizedRecordNames"
36422+
}
36423+
],
36424+
"effect": "Allow",
36425+
"not_actions": [],
36426+
"not_principals": [],
36427+
"not_resources": [],
36428+
"principals": [],
36429+
"resources": [
36430+
"arn:aws:route53:::hostedzone/Z06324102J3IVSSCKNZ4A"
36431+
],
36432+
"sid": ""
36433+
}
36434+
],
36435+
"version": "2012-10-17"
36436+
},
36437+
"sensitive_attributes": []
36438+
}
36439+
]
36440+
},
36441+
{
36442+
"module": "module.frameproxy_proxy_validation",
36443+
"mode": "managed",
36444+
"type": "aws_iam_user",
36445+
"name": "this",
36446+
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
36447+
"instances": [
36448+
{
36449+
"schema_version": 0,
36450+
"attributes": {
36451+
"arn": "arn:aws:iam::764218738161:user/certbot_frameproxy.a-rwx.org",
36452+
"force_destroy": false,
36453+
"id": "certbot_frameproxy.a-rwx.org",
36454+
"name": "certbot_frameproxy.a-rwx.org",
36455+
"path": "/",
36456+
"permissions_boundary": "",
36457+
"tags": null,
36458+
"tags_all": {},
36459+
"unique_id": "AIDA3D3X4QXYTS67RMN3D"
36460+
},
36461+
"sensitive_attributes": [],
36462+
"private": "bnVsbA=="
36463+
}
36464+
]
36465+
},
36466+
{
36467+
"module": "module.frameproxy_proxy_validation",
36468+
"mode": "managed",
36469+
"type": "aws_iam_user_policy",
36470+
"name": "this",
36471+
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
36472+
"instances": [
36473+
{
36474+
"schema_version": 0,
36475+
"attributes": {
36476+
"id": "certbot_frameproxy.a-rwx.org:certbot_frameproxy.a-rwx.org",
36477+
"name": "certbot_frameproxy.a-rwx.org",
36478+
"name_prefix": "",
36479+
"policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Action\":[\"route53:ListHostedZonesByName\",\"route53:ListHostedZones\",\"route53:GetChange\"],\"Effect\":\"Allow\",\"Resource\":\"*\"},{\"Action\":[\"route53:ListResourceRecordSets\",\"route53:GetHostedZone\"],\"Effect\":\"Allow\",\"Resource\":\"arn:aws:route53:::hostedzone/Z06324102J3IVSSCKNZ4A\"},{\"Action\":\"route53:ChangeResourceRecordSets\",\"Condition\":{\"ForAllValues:StringEquals\":{\"route53:ChangeResourceRecordSetsNormalizedRecordNames\":\"_acme-challenge.frameproxy.a-rwx.org\"}},\"Effect\":\"Allow\",\"Resource\":\"arn:aws:route53:::hostedzone/Z06324102J3IVSSCKNZ4A\"}]}",
36480+
"user": "certbot_frameproxy.a-rwx.org"
36481+
},
36482+
"sensitive_attributes": [],
36483+
"private": "bnVsbA==",
36484+
"dependencies": [
36485+
"module.frameproxy_proxy_validation.aws_iam_user.this",
36486+
"module.frameproxy_proxy_validation.data.aws_iam_policy_document.certbot_validation"
36487+
]
36488+
}
36489+
]
36490+
},
36491+
{
36492+
"module": "module.frameproxy_proxy_validation",
36493+
"mode": "managed",
36494+
"type": "aws_route53_record",
36495+
"name": "caa",
36496+
"provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
36497+
"instances": [
36498+
{
36499+
"schema_version": 2,
36500+
"attributes": {
36501+
"alias": [],
36502+
"allow_overwrite": null,
36503+
"cidr_routing_policy": [],
36504+
"failover_routing_policy": [],
36505+
"fqdn": "frameproxy.a-rwx.org",
36506+
"geolocation_routing_policy": [],
36507+
"geoproximity_routing_policy": [],
36508+
"health_check_id": "",
36509+
"id": "Z06324102J3IVSSCKNZ4A_frameproxy.a-rwx.org_CAA",
36510+
"latency_routing_policy": [],
36511+
"multivalue_answer_routing_policy": false,
36512+
"name": "frameproxy.a-rwx.org",
36513+
"records": [
36514+
"0 iodef \"mailto:[email protected]\"",
36515+
"0 issue \"letsencrypt.org; validationmethods=dns-01\"",
36516+
"0 issuewild \";\""
36517+
],
36518+
"set_identifier": "",
36519+
"ttl": 60,
36520+
"type": "CAA",
36521+
"weighted_routing_policy": [],
36522+
"zone_id": "Z06324102J3IVSSCKNZ4A"
36523+
},
36524+
"sensitive_attributes": [],
36525+
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==",
36526+
"dependencies": [
36527+
"module.zones.aws_route53_zone.this"
36528+
]
36529+
}
36530+
]
36531+
},
36532+
{
36533+
"module": "module.frameproxy_proxy_validation",
36534+
"mode": "managed",
36535+
"type": "awscreds_iam_access_key",
36536+
"name": "this",
36537+
"provider": "provider[\"registry.terraform.io/armorfret/awscreds\"]",
36538+
"instances": [
36539+
{
36540+
"schema_version": 0,
36541+
"attributes": {
36542+
"file": "creds/certbot_frameproxy.a-rwx.org",
36543+
"id": "AKIA3D3X4QXY7GAT3ENL",
36544+
"user": "certbot_frameproxy.a-rwx.org"
36545+
},
36546+
"sensitive_attributes": [],
36547+
"private": "bnVsbA==",
36548+
"dependencies": [
36549+
"module.frameproxy_proxy_validation.aws_iam_user.this"
36550+
]
36551+
}
36552+
]
36553+
},
3632236554
{
3632336555
"module": "module.frameproxy_validation",
3632436556
"mode": "data",
@@ -36489,6 +36721,7 @@
3648936721
"sensitive_attributes": [],
3649036722
"private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==",
3649136723
"dependencies": [
36724+
"aws_route53_delegation_set.main",
3649236725
"module.zones.aws_route53_zone.this"
3649336726
]
3649436727
}

0 commit comments

Comments
 (0)