Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -30,7 +30,7 @@ build:
fmt:
@gofmt -s -w .
@go tool goimports -w .
@cd $(ROOT_DIR)/examples && terraform fmt -recursive && cd $(ROOT_DIR)
@terraform fmt -diff -recursive

# TEST
test:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ data "stackit_image_v2" "filter_uefi_ubuntu" {
project_id = var.project_id
filter = {
distro = "ubuntu"
uefi = true
uefi = true
}
}

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
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
34 changes: 17 additions & 17 deletions stackit/internal/services/logme/testdata/resource-max.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
Expand Down
10 changes: 5 additions & 5 deletions stackit/internal/services/scf/testdata/resource-max.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
Loading