Skip to content

Commit b0b5586

Browse files
committed
[edit[ terraform modules to match the exact test setup
1 parent 6b52e3e commit b0b5586

4 files changed

Lines changed: 68 additions & 102 deletions

File tree

tests/terraform/main.tf

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,62 @@ terraform {
88
}
99
}
1010

11-
1211
provider "etcd" {
1312
username = "root"
1413
password = "snBr8ss9ls"
1514
endpoints = "http://localhost:2379"
1615
skip_tls = true
1716
}
1817

19-
module "settings" {
20-
source = "./settings"
18+
# ── Standalone Keys ────────────────────────────────────────────────────────────
19+
20+
resource "etcd_key" "my_key_name" {
21+
key = "MyKeyName"
22+
value = "MyValue"
23+
}
24+
25+
# ── TestSection Keys ───────────────────────────────────────────────────────────
26+
27+
resource "etcd_key" "test_section_item1" {
28+
key = "TestSection:Item1"
29+
value = "Item 1 value"
30+
}
31+
32+
resource "etcd_key" "test_section_item2" {
33+
key = "TestSection:Item2"
34+
value = "Item 2 value"
35+
}
36+
37+
resource "etcd_key" "test_section_subsection_item1" {
38+
key = "TestSection:SubSection:Item1"
39+
value = "Sub section value 1"
40+
}
41+
42+
resource "etcd_key" "test_section_subsection_item2" {
43+
key = "TestSection:SubSection:Item2"
44+
value = "Sub section value 2"
45+
}
46+
47+
resource "etcd_key" "test_section_arraysection_0" {
48+
key = "TestSection:ArraySection:0"
49+
value = "Item 1"
2150
}
2251

23-
module "prefix1" {
24-
source = "./settings"
25-
prefix = "MyPrefix:"
52+
resource "etcd_key" "test_section_arraysection_1" {
53+
key = "TestSection:ArraySection:1"
54+
value = "Item 2"
2655
}
2756

28-
module "prefix2" {
29-
source = "./settings"
30-
prefix = "MYCOMPLEX/prefix/"
57+
# ── MyPrefix Keys ──────────────────────────────────────────────────────────────
58+
59+
resource "etcd_key" "myprefix_testappsection_item1" {
60+
key = "MyPrefix:TestAppSection:Item1"
61+
value = "1234321"
3162
}
3263

64+
# ── MyComplex/Prefix Keys ──────────────────────────────────────────────────────
65+
66+
resource "etcd_key" "mycomplex_prefix_settings_testkey" {
67+
key = "MyComplex/Prefix/Settings:TestKey"
68+
value = "Test value"
69+
}

tests/terraform/settings/main.tf

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

tests/terraform/settings/variables.tf

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

tests/terraform/user.tf

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,59 @@
1-
1+
# ── Prefix Range Ends ──────────────────────────────────────────────────────────
22

33
data "etcd_prefix_range_end" "testsection" {
44
key = "TestSection"
55
}
66

7-
data "etcd_prefix_range_end" "testappsettings" {
8-
key = "TestAppSection"
9-
}
10-
11-
data "etcd_prefix_range_end" "arraysection" {
12-
key = "ArraySection"
13-
}
14-
15-
data "etcd_prefix_range_end" "settings" {
16-
key = "Settings"
17-
}
18-
197
data "etcd_prefix_range_end" "myprefix" {
208
key = "MyPrefix"
219
}
2210

23-
data "etcd_prefix_range_end" "complexmyprefix" {
24-
key = "MYCOMPLEX"
11+
data "etcd_prefix_range_end" "mycomplex_prefix" {
12+
key = "MyComplex/Prefix"
2513
}
2614

15+
# ── Roles ──────────────────────────────────────────────────────────────────────
2716

28-
resource "etcd_role" "tester" {
29-
name = "Tester"
17+
resource "etcd_role" "test_section" {
18+
name = "TestSection"
3019

3120
permissions {
3221
permission = "read"
3322
key = data.etcd_prefix_range_end.testsection.key
3423
range_end = data.etcd_prefix_range_end.testsection.range_end
3524
}
25+
}
3626

37-
permissions {
38-
permission = "read"
39-
key = data.etcd_prefix_range_end.testappsettings.key
40-
range_end = data.etcd_prefix_range_end.testappsettings.range_end
41-
}
27+
resource "etcd_role" "my_prefix" {
28+
name = "MyPrefix"
4229

4330
permissions {
4431
permission = "read"
45-
key = data.etcd_prefix_range_end.arraysection.key
46-
range_end = data.etcd_prefix_range_end.arraysection.range_end
32+
key = data.etcd_prefix_range_end.myprefix.key
33+
range_end = data.etcd_prefix_range_end.myprefix.range_end
4734
}
35+
}
4836

49-
permissions {
50-
permission = "read"
51-
key = data.etcd_prefix_range_end.settings.key
52-
range_end = data.etcd_prefix_range_end.settings.range_end
53-
}
37+
resource "etcd_role" "my_complex_prefix" {
38+
name = "MyComplexPrefix"
5439

5540
permissions {
5641
permission = "read"
57-
key = data.etcd_prefix_range_end.myprefix.key
58-
range_end = data.etcd_prefix_range_end.myprefix.range_end
42+
key = data.etcd_prefix_range_end.mycomplex_prefix.key
43+
range_end = data.etcd_prefix_range_end.mycomplex_prefix.range_end
5944
}
6045

6146
permissions {
62-
permission = "read"
63-
key = data.etcd_prefix_range_end.complexmyprefix.key
64-
range_end = data.etcd_prefix_range_end.complexmyprefix.range_end
47+
permission = "write"
48+
key = data.etcd_prefix_range_end.mycomplex_prefix.key
49+
range_end = data.etcd_prefix_range_end.mycomplex_prefix.range_end
6550
}
6651
}
6752

53+
# ── Users ──────────────────────────────────────────────────────────────────────
54+
6855
resource "etcd_user" "user" {
6956
username = "MyUserName"
7057
password = "passw"
71-
roles = [etcd_role.tester.name]
58+
roles = [etcd_role.test_section.name, etcd_role.my_prefix.name, etcd_role.my_complex_prefix.name]
7259
}
73-

0 commit comments

Comments
 (0)