v1.0.1

* Various improvement to the module structures
* Documentation update
* Marking sensitive variables

---------

Co-authored-by: Eugene Istrati <[email protected]>

.header.md

@@ -10,7 +10,7 @@ AWS Lambda UDF (User Defined Function).
 
 ## Architecture Diagram
 
-![Architecture Diagram](./docs/diagram.png "Architecture Diagram")
+![Architecture Diagram](./docs/architecture-diagram.png "Architecture Diagram")
 
 ## Usage
 
@@ -25,5 +25,11 @@ module "udf" {
 
   vpc_subnet_ids     = null # replace with comma separated values
   security_group_ids = null # replace with comma separated values
+
+  storage_url        = null # replace with storage url
+  storage_user       = null # replace with storage user
+  storage_pass       = null # replace with storage pass
+  storage_token      = null # replace with storage token (optional)
+  storage_secret_arn = null # replace with secrets manager arn (optional)
 }
 ```

README.md

@@ -11,7 +11,7 @@ AWS Lambda UDF (User Defined Function).
 
 ## Architecture Diagram
 
-![Architecture Diagram](./docs/diagram.png "Architecture Diagram")
+![Architecture Diagram](./docs/architecture-diagram.png "Architecture Diagram")
 
 ## Usage
 
@@ -26,6 +26,12 @@ module "udf" {
 
   vpc_subnet_ids     = null # replace with comma separated values
   security_group_ids = null # replace with comma separated values
+
+  storage_url        = null # replace with storage url
+  storage_user       = null # replace with storage user
+  storage_pass       = null # replace with storage pass
+  storage_token      = null # replace with storage token (optional)
+  storage_secret_arn = null # replace with secrets manager arn (optional)
 }
 ```
 
