Add environment variables for dynamic object storage

aneoconsulting · Dec 27, 2024 · 3658b57 · 3658b57
1 parent 25e9468
commit 3658b57
Show file tree

Hide file tree

Showing 23 changed files with 151 additions and 39 deletions.
diff --git a/storage/aws/elasticache/README.md b/storage/aws/elasticache/README.md
@@ -36,6 +36,8 @@ Amazon ElastiCache is a fully managed, Redis- and Memcached-compatible service d
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Redis.ObjectBuilder"` | no |
 | <a name="input_apply_immediately"></a> [apply\_immediately](#input\_apply\_immediately) | Specifies whether any modifications are applied immediately, or during the next maintenance window | `bool` | `false` | no |
 | <a name="input_automatic_failover_enabled"></a> [automatic\_failover\_enabled](#input\_automatic\_failover\_enabled) | Specifies whether a read-only replica will be automatically promoted to read/write primary if the existing primary fails | `bool` | `false` | no |
 | <a name="input_client_name"></a> [client\_name](#input\_client\_name) | Name of the redis client | `string` | `"ArmoniK.Core"` | no |

diff --git a/storage/aws/elasticache/outputs.tf b/storage/aws/elasticache/outputs.tf
@@ -27,11 +27,13 @@ output "kms_key_id" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "Redis__EndpointUrl"        = "${aws_elasticache_replication_group.elasticache.primary_endpoint_address}:${aws_elasticache_replication_group.elasticache.port}"
-    "Redis__Ssl"                = var.ssl_option
-    "Redis__ClientName"         = var.client_name
-    "Redis__CaPath"             = ""
-    "Redis__InstanceName"       = var.instance_name
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "Redis__EndpointUrl"                                    = "${aws_elasticache_replication_group.elasticache.primary_endpoint_address}:${aws_elasticache_replication_group.elasticache.port}"
+    "Redis__Ssl"                                            = var.ssl_option
+    "Redis__ClientName"                                     = var.client_name
+    "Redis__CaPath"                                         = ""
+    "Redis__InstanceName"                                   = var.instance_name
   })
 }
