File tree Expand file tree Collapse file tree 3 files changed +23
-31
lines changed
Expand file tree Collapse file tree 3 files changed +23
-31
lines changed Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ terraform {
22 required_providers {
33 cloudflare = {
44 source = " cloudflare/cloudflare"
5- version = " >= 4.7.0 "
5+ version = " >= 5, <6 "
66 }
77 random = {
88 source = " hashicorp/random"
9- version = " 3.5 .1"
9+ version = " 3.7 .1"
1010 }
1111 }
1212}
@@ -66,8 +66,6 @@ module "r2-api-token_wildcard" {
6666 expires_on = timeadd (timestamp (), " 10m" )
6767}
6868
69-
70-
7169module "r2-api-token_eu" {
7270 source = " ../.."
7371 account_id = var. account_id
Original file line number Diff line number Diff line change @@ -3,12 +3,12 @@ terraform {
33 required_providers {
44 cloudflare = {
55 source = " cloudflare/cloudflare"
6- version = " >= 4.13.0 , <5 "
6+ version = " >= 5 , <6 "
77 }
88 }
99}
1010
11- data "cloudflare_api_token_permission_groups " "this" {}
11+ data "cloudflare_account_api_token_permission_groups " "this" {}
1212
1313locals {
1414 resources = length (var. buckets ) > 0 ? { for bucket in var . buckets : " com.cloudflare.edge.r2.bucket.${ var . account_id } _${ var . jurisdiction } _${ bucket } " => " *" } : { " com.cloudflare.edge.r2.bucket.*" = " *" }
@@ -17,17 +17,18 @@ locals {
1717
1818resource "cloudflare_api_token" "token" {
1919 name = var. token_name != " " ? var. token_name : " R2-${ local . token_bucket_names } -${ var . bucket_read ? " Read" : " " } -${ var . bucket_write ? " Write" : " " } "
20- policy {
20+ polices = [{
21+ effect = " allow"
22+ resources = local.resources
2123 permission_groups = compact ([
22- var . bucket_read ? data . cloudflare_api_token_permission_groups . this . r2 [" Workers R2 Storage Bucket Item Read" ] : null ,
23- var . bucket_write ? data . cloudflare_api_token_permission_groups . this . r2 [" Workers R2 Storage Bucket Item Write" ] : null ,
24+ var . bucket_read ? data . cloudflare_account_api_token_permission_groups . this . r2 [" Workers R2 Storage Bucket Item Read" ] : null ,
25+ var . bucket_write ? data . cloudflare_account_api_token_permission_groups . this . r2 [" Workers R2 Storage Bucket Item Write" ] : null ,
2426 ])
25- resources = local. resources
26- }
27+ }]
2728 not_before = var. not_before != " " ? var. not_before : null
2829 expires_on = var. expires_on != " " ? var. expires_on : null
29- condition {
30- request_ip {
30+ condition = {
31+ request_ip = {
3132 in = var.condition_ip_in
3233 not_in = var.condition_ip_not_in
3334 }
You can’t perform that action at this time.
0 commit comments