Upgrade terraform
Eelco Dolstra committed
Sep 7, 2023 at 16:21 UTC
fcfde8446733286dbfde5a2649f185c62bfd70f2
6 files changed
+21
-21
terraform/.terraform.lock.hcl
+8
-8
@@ -4,27 +4,27 @@
4
provider "registry.terraform.io/aegirhealth/netlify" {
5
version = "0.6.12"
6
hashes = [
7
- "h1:8WjKJ00XZHZ8WEWBPohsmyg9XyOBnLC5CVcrm/dBXdM=",
7
+ "h1:1VYNuFGAPaN4xb0myAkP5zswx9/ql8zxW7nPkRjsW14=",
8
]
9
}
10
11
provider "registry.terraform.io/fastly/fastly" {
12
- version = "0.34.0"
12
+ version = "5.3.1"
13
hashes = [
14
- "h1:1ewjh2aw/lOZqFPqS1ZdeNjxfwtZU0D2rcVhPEEGx9w=",
14
+ "h1:4se8Sra84U6RbcuER2pc53vs3sv9SXtmPyAPHP0aIKM=",
15
]
16
}
17
18
provider "registry.terraform.io/hashicorp/aws" {
19
- version = "3.56.0"
19
+ version = "5.14.0"
20
hashes = [
21
- "h1:qGsDRNQ5ggUIxbhDB1ti5MAe5coP3WyoEX2wAY89qD0=",
21
+ "h1:5erkFsFaXD6DpJkaLQuk5Zx21+aGqO0vhsOARiNXfxc=",
22
]
23
}
24
25
-provider "registry.terraform.io/nixpkgs/secret" {
26
- version = "1.1.1"
25
+provider "registry.terraform.io/numtide/secret" {
26
+ version = "1.2.1"
27
hashes = [
28
- "h1:Jwt07VaMlSukMitRRskKZ1NXnv+UxipSSPHRgnP57SQ=",
28
+ "h1:JRMvtYT7m7iODGOFK1E8lzEw2Em42dNJ1n5pdstcFc8=",
29
]
30
}
terraform/cache.tf
+3
-3
@@ -101,7 +101,7 @@ resource "aws_s3_bucket_policy" "cache" {
101
EOF
102
}
103
104
-resource "fastly_service_v1" "cache" {
104
+resource "fastly_service_vcl" "cache" {
105
name = local.cache_domain
106
default_ttl = 86400
107
@@ -234,7 +234,7 @@ resource "fastly_service_v1" "cache" {
234
type = "fetch"
235
}
236
237
- s3logging {
237
+ logging_s3 {
238
name = "${local.cache_domain}-to-s3"
239
bucket_name = module.fastlylogs.bucket_name
240
compression_codec = "zstd"
@@ -249,7 +249,7 @@ resource "fastly_service_v1" "cache" {
249
}
250
251
resource "fastly_tls_subscription" "cache" {
252
- domains = [for domain in fastly_service_v1.cache.domain : domain.name]
252
+ domains = [for domain in fastly_service_vcl.cache.domain : domain.name]
253
configuration_id = local.fastly_tls12_sni_configuration_id
254
certificate_authority = "globalsign"
255
}
terraform/channels.tf
+3
-3
@@ -89,7 +89,7 @@ resource "aws_s3_bucket_policy" "channels" {
89
EOF
90
}
91
92
-resource "fastly_service_v1" "channels" {
92
+resource "fastly_service_vcl" "channels" {
93
name = local.channels_domain
94
default_ttl = 3600
95
@@ -212,7 +212,7 @@ resource "fastly_service_v1" "channels" {
212
type = "recv"
213
}
214
215
- s3logging {
215
+ logging_s3 {
216
name = "${local.channels_domain}-to-s3"
217
bucket_name = module.fastlylogs.bucket_name
218
compression_codec = "zstd"
@@ -227,7 +227,7 @@ resource "fastly_service_v1" "channels" {
227
}
228
229
resource "fastly_tls_subscription" "channels" {
230
- domains = [for domain in fastly_service_v1.channels.domain : domain.name]
230
+ domains = [for domain in fastly_service_vcl.channels.domain : domain.name]
231
configuration_id = local.fastly_tls12_sni_configuration_id
232
certificate_authority = "globalsign"
233
}
terraform/nixpkgs-tarballs.tf
+3
-3
@@ -149,7 +149,7 @@ resource "aws_s3_bucket_object" "nixpkgs-tarballs-index" {
149
source = "${path.module}/nixpkgs-tarballs/index.html"
150
}
151
152
-resource "fastly_service_v1" "nixpkgs-tarballs" {
152
+resource "fastly_service_vcl" "nixpkgs-tarballs" {
153
name = local.tarballs_domain
154
default_ttl = 86400
155
@@ -257,7 +257,7 @@ resource "fastly_service_v1" "nixpkgs-tarballs" {
257
type = "fetch"
258
}
259
260
- s3logging {
260
+ logging_s3 {
261
name = "${local.tarballs_domain}-to-s3"
262
bucket_name = module.fastlylogs.bucket_name
263
compression_codec = "zstd"
@@ -272,7 +272,7 @@ resource "fastly_service_v1" "nixpkgs-tarballs" {
272
}
273
274
resource "fastly_tls_subscription" "nixpkgs-tarballs" {
275
- domains = [for domain in fastly_service_v1.nixpkgs-tarballs.domain : domain.name]
275
+ domains = [for domain in fastly_service_vcl.nixpkgs-tarballs.domain : domain.name]
276
configuration_id = local.fastly_tls12_sni_configuration_id
277
certificate_authority = "globalsign"
278
}
terraform/releases.tf
+3
-3
@@ -87,7 +87,7 @@ resource "aws_s3_bucket_policy" "releases" {
87
EOF
88
}
89
90
-resource "fastly_service_v1" "releases" {
90
+resource "fastly_service_vcl" "releases" {
91
name = local.releases_domain
92
default_ttl = 86400
93
@@ -211,7 +211,7 @@ resource "fastly_service_v1" "releases" {
211
type = "fetch"
212
}
213
214
- s3logging {
214
+ logging_s3 {
215
name = "${local.releases_domain}-to-s3"
216
bucket_name = module.fastlylogs.bucket_name
217
compression_codec = "zstd"
@@ -226,7 +226,7 @@ resource "fastly_service_v1" "releases" {
226
}
227
228
resource "fastly_tls_subscription" "releases" {
229
- domains = [for domain in fastly_service_v1.releases.domain : domain.name]
229
+ domains = [for domain in fastly_service_vcl.releases.domain : domain.name]
230
configuration_id = local.fastly_tls12_sni_configuration_id
231
certificate_authority = "globalsign"
232
}
terraform/terraform.tf
+1
-1
@@ -17,7 +17,7 @@ terraform {
17
source = "AegirHealth/netlify"
18
}
19
secret = {
20
- source = "nixpkgs/secret"
20
+ source = "numtide/secret"
21
}
22
}
23
}