Skip to content

Commit 022a929

Browse files
FyuselFyusel
authored
Improve acceptance tests for serverupdate and serverbackup (#1302)
* chore(serverbackup): Improve acceptance tests Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de> * chore(serverupdate): Improve acceptance tests Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de> --------- Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>
1 parent 76d2775 commit 022a929

8 files changed

Lines changed: 365 additions & 68 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ Additionally:
225225
| Env var | Value | Example value | needed for Acc tests of the following services |
226226
|---------------------------------------------|---------------------------------------------------------------------------------------------------------|----------------------------------------|------------------------------------------------|
227227
| `TF_ACC_ORGANIZATION_ID` | ID of the STACKIT test organization | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `authorization`, `iaas` |
228-
| `TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_EMAIL` | Email of the STACKIT service account | `abc-serviceaccount@sa.stackit.cloud` | `authorization`, `resourcemanager` |
229-
| `TF_ACC_SERVER_ID` | ID of a STACKIT Server with STACKIT Server Agent enabled | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `serverbackup`, `serverupdate` |
228+
| `TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_EMAIL` | Email of the STACKIT service account | `abc-serviceaccount@sa.stackit.cloud` | `authorization`, `resourcemanager` | |
230229
| `TF_ACC_TEST_PROJECT_PARENT_CONTAINER_ID` | Container ID of the project parent container (folder within an organization or the organization itself) | `organization-d2b7087` | `resourcemanager` |
231230
| `TF_ACC_TEST_PROJECT_PARENT_UUID` | UUID ID of the project parent container (folder within an organization or the organization itself) | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `resourcemanager` |
232231

‎stackit/internal/services/serverbackup/serverbackup_acc_test.go‎

Lines changed: 111 additions & 25 deletions
Large diffs are not rendered by default.

‎stackit/internal/services/serverbackup/testdata/resource-max.tf‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,46 @@
11
variable "project_id" {}
2-
variable "server_id" {}
32
variable "schedule_name" {}
43
variable "rrule" {}
54
variable "enabled" {}
65
variable "backup_name" {}
76
variable "retention_period" {}
87
variable "region" {}
98

9+
# server
10+
variable "server_name" {}
11+
variable "network_name" {}
12+
variable "machine_type" {}
13+
variable "image_id" {}
14+
15+
# create server
16+
resource "stackit_network" "network" {
17+
project_id = var.project_id
18+
name = var.network_name
19+
}
20+
21+
resource "stackit_network_interface" "nic" {
22+
project_id = var.project_id
23+
network_id = stackit_network.network.network_id
24+
}
25+
26+
resource "stackit_server" "server" {
27+
project_id = var.project_id
28+
name = var.server_name
29+
machine_type = var.machine_type
30+
boot_volume = {
31+
source_type = "image"
32+
size = 16
33+
source_id = var.image_id
34+
delete_on_termination = true
35+
}
36+
network_interfaces = [
37+
stackit_network_interface.nic.network_interface_id
38+
]
39+
}
1040

1141
resource "stackit_server_backup_schedule" "test_schedule" {
1242
project_id = var.project_id
13-
server_id = var.server_id
43+
server_id = stackit_server.server.server_id
1444
name = var.schedule_name
1545
rrule = var.rrule
1646
enabled = var.enabled
@@ -24,11 +54,11 @@ resource "stackit_server_backup_schedule" "test_schedule" {
2454

2555
data "stackit_server_backup_schedule" "schedule_data_test" {
2656
project_id = var.project_id
27-
server_id = var.server_id
57+
server_id = stackit_server.server.server_id
2858
backup_schedule_id = stackit_server_backup_schedule.test_schedule.backup_schedule_id
2959
}
3060

3161
data "stackit_server_backup_schedules" "schedules_data_test" {
3262
project_id = var.project_id
33-
server_id = var.server_id
63+
server_id = stackit_server.server.server_id
3464
}

‎stackit/internal/services/serverbackup/testdata/resource-min.tf‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,45 @@
11
variable "project_id" {}
2-
variable "server_id" {}
32
variable "schedule_name" {}
43
variable "rrule" {}
54
variable "enabled" {}
65
variable "backup_name" {}
76
variable "retention_period" {}
87

8+
# server
9+
variable "server_name" {}
10+
variable "network_name" {}
11+
variable "machine_type" {}
12+
variable "image_id" {}
13+
14+
# create server
15+
resource "stackit_network" "network" {
16+
project_id = var.project_id
17+
name = var.network_name
18+
}
19+
20+
resource "stackit_network_interface" "nic" {
21+
project_id = var.project_id
22+
network_id = stackit_network.network.network_id
23+
}
24+
25+
resource "stackit_server" "server" {
26+
project_id = var.project_id
27+
name = var.server_name
28+
machine_type = var.machine_type
29+
boot_volume = {
30+
source_type = "image"
31+
size = 16
32+
source_id = var.image_id
33+
delete_on_termination = true
34+
}
35+
network_interfaces = [
36+
stackit_network_interface.nic.network_interface_id
37+
]
38+
}
939

1040
resource "stackit_server_backup_schedule" "test_schedule" {
1141
project_id = var.project_id
12-
server_id = var.server_id
42+
server_id = stackit_server.server.server_id
1343
name = var.schedule_name
1444
rrule = var.rrule
1545
enabled = var.enabled
@@ -22,11 +52,11 @@ resource "stackit_server_backup_schedule" "test_schedule" {
2252

2353
data "stackit_server_backup_schedule" "schedule_data_test" {
2454
project_id = var.project_id
25-
server_id = var.server_id
55+
server_id = stackit_server.server.server_id
2656
backup_schedule_id = stackit_server_backup_schedule.test_schedule.backup_schedule_id
2757
}
2858

2959
data "stackit_server_backup_schedules" "schedules_data_test" {
3060
project_id = var.project_id
31-
server_id = var.server_id
61+
server_id = stackit_server.server.server_id
3262
}

0 commit comments

Comments
 (0)