Skip to content

Commit 4f1dbef

Browse files
committed
fix(audit-logs): add HTTPS scheme to URLs and update compliance lock dependencies
1 parent 1e20876 commit 4f1dbef

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

src/modules/management/3-object-storage.tf

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
####################
2-
## OBJECT STORAGE ##
3-
####################
4-
5-
resource "stackit_objectstorage_compliance_lock" "this" {
6-
count = try(var.audit_logs.s3_object_lock, false) ? 1 : 0
7-
8-
project_id = stackit_resourcemanager_project.this.project_id
9-
}
10-
111
#############
122
## BUCKETS ##
133
#############
@@ -26,11 +16,22 @@ resource "stackit_objectstorage_bucket" "tfstate" {
2616
]
2717
}
2818

19+
resource "stackit_objectstorage_compliance_lock" "this" {
20+
count = try(var.audit_logs.s3_object_lock, false) ? 1 : 0
21+
22+
project_id = stackit_resourcemanager_project.this.project_id
23+
24+
depends_on = [
25+
stackit_objectstorage_bucket.default,
26+
stackit_objectstorage_bucket.tfstate,
27+
]
28+
}
29+
2930
resource "stackit_objectstorage_bucket" "audit_logs" {
3031
name = "${var.naming_pattern}-audit-logs"
3132
project_id = stackit_resourcemanager_project.this.project_id
3233

33-
object_lock = local.audit_object_lock ? true : null
34+
object_lock = try(var.audit_logs.s3_object_lock, false) ? true : null
3435

3536
depends_on = [
3637
stackit_objectstorage_bucket.tfstate, # "project.create_conflict","msg":"Two concurrent calls try to create the same project"}]}
@@ -39,7 +40,7 @@ resource "stackit_objectstorage_bucket" "audit_logs" {
3940
}
4041

4142
resource "stackit_objectstorage_default_retention" "audit_logs" {
42-
count = local.audit_object_lock ? 1 : 0
43+
count = try(var.audit_logs.s3_object_lock, false) ? 1 : 0
4344

4445
project_id = stackit_resourcemanager_project.this.project_id
4546
bucket_name = stackit_objectstorage_bucket.audit_logs.name

src/modules/management/6-audit-logs.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ resource "stackit_telemetryrouter_destination" "audit_logs" {
5555
config = {
5656
config_type = "OpenTelemetry"
5757
opentelemetry = {
58-
uri = stackit_logs_instance.audit[0].ingest_otlp_url
58+
uri = "https://${stackit_logs_instance.audit[0].ingest_otlp_url}"
5959
bearer_token = stackit_logs_access_token.audit_write[0].access_token
6060
}
6161
}
@@ -128,9 +128,10 @@ resource "vault_kv_secret_v2" "audit_logs" {
128128
delete_all_versions = true
129129
data_json = jsonencode(
130130
{
131-
INGEST_OTLP_URL = stackit_logs_instance.audit[0].ingest_otlp_url
132-
QUERY_URL = stackit_logs_instance.audit[0].query_url
133-
DATASOURCE_URL = stackit_logs_instance.audit[0].datasource_url
131+
# The API returns these without a scheme; store them ready to use.
132+
INGEST_OTLP_URL = "https://${stackit_logs_instance.audit[0].ingest_otlp_url}"
133+
QUERY_URL = "https://${stackit_logs_instance.audit[0].query_url}"
134+
DATASOURCE_URL = "https://${stackit_logs_instance.audit[0].datasource_url}"
134135
WRITE_TOKEN = stackit_logs_access_token.audit_write[0].access_token
135136
READ_TOKEN = stackit_logs_access_token.audit_read[0].access_token
136137
ROUTER_TOKEN = stackit_telemetryrouter_access_token.audit_link[0].access_token

0 commit comments

Comments
 (0)