@@ -69,7 +75,8 @@ module "udf" {
 | <a name="input_name"></a> [name](#input\_name) | Lambda UDF function name | `string` | `"redshift-copy-udf"` | no |
 | <a name="input_security_group_ids"></a> [security\_group\_ids](#input\_security\_group\_ids) | Security Group IDs (comma separated values) | `string` | `null` | no |
 | <a name="input_storage_pass"></a> [storage\_pass](#input\_storage\_pass) | Storage Password to Access S3 API Compliant Storage | `string` | `null` | no |
-| <a name="input_storage_secret_arn"></a> [storage\_secret\_arn](#input\_storage\_secret\_arn) | Secrets Manager ARN for S3 API Compliant Storage Credentials | `string` | `null` | no |
+| <a name="input_storage_secret_arn"></a> [storage\_secret\_arn](#input\_storage\_secret\_arn) | Secrets Manager ARN Holding Credentials to Access S3 API Compliant Storage (Optional) | `string` | `null` | no |
+| <a name="input_storage_token"></a> [storage\_token](#input\_storage\_token) | Storage Token to Access S3 API Compliant Storage (Optional) | `string` | `null` | no |
 | <a name="input_storage_url"></a> [storage\_url](#input\_storage\_url) | Storage URL to Access S3 API Compliant Storage | `string` | `null` | no |
 | <a name="input_storage_user"></a> [storage\_user](#input\_storage\_user) | Storage Username to Access S3 API Compliant Storage | `string` | `null` | no |
 | <a name="input_timeout"></a> [timeout](#input\_timeout) | Lambda UDF timeout | `number` | `300` | no |

VERSION

@@ -1 +1 @@
-v1.0.0
+v1.0.1

examples/basic/.header.md

@@ -0,0 +1,39 @@
+# Basic Example
+
+This terraform module provides complimentary capabilities to
+[COPY command](https://docs.aws.amazon.com/redshift/latest/dg/r_COPY.html)
+by enabling data copy from S3 API compliant storage solutions such as
+[Cloudian](https://github.com/cloudian/cloudian-s3-operator),
+[MinIO](https://github.com/minio/minio), and
+[Weka](https://github.com/weka/csi-wekafs) into Amazon Redshift with
+AWS Lambda UDF (User Defined Function).
+
+## Architecture Diagram
+
+![Architecture Diagram](../../docs/architecture-diagram.png "Architecture Diagram")
+
+## Usage
+
+* Initialize terraform configs and modules
+
+```sh
+terraform init
+```
+
+* Review the resources to be created by terraform
+
+```sh
+terraform plan
+```
+
+* Apply the changes reviewed in the previous step
+
+```sh
+terraform apply
+```
+
+* When you need to clean up resources
+
+```sh
+terraform destroy
+```

examples/basic/README.md

@@ -1,4 +1,44 @@
 <!-- BEGIN_TF_DOCS -->
+# Basic Example
+
+This terraform module provides complimentary capabilities to
+[COPY command](https://docs.aws.amazon.com/redshift/latest/dg/r_COPY.html)
+by enabling data copy from S3 API compliant storage solutions such as
+[Cloudian](https://github.com/cloudian/cloudian-s3-operator),
+[MinIO](https://github.com/minio/minio), and
+[Weka](https://github.com/weka/csi-wekafs) into Amazon Redshift with
+AWS Lambda UDF (User Defined Function).
+
+## Architecture Diagram
+
+![Architecture Diagram](../../docs/architecture-diagram.png "Architecture Diagram")
+
+## Usage
+
+* Initialize terraform configs and modules
+
+```sh
+terraform init
+```
+
+* Review the resources to be created by terraform
+
+```sh
+terraform plan
+```
+
+* Apply the changes reviewed in the previous step
+
+```sh
+terraform apply
+```
+
+* When you need to clean up resources
+
+```sh
+terraform destroy
+```
+
 ## Requirements
 
 | Name | Version |

examples/minio/.header.md

@@ -0,0 +1,39 @@
+# MinIO Example
+
+This terraform module provides complimentary capabilities to
+[COPY command](https://docs.aws.amazon.com/redshift/latest/dg/r_COPY.html)
+by enabling data copy from S3 API compliant storage solutions such as
+[Cloudian](https://github.com/cloudian/cloudian-s3-operator),
+[MinIO](https://github.com/minio/minio), and
+[Weka](https://github.com/weka/csi-wekafs) into Amazon Redshift with
+AWS Lambda UDF (User Defined Function).
+
+## Architecture Diagram
+
+![Architecture Diagram](../../docs/minio-diagram.png "Architecture Diagram")
+
+## Usage
+
+* Initialize terraform configs and modules
+
+```sh
+terraform init
+```
+
+* Review the resources to be created by terraform
+
+```sh
+terraform plan
+```
+
+* Apply the changes reviewed in the previous step
+
+```sh
+terraform apply
+```
+
+* When you need to clean up resources
+
+```sh
+terraform destroy
+```

examples/minio/README.md

@@ -1,4 +1,44 @@
 <!-- BEGIN_TF_DOCS -->
+# MinIO Example
+
+This terraform module provides complimentary capabilities to
+[COPY command](https://docs.aws.amazon.com/redshift/latest/dg/r_COPY.html)
+by enabling data copy from S3 API compliant storage solutions such as
+[Cloudian](https://github.com/cloudian/cloudian-s3-operator),
+[MinIO](https://github.com/minio/minio), and
+[Weka](https://github.com/weka/csi-wekafs) into Amazon Redshift with
+AWS Lambda UDF (User Defined Function).
+
+## Architecture Diagram
+
+![Architecture Diagram](../../docs/minio-diagram.png "Architecture Diagram")
+
+## Usage
+
+* Initialize terraform configs and modules
+
+```sh
+terraform init
+```
+
+* Review the resources to be created by terraform
+
+```sh
+terraform plan
+```
+
+* Apply the changes reviewed in the previous step
+
+```sh
+terraform apply
+```
+
+* When you need to clean up resources
+
+```sh
+terraform destroy
+```
+
 ## Requirements
 
 | Name | Version |
@@ -44,7 +84,7 @@
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_cidr"></a> [cidr](#input\_cidr) | This is the CIDR block for your EKS cluster | `string` | `"10.0.0.0/16"` | no |
-| <a name="input_k8s"></a> [k8s](#input\_k8s) | This is the version of your EKS cluster | `string` | `"1.29"` | no |
+| <a name="input_k8s"></a> [k8s](#input\_k8s) | This is the version of your EKS cluster | `string` | `"1.31"` | no |
 | <a name="input_name"></a> [name](#input\_name) | This is the name of your EKS cluster | `string` | `"redshift-minio-demo"` | no |
 
 ## Outputs
@@ -56,5 +96,5 @@
 | <a name="output_iam_role_name"></a> [iam\_role\_name](#output\_iam\_role\_name) | IAM Role Name for Redshift Permissions |
 | <a name="output_lambda_function_arn"></a> [lambda\_function\_arn](#output\_lambda\_function\_arn) | Lambda Function ARN for Redshift UDF |
 | <a name="output_lambda_function_name"></a> [lambda\_function\_name](#output\_lambda\_function\_name) | Lambda Function Name for Redshift UDF |
-| <a name="output_storage_instructions"></a> [storage\_instructions](#output\_storage\_instructions) | n/a |
+| <a name="output_storage_instructions"></a> [storage\_instructions](#output\_storage\_instructions) | Instructions to install the MinIO storage solution |
 <!-- END_TF_DOCS -->

examples/minio/minio-tenant.yaml

@@ -9,7 +9,7 @@ metadata:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: storage-configuration
+  name: minio-config
   namespace: minio-tenant
 type: Opaque
 stringData:
@@ -25,14 +25,14 @@ metadata:
   name: minio
   namespace: minio-tenant
 spec:
-  serviceMetadata:
-    minioServiceAnnotations:
-      service.beta.kubernetes.io/aws-load-balancer-security-groups: "sg-0a4cecff434c80e6e"
+  # serviceMetadata:
+  #   minioServiceAnnotations:
+  #     service.beta.kubernetes.io/aws-load-balancer-security-groups: ""
   exposeServices:
     console: true
     minio: true
   configuration:
-    name: storage-configuration
+    name: minio-config
   image: quay.io/minio/minio:RELEASE.2023-05-27T05-56-19Z
   pools:
     - servers: 4

examples/minio/outputs.tf

@@ -27,8 +27,9 @@ output "lambda_function_name" {
 }
 
 output "storage_instructions" {
-  value = <<INSTRUCTIONS
-  # To install open source storage solution into an existing EKS cluster:
+  description = "Instructions to install the MinIO storage solution"
+  value       = <<INSTRUCTIONS
+  # To install open source storage solution on EKS cluster:
 
   1) Associate OIDC provider
     eksctl utils associate-iam-oidc-provider \
@@ -48,5 +49,8 @@ output "storage_instructions" {
   3) Install EBS CSI Driver and Kubernetes Operator
     aws eks update-kubeconfig --name ${var.name} --region ${data.aws_region.this.name}
     kubectl apply -k "github.com/miniohq/marketplace/eks/resources"
+
+  4) Install MinIO Tenant
+    kubectl apply -k minio-tenant.yaml
   INSTRUCTIONS
 }

examples/minio/variables.tf

@@ -9,7 +9,7 @@ variable "name" {
 
 variable "k8s" {
   type        = string
-  default     = "1.29"
+  default     = "1.31"
   description = "This is the version of your EKS cluster"
 }