From 9165597713ff171fca4444af36e587ac163eea6a Mon Sep 17 00:00:00 2001 From: Mauritz Uphoff Date: Wed, 29 Oct 2025 13:15:30 +0100 Subject: [PATCH 1/2] review changes Signed-off-by: Mauritz Uphoff --- Makefile | 1 + .../testdata/datasource-image-v2-variants.tf | 6 ++-- .../iaas/testdata/resource-network-v1-max.tf | 14 ++++---- .../iaas/testdata/resource-network-v2-max.tf | 4 +-- .../iaas/testdata/resource-volume-max.tf | 2 +- .../services/logme/testdata/resource-max.tf | 34 +++++++++---------- .../mariadb/testfiles/resource-min.tf | 2 +- .../observability/testdata/resource-max.tf | 14 ++++---- .../services/scf/testdata/resource-max.tf | 10 +++--- 9 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 01ffe874c..6752045cd 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ fmt: @gofmt -s -w . @go tool goimports -w . @cd $(ROOT_DIR)/examples && terraform fmt -recursive && cd $(ROOT_DIR) + @terraform fmt -recursive # TEST test: diff --git a/stackit/internal/services/iaas/testdata/datasource-image-v2-variants.tf b/stackit/internal/services/iaas/testdata/datasource-image-v2-variants.tf index 379bae3f5..a36deb551 100644 --- a/stackit/internal/services/iaas/testdata/datasource-image-v2-variants.tf +++ b/stackit/internal/services/iaas/testdata/datasource-image-v2-variants.tf @@ -27,7 +27,7 @@ data "stackit_image_v2" "filter_uefi_ubuntu" { project_id = var.project_id filter = { distro = "ubuntu" - uefi = true + uefi = true } } @@ -35,9 +35,9 @@ data "stackit_image_v2" "name_regex_and_filter_rhel_9_1" { project_id = var.project_id name_regex = "^Red Hat Enterprise Linux 9.1$" filter = { - distro = "rhel" + distro = "rhel" version = "9.1" - uefi = true + uefi = true } } diff --git a/stackit/internal/services/iaas/testdata/resource-network-v1-max.tf b/stackit/internal/services/iaas/testdata/resource-network-v1-max.tf index 33e9c32f3..cb56bc529 100644 --- a/stackit/internal/services/iaas/testdata/resource-network-v1-max.tf +++ b/stackit/internal/services/iaas/testdata/resource-network-v1-max.tf @@ -9,13 +9,13 @@ variable "routed" {} variable "label" {} resource "stackit_network" "network_prefix" { - project_id = var.project_id - name = var.name - ipv4_gateway = var.ipv4_gateway != "" ? var.ipv4_gateway : null - no_ipv4_gateway = var.ipv4_gateway != "" ? null : true - ipv4_nameservers = [var.ipv4_nameserver_0, var.ipv4_nameserver_1] - ipv4_prefix = var.ipv4_prefix - routed = var.routed + project_id = var.project_id + name = var.name + ipv4_gateway = var.ipv4_gateway != "" ? var.ipv4_gateway : null + no_ipv4_gateway = var.ipv4_gateway != "" ? null : true + ipv4_nameservers = [var.ipv4_nameserver_0, var.ipv4_nameserver_1] + ipv4_prefix = var.ipv4_prefix + routed = var.routed labels = { "acc-test" : var.label } diff --git a/stackit/internal/services/iaas/testdata/resource-network-v2-max.tf b/stackit/internal/services/iaas/testdata/resource-network-v2-max.tf index 63a0fcf09..283ccdbe4 100644 --- a/stackit/internal/services/iaas/testdata/resource-network-v2-max.tf +++ b/stackit/internal/services/iaas/testdata/resource-network-v2-max.tf @@ -24,8 +24,8 @@ variable "network_area_id" {} # } resource "stackit_network" "network_prefix_length" { - project_id = var.project_id - name = var.name + project_id = var.project_id + name = var.name # no_ipv4_gateway = true ipv4_nameservers = [var.ipv4_nameserver_0, var.ipv4_nameserver_1] ipv4_prefix_length = var.ipv4_prefix_length diff --git a/stackit/internal/services/iaas/testdata/resource-volume-max.tf b/stackit/internal/services/iaas/testdata/resource-volume-max.tf index 9286078ee..8a85430ec 100644 --- a/stackit/internal/services/iaas/testdata/resource-volume-max.tf +++ b/stackit/internal/services/iaas/testdata/resource-volume-max.tf @@ -24,7 +24,7 @@ resource "stackit_volume" "volume_source" { name = var.name description = var.description performance_class = var.performance_class - size = var.size + size = var.size source = { id = stackit_volume.volume_size.volume_id type = "volume" diff --git a/stackit/internal/services/logme/testdata/resource-max.tf b/stackit/internal/services/logme/testdata/resource-max.tf index 5184566e6..43e2c5f14 100644 --- a/stackit/internal/services/logme/testdata/resource-max.tf +++ b/stackit/internal/services/logme/testdata/resource-max.tf @@ -35,23 +35,23 @@ resource "stackit_logme_instance" "instance" { version = var.logme_version parameters = { - enable_monitoring = var.params_enable_monitoring - fluentd_tcp = var.params_fluentd_tcp - fluentd_tls = var.params_fluentd_tls - fluentd_tls_ciphers = var.params_fluentd_tls_ciphers - fluentd_tls_max_version = var.params_fluentd_tls_max_version - fluentd_tls_min_version = var.params_fluentd_tls_min_version - fluentd_tls_version = var.params_fluentd_tls_version - fluentd_udp = var.params_fluentd_udp - graphite = var.params_graphite - ism_deletion_after = var.params_ism_deletion_after - ism_jitter = var.params_ism_jitter - ism_job_interval = var.params_ism_job_interval - java_heapspace = var.params_java_heapspace - java_maxmetaspace = var.params_java_maxmetaspace - max_disk_threshold = var.params_max_disk_threshold - metrics_frequency = var.params_metrics_frequency - metrics_prefix = var.params_metrics_prefix + enable_monitoring = var.params_enable_monitoring + fluentd_tcp = var.params_fluentd_tcp + fluentd_tls = var.params_fluentd_tls + fluentd_tls_ciphers = var.params_fluentd_tls_ciphers + fluentd_tls_max_version = var.params_fluentd_tls_max_version + fluentd_tls_min_version = var.params_fluentd_tls_min_version + fluentd_tls_version = var.params_fluentd_tls_version + fluentd_udp = var.params_fluentd_udp + graphite = var.params_graphite + ism_deletion_after = var.params_ism_deletion_after + ism_jitter = var.params_ism_jitter + ism_job_interval = var.params_ism_job_interval + java_heapspace = var.params_java_heapspace + java_maxmetaspace = var.params_java_maxmetaspace + max_disk_threshold = var.params_max_disk_threshold + metrics_frequency = var.params_metrics_frequency + metrics_prefix = var.params_metrics_prefix opensearch_tls_ciphers = [var.params_opensearch_tls_cipher1, var.params_opensearch_tls_cipher2] opensearch_tls_protocols = [var.params_opensearch_tls_protocol1, var.params_opensearch_tls_protocol2] sgw_acl = var.params_sgw_acl diff --git a/stackit/internal/services/mariadb/testfiles/resource-min.tf b/stackit/internal/services/mariadb/testfiles/resource-min.tf index 521683dbd..f8a557446 100644 --- a/stackit/internal/services/mariadb/testfiles/resource-min.tf +++ b/stackit/internal/services/mariadb/testfiles/resource-min.tf @@ -11,6 +11,6 @@ resource "stackit_mariadb_instance" "instance" { } resource "stackit_mariadb_credential" "credential" { - project_id = var.project_id + project_id = var.project_id instance_id = stackit_mariadb_instance.instance.instance_id } \ No newline at end of file diff --git a/stackit/internal/services/observability/testdata/resource-max.tf b/stackit/internal/services/observability/testdata/resource-max.tf index b1dd34ccb..284602220 100644 --- a/stackit/internal/services/observability/testdata/resource-max.tf +++ b/stackit/internal/services/observability/testdata/resource-max.tf @@ -129,18 +129,18 @@ resource "stackit_observability_instance" "instance" { ] opsgenie_configs = [ { - api_key = var.opsgenie_api_key - tags = var.opsgenie_api_tags - api_url = var.opsgenie_api_url - priority = var.opsgenie_priority + api_key = var.opsgenie_api_key + tags = var.opsgenie_api_tags + api_url = var.opsgenie_api_url + priority = var.opsgenie_priority send_resolved = var.opsgenie_send_resolved } ] webhooks_configs = [ { - url = var.webhook_configs_url - ms_teams = var.ms_teams - google_chat = var.google_chat + url = var.webhook_configs_url + ms_teams = var.ms_teams + google_chat = var.google_chat send_resolved = var.webhook_configs_send_resolved } ] diff --git a/stackit/internal/services/scf/testdata/resource-max.tf b/stackit/internal/services/scf/testdata/resource-max.tf index f17a46bb2..c7f3ab5fd 100644 --- a/stackit/internal/services/scf/testdata/resource-max.tf +++ b/stackit/internal/services/scf/testdata/resource-max.tf @@ -6,11 +6,11 @@ variable "suspended" {} variable "region" {} resource "stackit_scf_organization" "org" { - project_id = var.project_id - name = var.name - suspended = var.suspended - quota_id = var.quota_id - region = var.region + project_id = var.project_id + name = var.name + suspended = var.suspended + quota_id = var.quota_id + region = var.region } resource "stackit_scf_organization_manager" "orgmanager" { From 02b159a3978d4430b6aba1fe8fef6aab2365c285 Mon Sep 17 00:00:00 2001 From: Mauritz Uphoff Date: Thu, 6 Nov 2025 09:15:03 +0100 Subject: [PATCH 2/2] review changes Signed-off-by: Mauritz Uphoff --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6752045cd..38b7abfdc 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ lint-golangci-lint: @$(SCRIPTS_BASE)/lint-golangci-lint.sh lint-tf: - @echo "Linting examples" - @terraform fmt -check -diff -recursive examples + @echo "Linting terraform files" + @terraform fmt -check -diff -recursive lint: lint-golangci-lint lint-tf @@ -30,8 +30,7 @@ build: fmt: @gofmt -s -w . @go tool goimports -w . - @cd $(ROOT_DIR)/examples && terraform fmt -recursive && cd $(ROOT_DIR) - @terraform fmt -recursive + @terraform fmt -diff -recursive # TEST test: