Fully switch to S3 service key

Author: loafoe

README.md

@@ -43,9 +43,9 @@ module "thanos" {
 
 | Name | Version |
 |------|---------|
-| <a name="provider_cloudfoundry"></a> [cloudfoundry](#provider\_cloudfoundry) | >= 0.15.5 |
-| <a name="provider_hsdp"></a> [hsdp](#provider\_hsdp) | >= 0.38.2 |
-| <a name="provider_random"></a> [random](#provider\_random) | >= 2.2.1 |
+| <a name="provider_cloudfoundry"></a> [cloudfoundry](#provider\_cloudfoundry) | 0.50.8 |
+| <a name="provider_hsdp"></a> [hsdp](#provider\_hsdp) | 0.42.1 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
 
 ## Modules
 

docker/supervisord_configs/thanos.conf

@@ -1,5 +1,5 @@
 [program:thanos]
-command = /sidecars/bin/thanos_s3.sh sidecar --tsdb.path=/prometheus --prometheus.url="http://localhost:9090" --objstore.config-file=/sidecars/etc/bucket_config.yaml --http-address=0.0.0.0:19191 --grpc-address=0.0.0.0:19090
+command = /sidecars/bin/thanos_s3_sk.sh sidecar --tsdb.path=/prometheus --prometheus.url="http://localhost:9090" --objstore.config-file=/sidecars/etc/bucket_config.yaml --http-address=0.0.0.0:19191 --grpc-address=0.0.0.0:19090
 autostart = true
 autorestart = true
 startsecs = 5

main.tf

@@ -42,18 +42,21 @@ resource "cloudfoundry_app" "thanos" {
     VARIANT_TENANTS                    = join(",", var.tenants)
     VARIANT_SPACES                     = join(",", var.spaces)
     VARIANT_RELOAD                     = "true"
-  }, var.environment)
+    S3_BUCKET                          = cloudfoundry_service_key.s3.credentials["bucket"]
+    S3_ENDPOINT                        = cloudfoundry_service_key.s3.credentials["endpoint"]
+    S3_API_KEY                         = cloudfoundry_service_key.s3.credentials["api_key"]
+    S3_SECRET_KEY                      = cloudfoundry_service_key.s3.credentials["secret_key"]
+    S3_URI                             = cloudfoundry_service_key.s3.credentials["uri"]
+    },
+  var.environment)
+
 
   dynamic "routes" {
     for_each = local.thanos_routes
     content {
       route = routes.value
     }
   }
-  //noinspection HCLUnknownBlockType
-  service_binding {
-    service_instance = cloudfoundry_service_instance.s3.id
-  }
 
   dynamic "service_binding" {
     for_each = var.thanos_service_bindings

thanos_store.tf

@@ -8,14 +8,20 @@ resource "cloudfoundry_app" "thanos_store" {
     username = var.docker_username
     password = var.docker_password
   }
-  environment = var.environment
-  command     = "/sidecars/bin/thanos_s3.sh store --grpc-address=0.0.0.0:19090 --http-address=0.0.0.0:9090 --data-dir=/prometheus --index-cache-size=500MB --chunk-pool-size=500MB --objstore.config-file=/sidecars/etc/bucket_config.yaml"
+  environment = merge(
+    {
+      S3_BUCKET     = cloudfoundry_service_key.s3.credentials["bucket"]
+      S3_ENDPOINT   = cloudfoundry_service_key.s3.credentials["endpoint"]
+      S3_API_KEY    = cloudfoundry_service_key.s3.credentials["api_key"]
+      S3_SECRET_KEY = cloudfoundry_service_key.s3.credentials["secret_key"]
+      S3_URI        = cloudfoundry_service_key.s3.credentials["uri"]
+    },
+    var.environment
+  )
+  command = "/sidecars/bin/thanos_s3_sk.sh store --grpc-address=0.0.0.0:19090 --http-address=0.0.0.0:9090 --data-dir=/prometheus --index-cache-size=500MB --chunk-pool-size=500MB --objstore.config-file=/sidecars/etc/bucket_config.yaml"
   routes {
     route = cloudfoundry_route.thanos_store_internal.id
   }
-  service_binding {
-    service_instance = cloudfoundry_service_instance.s3.id
-  }
   dynamic "service_binding" {
     for_each = var.thanos_store_service_bindings