diff --git a/storage/aws/elasticache/README.md b/storage/aws/elasticache/README.md index a26dc90ba..256a0a91b 100644 --- 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 | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Redis.ObjectBuilder"` | no | | [apply\_immediately](#input\_apply\_immediately) | Specifies whether any modifications are applied immediately, or during the next maintenance window | `bool` | `false` | no | | [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 | | [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 index c182bf3a5..c03ca76bf 100644 --- 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 index 91a1226ed..f9e00d9c4 100644 --- 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 index 54702dd55..e8683d4bb 100644 --- a/storage/aws/mq/README.md +++ b/storage/aws/mq/README.md @@ -41,7 +41,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolut path | `string` | `"/adapters/queue/amqp/ArmoniK.Core.Adapters.Amqp.dll"` | no | +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/queue/amqp/ArmoniK.Core.Adapters.Amqp.dll"` | no | | [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Amqp.QueueBuilder"` | no | | [apply\_immediately](#input\_apply\_immediately) | Specifies whether any broker modifications are applied immediately, or during the next maintenance window | `bool` | `false` | no | | [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 index f2b354629..4ec1e5292 100644 --- 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 index e3e6b1829..674fa9980 100644 --- a/storage/aws/s3/README.md +++ b/storage/aws/s3/README.md @@ -44,6 +44,8 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.S3.ObjectBuilder"` | no | | [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 | | [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 | | [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 index a2bf98779..4570ff14d 100644 --- 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 index b45945061..229386898 100644 --- 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 index 0091eab92..8e6333edf 100644 --- a/storage/gcp/gcs/README.md +++ b/storage/gcp/gcs/README.md @@ -48,6 +48,8 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.S3.ObjectBuilder"` | no | | [autoclass](#input\_autoclass) | The bucket's Autoclass configuration. | `bool` | `null` | no | | [cors](#input\_cors) | The bucket's Cross-Origin Resource Sharing (CORS) configuration. |
object({
origin = list(string)
method = list(string)
response_header = list(string)
max_age_seconds = number
})
| `null` | no | | [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 index 1ee45c068..4dc0b7483 100644 --- 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 index a3bd7e885..e62d5d6eb 100644 --- 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 index b375058d3..c148804a9 100644 --- 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 | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Redis.ObjectBuilder"` | no | | [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 | | [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 | | [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 index 794949a83..a82e52c60 100644 --- 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 index f19e8093a..90a5e511b 100644 --- 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 index 9a067c1b4..760171963 100644 --- a/storage/onpremise/minio/README.md +++ b/storage/onpremise/minio/README.md @@ -34,6 +34,8 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/s3/ArmoniK.Core.Adapters.S3.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.S3.ObjectBuilder"` | no | | [minio](#input\_minio) | Parameters of S3 payload storage |
object({
image = string
tag = string
image_pull_secrets = string
host = string
bucket_name = string
node_selector = any
})
| n/a | yes | | [namespace](#input\_namespace) | Namespace of ArmoniK storage resources | `string` | n/a | yes | | [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 index 3ccef3b2d..7a66cf06c 100644 --- 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 index 907c958f1..e4219f7e4 100644 --- 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 index 0352c2ede..b3c8ffea4 100644 --- a/storage/onpremise/nfs/README.md +++ b/storage/onpremise/nfs/README.md @@ -83,6 +83,8 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/local_storage/ArmoniK.Core.Adapters.LocalStorage.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.LocalStorage.ObjectBuilder"` | no | | [image](#input\_image) | image for the external client provisioner | `string` | `"k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner"` | no | | [image\_policy](#input\_image\_policy) | policy for getting the image | `string` | `"IfNotPresent"` | no | | [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 index 9fee45206..9825de4b1 100644 --- 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 index 7c12e9a5e..2fe59778a 100644 --- 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 index 80b37afed..55f074310 100644 --- a/storage/onpremise/redis/README.md +++ b/storage/onpremise/redis/README.md @@ -45,6 +45,8 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [adapter\_absolute\_path](#input\_adapter\_absolute\_path) | The adapter's absolute path | `string` | `"/adapters/object/redis/ArmoniK.Core.Adapters.Redis.dll"` | no | +| [adapter\_class\_name](#input\_adapter\_class\_name) | Name of the adapter's class | `string` | `"ArmoniK.Core.Adapters.Redis.ObjectBuilder"` | no | | [client\_name](#input\_client\_name) | Name of the redis client | `string` | `"ArmoniK.Core"` | no | | [instance\_name](#input\_instance\_name) | Name of the instance | `string` | `"ArmoniKRedis"` | no | | [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 index b0f1a5d54..f6f64a34b 100644 --- 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 index 4f60d43e5..05ebeee32 100644 --- 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" +}