diff --git a/storage/aws/elasticache/variables.tf b/storage/aws/elasticache/variables.tf
@@ -146,3 +146,15 @@ variable "ssl_option" {
   type        = string
   default     = "true"
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.Redis.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"
+}
diff --git a/storage/aws/mq/README.md b/storage/aws/mq/README.md
@@ -41,7 +41,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolut path | `string` | `"/adapters/queue/amqp/ArmoniK.Core.Adapters.Amqp.dll"` | no |
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/queue/amqp/ArmoniK.Core.Adapters.Amqp.dll"` | no |
 | <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Amqp.QueueBuilder"` | no |
 | <a name="input_apply_immediately"></a> [apply\_immediately](#input\_apply\_immediately) | Specifies whether any broker modifications are applied immediately, or during the next maintenance window | `bool` | `false` | no |
 | <a name="input_authentication_strategy"></a> [authentication\_strategy](#input\_authentication\_strategy) | AWS MQ authentication strategy | `string` | `"simple"` | no |

diff --git a/storage/aws/mq/variables.tf b/storage/aws/mq/variables.tf
@@ -116,7 +116,7 @@ variable "adapter_class_name" {
 }
 
 variable "adapter_absolute_path" {
-  description = "The adapter's absolut path"
+  description = "The adapter's absolute path"
   type        = string
   default     = "/adapters/queue/amqp/ArmoniK.Core.Adapters.Amqp.dll"
 }

diff --git a/storage/aws/s3/README.md b/storage/aws/s3/README.md
@@ -44,6 +44,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.S3.ObjectBuilder"` | no |
 | <a name="input_attach_deny_insecure_transport_policy"></a> [attach\_deny\_insecure\_transport\_policy](#input\_attach\_deny\_insecure\_transport\_policy) | Controls if S3 bucket should have deny non-SSL transport policy attached | `bool` | `true` | no |
 | <a name="input_attach_policy"></a> [attach\_policy](#input\_attach\_policy) | Controls if S3 bucket should have bucket policy attached (set to `true` to use value of `policy` as bucket policy) | `bool` | `false` | no |
 | <a name="input_attach_public_policy"></a> [attach\_public\_policy](#input\_attach\_public\_policy) | Controls if a user defined public bucket policy will be attached (set to `false` to allow upstream to apply defaults to the bucket) | `bool` | `false` | no |

diff --git a/storage/aws/s3/outputs.tf b/storage/aws/s3/outputs.tf
@@ -17,11 +17,13 @@ output "arn" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "S3__BucketName"            = aws_s3_bucket.s3_bucket.bucket
-    "S3__UseChecksum"           = true
-    "S3__MustForcePathStyle"    = true
-    "S3__UseChunkEncoding"      = true
-    "S3__EndpointUrl"           = "https://s3.${aws_s3_bucket.s3_bucket.region}.amazonaws.com"
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "S3__BucketName"                                        = aws_s3_bucket.s3_bucket.bucket
+    "S3__UseChecksum"                                       = true
+    "S3__MustForcePathStyle"                                = true
+    "S3__UseChunkEncoding"                                  = true
+    "S3__EndpointUrl"                                       = "https://s3.${aws_s3_bucket.s3_bucket.region}.amazonaws.com"
   })
 }
diff --git a/storage/aws/s3/variables.tf b/storage/aws/s3/variables.tf
@@ -103,3 +103,15 @@ variable "object_storage_adapter" {
   type        = string
   default     = "ArmoniK.Adapters.S3.ObjectStorage"
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.S3.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"
+}
diff --git a/storage/gcp/gcs/README.md b/storage/gcp/gcs/README.md
@@ -48,6 +48,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.S3.ObjectBuilder"` | no |
 | <a name="input_autoclass"></a> [autoclass](#input\_autoclass) | The bucket's Autoclass configuration. | `bool` | `null` | no |
 | <a name="input_cors"></a> [cors](#input\_cors) | The bucket's Cross-Origin Resource Sharing (CORS) configuration. | <pre>object({<br>    origin          = list(string)<br>    method          = list(string)<br>    response_header = list(string)<br>    max_age_seconds = number<br>  })</pre> | `null` | no |
 | <a name="input_data_locations"></a> [data\_locations](#input\_data\_locations) | The bucket's custom location configuration, which specifies the individual regions that comprise a dual-region bucket. If the bucket is designated a single or multi-region, the parameters are empty. | `list(string)` | `null` | no |

diff --git a/storage/gcp/gcs/outputs.tf b/storage/gcp/gcs/outputs.tf
@@ -47,12 +47,14 @@ output "iam_members" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "S3__BucketName"            = google_storage_bucket.gcs.name
-    "S3__UseChecksum"           = false
-    "S3__MustForcePathStyle"    = false
-    "S3__UseChunkEncoding"      = false
-    "S3__EndpointUrl"           = "https://storage.googleapis.com"
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "S3__BucketName"                                        = google_storage_bucket.gcs.name
+    "S3__UseChecksum"                                       = false
+    "S3__MustForcePathStyle"                                = false
+    "S3__UseChunkEncoding"                                  = false
+    "S3__EndpointUrl"                                       = "https://storage.googleapis.com"
   })
 }
 

diff --git a/storage/gcp/gcs/variables.tf b/storage/gcp/gcs/variables.tf
@@ -209,3 +209,15 @@ variable "password" {
   type        = string
   default     = ""
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.S3.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"
+}
diff --git a/storage/gcp/memorystore/redis/README.md b/storage/gcp/memorystore/redis/README.md
@@ -45,6 +45,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Redis.ObjectBuilder"` | no |
 | <a name="input_auth_enabled"></a> [auth\_enabled](#input\_auth\_enabled) | Indicates whether OSS Redis AUTH is enabled for the instance. If set to true AUTH is enabled on the instance. | `bool` | `false` | no |
 | <a name="input_authorized_network"></a> [authorized\_network](#input\_authorized\_network) | The full name of the Google Compute Engine network to which the instance is connected. If left unspecified, the default network will be used. | `string` | `null` | no |
 | <a name="input_client_name"></a> [client\_name](#input\_client\_name) | Name of the redis client | `string` | `"ArmoniK.Core"` | no |

diff --git a/storage/gcp/memorystore/redis/outputs.tf b/storage/gcp/memorystore/redis/outputs.tf
@@ -69,11 +69,13 @@ output "region" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "Redis__EndpointUrl"        = "${google_redis_instance.cache.read_endpoint}:${google_redis_instance.cache.read_endpoint_port}"
-    "Redis__Ssl"                = var.ssl_option
-    "Redis__ClientName"         = var.client_name
-    "Redis__InstanceName"       = var.instance_name
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "Redis__EndpointUrl"                                    = "${google_redis_instance.cache.read_endpoint}:${google_redis_instance.cache.read_endpoint_port}"
+    "Redis__Ssl"                                            = var.ssl_option
+    "Redis__ClientName"                                     = var.client_name
+    "Redis__InstanceName"                                   = var.instance_name
   })
 }
 

diff --git a/storage/gcp/memorystore/redis/variables.tf b/storage/gcp/memorystore/redis/variables.tf
@@ -175,3 +175,15 @@ variable "namespace" {
   type        = string
   default     = "armonik"
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.Redis.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"
+}
diff --git a/storage/onpremise/minio/README.md b/storage/onpremise/minio/README.md
@@ -34,6 +34,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.S3.ObjectBuilder"` | no |
 | <a name="input_minio"></a> [minio](#input\_minio) | Parameters of S3 payload storage | <pre>object({<br>    image              = string<br>    tag                = string<br>    image_pull_secrets = string<br>    host               = string<br>    bucket_name        = string<br>    node_selector      = any<br>  })</pre> | n/a | yes |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace of ArmoniK storage resources | `string` | n/a | yes |
 | <a name="input_object_storage_adapter"></a> [object\_storage\_adapter](#input\_object\_storage\_adapter) | Name of the ArmoniK adapter to use for the storage | `string` | `"ArmoniK.Adapters.S3.ObjectStorage"` | no |

diff --git a/storage/onpremise/minio/outputs.tf b/storage/onpremise/minio/outputs.tf
@@ -45,12 +45,14 @@ output "must_force_path_style" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "S3__BucketName"            = var.minio.bucket_name
-    "S3__UseChecksum"           = true
-    "S3__MustForcePathStyle"    = true
-    "S3__UseChunkEncoding"      = true
-    "S3__EndpointUrl"           = "http://${var.minio.host}:${local.port}"
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "S3__BucketName"                                        = var.minio.bucket_name
+    "S3__UseChecksum"                                       = true
+    "S3__MustForcePathStyle"                                = true
+    "S3__UseChunkEncoding"                                  = true
+    "S3__EndpointUrl"                                       = "http://${var.minio.host}:${local.port}"
   })
 }
 

diff --git a/storage/onpremise/minio/variables.tf b/storage/onpremise/minio/variables.tf
@@ -22,3 +22,15 @@ variable "object_storage_adapter" {
   type        = string
   default     = "ArmoniK.Adapters.S3.ObjectStorage"
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.S3.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"
+}
diff --git a/storage/onpremise/nfs/README.md b/storage/onpremise/nfs/README.md
@@ -83,6 +83,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/local_storage/ArmoniK.Core.Adapters.LocalStorage.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.LocalStorage.ObjectBuilder"` | no |
 | <a name="input_image"></a> [image](#input\_image) | image for the external client provisioner | `string` | `"k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner"` | no |
 | <a name="input_image_policy"></a> [image\_policy](#input\_image\_policy) | policy  for getting the image | `string` | `"IfNotPresent"` | no |
 | <a name="input_image_pull_secrets"></a> [image\_pull\_secrets](#input\_image\_pull\_secrets) | pull secrets if needed | `string` | `""` | no |

diff --git a/storage/onpremise/nfs/outputs.tf b/storage/onpremise/nfs/outputs.tf
@@ -13,8 +13,10 @@ output "pvc_name" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "LocalStorage__Path"        = var.mount_path
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "LocalStorage__Path"                                    = var.mount_path
   })
 }
 

diff --git a/storage/onpremise/nfs/variables.tf b/storage/onpremise/nfs/variables.tf
@@ -69,3 +69,15 @@ variable "mount_path" {
   type        = string
   default     = "/local_storage"
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.LocalStorage.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/local_storage/ArmoniK.Core.Adapters.LocalStorage.dll"
+}
diff --git a/storage/onpremise/redis/README.md b/storage/onpremise/redis/README.md
@@ -45,6 +45,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_adapter_absolute_path"></a> [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"` | no |
+| <a name="input_adapter_class_name"></a> [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Redis.ObjectBuilder"` | no |
 | <a name="input_client_name"></a> [client\_name](#input\_client\_name) | Name of the redis client | `string` | `"ArmoniK.Core"` | no |
 | <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | Name of the instance | `string` | `"ArmoniKRedis"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace of ArmoniK storage resources | `string` | n/a | yes |

diff --git a/storage/onpremise/redis/outputs.tf b/storage/onpremise/redis/outputs.tf
@@ -42,12 +42,14 @@ output "endpoints" {
 output "env" {
   description = "Elements to be set as environment variables"
   value = ({
-    "Components__ObjectStorage" = var.object_storage_adapter
-    "Redis__EndpointUrl"        = local.redis_url
-    "Redis__Ssl"                = var.ssl_option
-    "Redis__ClientName"         = var.client_name
-    "Redis__CaPath"             = "${var.path}/chain.pem"
-    "Redis__InstanceName"       = var.instance_name
+    "Components__ObjectStorage"                             = var.object_storage_adapter
+    "Components__QueueAdaptorSettings__ClassName"           = var.adapter_class_name
+    "Components__QueueAdaptorSettings__AdapterAbsolutePath" = var.adapter_absolute_path
+    "Redis__EndpointUrl"                                    = local.redis_url
+    "Redis__Ssl"                                            = var.ssl_option
+    "Redis__ClientName"                                     = var.client_name
+    "Redis__CaPath"                                         = "${var.path}/chain.pem"
+    "Redis__InstanceName"                                   = var.instance_name
   })
 }
 

diff --git a/storage/onpremise/redis/variables.tf b/storage/onpremise/redis/variables.tf
@@ -52,3 +52,15 @@ variable "ssl_option" {
   type        = string
   default     = "true"
 }
+
+variable "adapter_class_name" {
+  description = "Name of the adapter's class"
+  type        = string
+  default     = "ArmoniK.Core.Adapters.Redis.ObjectBuilder"
+}
+
+variable "adapter_absolute_path" {
+  description = "The adapter's absolute path"
+  type        = string
+  default     = "/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"
+}