Skip to content

Commit 6afcaa2

Browse files
committed
terraform: drop cloudflare
not much point in keeping cloudflare in terraform just for account members
1 parent 8fb4988 commit 6afcaa2

File tree

6 files changed

+4
-53
lines changed

6 files changed

+4
-53
lines changed

dev/packages.nix

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,4 @@
6161
];
6262
doCheck = false;
6363
};
64-
terraform-providers = prev.terraform-providers // {
65-
cloudflare = (prev.terraform-providers.cloudflare.override { rev = "v4.52.0"; }).overrideAttrs (_: {
66-
src = final.fetchFromGitHub {
67-
owner = "cloudflare";
68-
repo = "terraform-provider-cloudflare";
69-
rev = "v4.52.0";
70-
hash = "sha256-rgXsROzfjtUw994JH8x+j/UNMyl7E9cZ+77Fczc3uB8=";
71-
};
72-
vendorHash = "sha256-RULgejA/RTDHhRJRiqlgckK4Ut3GLvIE081/i6gQTjI=";
73-
});
74-
};
7564
}

dev/terraform.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
devShells.terraform = pkgs.mkShellNoCC { packages = [ config.packages.terraform ]; };
66
packages = {
77
terraform = pkgs.terraform.withPlugins (p: [
8-
p.cloudflare
98
p.github
109
p.hydra
1110
p.sops

devdoc/onboarding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
- Add their email in [terraform/locals.tf](../terraform/locals.tf), this will give them access to:
1010

11-
- [Cloudflare](https://dash.cloudflare.com/login)
1211
- [Terraform Cloud](https://app.terraform.io)
1312

1413
- Add their user to the list of `admins` in [modules/nixos/buildbot.nix](../modules/nixos/buildbot.nix).
@@ -32,6 +31,7 @@
3231
- They will also need to be added manually to these services:
3332

3433
- [Cachix](https://app.cachix.org/organization/nix-community/settings)
34+
- [Cloudflare](https://dash.cloudflare.com/e4a2db52c495db230973c839a0699ae1/members)
3535
- [GitLab](https://gitlab.com/groups/nix-community/-/group_members)
3636
- [Hetzner Robot](https://robot.hetzner.com/key/index)
3737
- [OpenCollective](https://opencollective.com/nix-community/admin/team)

terraform/cloudflare.tf

Lines changed: 0 additions & 24 deletions
This file was deleted.

terraform/secrets.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
CLOUDFLARE_API_TOKEN: ENC[AES256_GCM,data:RCXy2ccuRjpLqrbqy6Xx3ZA6XO4ZgKKyK3vrl3WgeclRelrxZxOmhA==,iv:uyiU9UC2l8nm6tCcyuDa8Psk+bf4hyi5yruc+Q0jd9s=,tag:bpHTP7nJi58fu3TxJ+jcIA==,type:str]
21
HYDRA_PASSWORD: ENC[AES256_GCM,data:7o8RuTWxYY7HNbMDgl9ur0j+ehI1bf0JSA==,iv:oZ6iHGGL4xbCC54kQ+mjpYYrm3Kn2PAlhDOyX8K6VCY=,tag:hXSlJSgjQymbsriHBiMy4w==,type:str]
32
TFE_TOKEN: ENC[AES256_GCM,data:OiC6uMy/ilF3v/4cI0boZh7jYkVFwyeIASukif3d6PlWkIUkPonCbXmTXOcp+tpuCg7KzJC7r/bwsSM1BlFmCjXwOs7oeRK5sfNg+a071CEZnHpkMTgdwEqU,iv:mHIn4vwLS4oTYrhDVlmGbG0yzYrhcFbizIevGDIoaAs=,tag:UhKQ8w8Hk2POnZnr7BCBTg==,type:str]
43
sops:
5-
kms: []
6-
gcp_kms: []
7-
azure_kv: []
8-
hc_vault: []
94
age:
105
- recipient: age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz
116
enc: |
@@ -52,8 +47,7 @@ sops:
5247
aUhpWnU2eHdQY2NjaEZPNWNPeVlhYjgKV4lec3/DD7lrt11Cut9YRzQqnSFiRkII
5348
mrrs8Y0NrX7hibd5skmMXdgkPNna8EotkUHbWq1qg5qO/D+AamsSCA==
5449
-----END AGE ENCRYPTED FILE-----
55-
lastmodified: "2024-01-10T20:48:42Z"
56-
mac: ENC[AES256_GCM,data:bWP5cXQMQT5NCoS8z3Z1rDIrs7ahpOFNXUhHZlHg9X/kC8MECK8/4gG8ZRTs+5MNbpN/Vm5GJkCffMHzDDwG0ltGszy6Q7k3m0eYdkHS3/I1O0s8vzdF2/2hc9794GpUj1DuiIULsQfJJ6YemmZsXpDzepzkugXvU83rmqB7Lw0=,iv:hLFJsFqI+iTxivPLE2sN0Cc/qkGyNvmisR1BXOuLazg=,tag:54czUgcOhdOdXpvT+haNOA==,type:str]
57-
pgp: []
50+
lastmodified: "2025-04-05T03:46:54Z"
51+
mac: ENC[AES256_GCM,data:uYnv+jWxTV6BAsGevnosue6pekopPc9FcVIYjxB0rl+WobqB5M74K+zrLMhLIsQ1l9GpKIsQUZejd1TyWPCv/NSnrTGLxuxJiKcsq0R0o4rnlSQQbFPXcYefznhOZcgQjQI8Cd/kzAVOv/Wo4gHNME5ednfbh7rpvdrIqInPi+c=,iv:P4tWoNw6bvSuyLS//SFxcUy86Fh1zzK5qSsxXaTBEbI=,tag:X1V7jWjmdMVICKVxBax2NQ==,type:str]
5852
unencrypted_suffix: _unencrypted
59-
version: 3.8.1
53+
version: 3.10.1

terraform/terraform_providers.tf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
terraform {
22
required_providers {
3-
cloudflare = {
4-
source = "cloudflare/cloudflare"
5-
}
63
github = {
74
source = "integrations/github"
85
}
@@ -22,10 +19,6 @@ data "sops_file" "nix-community" {
2219
source_file = "secrets.yaml"
2320
}
2421

25-
provider "cloudflare" {
26-
api_token = data.sops_file.nix-community.data["CLOUDFLARE_API_TOKEN"]
27-
}
28-
2922
provider "github" {
3023
# admin provides their own token
3124
owner = "nix-community"

0 commit comments

Comments
 (0)