From ac00e301b4539b1d350d27a571f47b6a6a68bda0 Mon Sep 17 00:00:00 2001 From: guyrenny Date: Sun, 1 Oct 2023 18:31:24 +0300 Subject: [PATCH] apply changes Signed-off-by: guyrenny --- examples/cloudwatch-logs/variables.tf | 6 +++--- examples/kinesis/variables.tf | 6 +++--- examples/resource-metadata/variables.tf | 6 +++--- examples/s3/variables.tf | 6 +++--- modules/cloudwatch-logs/README.md | 8 ++++---- modules/cloudwatch-logs/variables.tf | 6 +++--- modules/kinesis/README.md | 8 ++++---- modules/kinesis/variables.tf | 6 +++--- modules/lambda-secretLayer/README.md | 4 ++-- modules/lambda-secretLayer/main.tf | 2 +- modules/resource-metadata/README.md | 8 ++++---- modules/resource-metadata/variables.tf | 4 ++-- modules/s3/CHANGELOG.md | 2 +- modules/s3/README.md | 8 ++++---- modules/s3/variables.tf | 6 +++--- 15 files changed, 43 insertions(+), 43 deletions(-) diff --git a/examples/cloudwatch-logs/variables.tf b/examples/cloudwatch-logs/variables.tf index e1225ecf..536f2d09 100644 --- a/examples/cloudwatch-logs/variables.tf +++ b/examples/cloudwatch-logs/variables.tf @@ -15,7 +15,7 @@ variable "custom_url" { } variable "private_key" { - description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key" + description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key" type = string sensitive = true } @@ -85,7 +85,7 @@ variable "tags" { } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security Layer." type = string default = "" } @@ -109,7 +109,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key" type = string default = "True" } \ No newline at end of file diff --git a/examples/kinesis/variables.tf b/examples/kinesis/variables.tf index 5300188e..38fa77dd 100644 --- a/examples/kinesis/variables.tf +++ b/examples/kinesis/variables.tf @@ -15,7 +15,7 @@ variable "custom_url" { } variable "private_key" { - description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key" + description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key" type = string sensitive = true } @@ -80,7 +80,7 @@ variable "tags" { } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security Layer." type = string default = "" } @@ -92,7 +92,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key" type = string default = "True" } \ No newline at end of file diff --git a/examples/resource-metadata/variables.tf b/examples/resource-metadata/variables.tf index 3cb52f59..c53b7826 100644 --- a/examples/resource-metadata/variables.tf +++ b/examples/resource-metadata/variables.tf @@ -14,13 +14,13 @@ variable "custom_url" { } variable "private_key" { - description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key" + description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key" type = string sensitive = true } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security Layer." type = string default = "" } @@ -92,7 +92,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key" type = string default = "True" } \ No newline at end of file diff --git a/examples/s3/variables.tf b/examples/s3/variables.tf index 988fc551..242a5a6d 100644 --- a/examples/s3/variables.tf +++ b/examples/s3/variables.tf @@ -15,13 +15,13 @@ variable "custom_url" { } variable "private_key" { - description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key" + description = "Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key" type = string sensitive = true } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security Layer." type = string default = "" } @@ -141,7 +141,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key" type = string default = "True" } \ No newline at end of file diff --git a/modules/cloudwatch-logs/README.md b/modules/cloudwatch-logs/README.md index c68b955b..b05e78e8 100644 --- a/modules/cloudwatch-logs/README.md +++ b/modules/cloudwatch-logs/README.md @@ -11,7 +11,7 @@ Manage the application which retrieves `CloudWatch` logs and sends them to your | [aws](#requirement\_aws) | Cloudwatch log group| ### Note: -* in case you use SM(Secret Manager) you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer) +* in case you use Secret Manager you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer), you should only deploy one layer per region. ## Providers @@ -32,9 +32,9 @@ Manage the application which retrieves `CloudWatch` logs and sends them to your |------|-------------|------|---------|:--------:| | [coralogix\_region](#input\_coralogix\_region) | The Coralogix location region, possible options are [`Europe`, `Europe2`, `India`, `Singapore`, `US`, `US2`] | `string` | `Europe` | yes | | [custom_url](#input\_custom\_domain) | Custom url for coralogix | `string` | n/a | no | -| [layer_arn](#input\_layer\_arn) | In case you want to use SM This is the ARN of the Coralogix [Security Layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | -| [create_secret](#input\_create\_secret) | Set to False In case you want to use SM with your secret that contains coralogix Private Key| `string` | True | no | -| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key| `string` | n/a | yes | +| [layer_arn](#input\_layer\_arn) | In case you want to use Secret Manager This is the ARN of the Coralogix [lambda layer ](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | +| [create_secret](#input\_create\_secret) | Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key| `string` | True | no | +| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key| `string` | n/a | yes | | [application\_name](#input\_application\_name) | The name of your application | `string` | n/a | yes | | [subsystem\_name](#input\_subsystem\_name) | The subsystem name of your application | `string` | n/a | yes | | [newline\_pattern](#input\_newline\_pattern) | The pattern for lines splitting | `string` | `(?:\r\n\|\r\|\n)` | no | diff --git a/modules/cloudwatch-logs/variables.tf b/modules/cloudwatch-logs/variables.tf index ff3157a8..26d298c8 100644 --- a/modules/cloudwatch-logs/variables.tf +++ b/modules/cloudwatch-logs/variables.tf @@ -15,7 +15,7 @@ variable "custom_url" { } variable "private_key" { - description = "The Coralogix private key which is used to validate your authenticity" + description = "The Coralogix Data API key which is used to validate your authenticity" type = string sensitive = true } @@ -85,7 +85,7 @@ variable "tags" { } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security lambda Layer." type = string default = "" } @@ -109,7 +109,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use secrets manager with a predefine secret that was already created and contains Coralogix Send Your Data API key" type = string default = "True" } diff --git a/modules/kinesis/README.md b/modules/kinesis/README.md index ae52891f..b0c92169 100644 --- a/modules/kinesis/README.md +++ b/modules/kinesis/README.md @@ -10,7 +10,7 @@ Manage the application which retrieves logs from `S3` bucket and sends them to y | [aws](#requirement\_aws) | >= 2.23 | ### Note: -* in case you use SM(Secret Manager) you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer) +* in case you use Secret Manager you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer), you should only deploy one layer per region. ## Providers @@ -31,9 +31,9 @@ Manage the application which retrieves logs from `S3` bucket and sends them to y |------|-------------|------|---------|:--------:| | [coralogix\_region](#input\_coralogix\_region) | The Coralogix location region, possible options are [`Europe`, `Europe2`, `India`, `Singapore`, `US`, `US2`] | `string` | `Europe` | yes | | [custom_url](#input\_custom\_url) | Custom url for coralogix | `string` | n/a | no | -| [layer_arn](#input\_layer\_arn) | In case you want to use SM This is the ARN of the Coralogix [Security Layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | -| [create_secret](#input\_create\_secret) | Set to False In case you want to use SM with your secret that contains coralogix Private Key| `string` | True | no | -| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key| `string` | n/a | yes | +| [layer_arn](#input\_layer\_arn) | In case you want to use Secret Manager This is the ARN of the Coralogix [lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | +| [create_secret](#input\_create\_secret) | Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key| `string` | True | no | +| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key| `string` | n/a | yes | | [application\_name](#input\_application\_name) | The name of your application | `string` | n/a | yes | | [subsystem\_name](#input\_subsystem\_name) | The subsystem name of your application | `string` | n/a | yes | | [newline\_pattern](#input\_newline\_pattern) | The pattern for lines splitting | `string` | `(?:\r\n\|\r\|\n)` | no | diff --git a/modules/kinesis/variables.tf b/modules/kinesis/variables.tf index c61009df..ac438bae 100644 --- a/modules/kinesis/variables.tf +++ b/modules/kinesis/variables.tf @@ -15,7 +15,7 @@ variable "custom_url" { } variable "private_key" { - description = "The Coralogix private key which is used to validate your authenticity" + description = "The Coralogix Data API key which is used to validate your authenticity" type = string sensitive = true } @@ -80,7 +80,7 @@ variable "tags" { } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security lambda Layer." type = string default = "" } @@ -92,7 +92,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use secrets manager with a predefine secret that was already created and contains Coralogix Send Your Data API key" type = string default = "True" } \ No newline at end of file diff --git a/modules/lambda-secretLayer/README.md b/modules/lambda-secretLayer/README.md index 21e17387..b4e348ba 100644 --- a/modules/lambda-secretLayer/README.md +++ b/modules/lambda-secretLayer/README.md @@ -1,6 +1,6 @@ -## Coralogx Layer for SM private_key +## Coralogx Layer for Secret Manager Data API key -This Lambda Layer allows to store Coralogix Private Key in SM. +This Lambda Layer allows to store Coralogix Data API key in Secret Manager. You will need to deploy one layer per AWS Region you want to use. For now. diff --git a/modules/lambda-secretLayer/main.tf b/modules/lambda-secretLayer/main.tf index 9d307624..03d24dd1 100644 --- a/modules/lambda-secretLayer/main.tf +++ b/modules/lambda-secretLayer/main.tf @@ -2,7 +2,7 @@ data "aws_region" "this" {} resource "aws_lambda_layer_version" "coralogix_smlayer" { layer_name = "coralogix-smlayer" - description = "Lambda function layer for using SM for PrivateKey safe keeping" + description = "Lambda function layer for using Secret Manager for Data API key safe keeping" license_info = "Apache-2.0" compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs14.x"] compatible_architectures = ["x86_64", "arm64"] diff --git a/modules/resource-metadata/README.md b/modules/resource-metadata/README.md index 5698f7dd..e932f05b 100644 --- a/modules/resource-metadata/README.md +++ b/modules/resource-metadata/README.md @@ -10,7 +10,7 @@ Manage the application which retrieves `meta data` from your aws account and sen | [aws](#requirement\_aws) | >= 2.23 | ### Note: -* in case you use SM(Secret Manager) you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer) +* in case you use Secret Manager you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer), you should only deploy one layer per region. ## Providers @@ -31,9 +31,9 @@ Manage the application which retrieves `meta data` from your aws account and sen |------|-------------|------|---------|:--------:| | [coralogix\_region](#input\_coralogix\_region) | The Coralogix location region, possible options are [`Europe`, `Europe2`, `India`, `Singapore`, `US`, `US2`, `Custom`] | `string` | n/a | yes | | [custom_url](#input\_custom\_domain) | Custom url for coralogix for example: https:///api/v1/logs| `string` | n/a | no | -| [layer_arn](#input\_layer\_arn) | In case you want to use SM This is the ARN of the Coralogix [Security Layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | -| [create_secret](#input\_create\_secret) | Set to False In case you want to use SM with your secret that contains coralogix Private Key| `string` | True | no | -| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key| `string` | n/a | yes | +| [layer_arn](#input\_layer\_arn) | In case you want to use Secret Manager This is the ARN of the Coralogix [lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | +| [create_secret](#input\_create\_secret) | Set to False In case you want to use Secret Manager with your secret that contains coralogix Data API key| `string` | True | no | +| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key| `string` | n/a | yes | | [schedule](#input\_schedule) | The rate to collacet metadata | `string` | `rate(10 minutes)` | no | | [latest_versions_per_function](#input\_latest\_versions\_per\_function) | How many latest published versions of each Lambda function should be collected | `number` | 5 | no | | [resource_ttl_minutes](#input\_resource\_ttl\_minutes) | Once a resource is collected, how long should it remain valid | `number` | 60 | no | diff --git a/modules/resource-metadata/variables.tf b/modules/resource-metadata/variables.tf index 60cedded..b91821ad 100644 --- a/modules/resource-metadata/variables.tf +++ b/modules/resource-metadata/variables.tf @@ -20,7 +20,7 @@ variable "private_key" { } variable "layer_arn" { - description = "In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security lambda Layer." type = string default = "" } @@ -92,7 +92,7 @@ variable "custom_s3_bucket" { } variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use secrets manager with a predefine secret that was already created and contains Coralogix Send Your Data API key" type = string default = "True" } \ No newline at end of file diff --git a/modules/s3/CHANGELOG.md b/modules/s3/CHANGELOG.md index fea8a128..a008d9b2 100644 --- a/modules/s3/CHANGELOG.md +++ b/modules/s3/CHANGELOG.md @@ -3,7 +3,7 @@ ## S3 ### 0.0.3 / 1.10.2023 -* [Change] Change SSM option in the integration to SM - Secret Manager. +* [Change] Change SSM option in the integration to Secret Manager. ### 0.0.2 / 16.8.2023 * [Update] Add an option to use an existing secret instead of creating a new one with SSM, and remove ssm_enabled variable. diff --git a/modules/s3/README.md b/modules/s3/README.md index ccc4fc4b..01e57c2b 100644 --- a/modules/s3/README.md +++ b/modules/s3/README.md @@ -10,7 +10,7 @@ Manage the application which retrieves logs from `S3` bucket and sends them to y | [aws](#requirement\_aws) | >= 2.23 | ### Note: -* in case you use SM(Secret Manager) you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer) +* in case you use Secret Manager you should first deploy the [SM lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer), you should only deploy one layer per region. ## Providers @@ -33,9 +33,9 @@ Manage the application which retrieves logs from `S3` bucket and sends them to y | [custom_url](#input\_custom\_domain) | Custom url for coralogix for example: https:///api/v1/logs| `string` | n/a | no | | [integration_type](#input\_data\_type) | which service will send the data to the s3, possible options are [`cloudtrail`, `vpc-flow-log`, `s3`, `s3-sns`, `cloudtrail-sns`] | `string` | n/a | yes | | [sns_topic_name](#input\_sns\_topic\_name) | The SNS topic that will contain the SNS subscription, need only if you use the sns interations | `string` | | no | -| [layer_arn](#input\_layer\_arn) | In case you want to use SM This is the ARN of the Coralogix [Security Layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | -| [create_secret](#input\_create\_secret) | Set to False In case you want to use SM option with your secret that contains coralogix Private Key| `string` | True | no | -| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Private Key| `string` | n/a | yes | +| [layer_arn](#input\_layer\_arn) | In case you want to use Secret Manager This is the ARN of the Coralogix [lambda layer](https://serverlessrepo.aws.amazon.com/applications/eu-central-1/597078901540/Coralogix-Lambda-SSMLayer). | `string` | n/a | no | +| [create_secret](#input\_create\_secret) | Set to False In case you want to use Secret Manager option with your secret that contains coralogix Data API key| `string` | True | no | +| [private\_key](#input\_private\_key) | Your Coralogix secret key or incase you use your own created secret put here the name of your secret that contains the coralogix Data API key| `string` | n/a | yes | | [application\_name](#input\_application\_name) | The name of your application | `string` | n/a | yes | | [subsystem\_name](#input\_subsystem\_name) | The subsystem name of your application | `string` | n/a | yes | | [custom\_s3\_bucket](#input\_custom\_s3\_bucket) | The name of an existing s3 bucket in your region, in which the lambda zip code will be upload to. | `string` | n/a | no | diff --git a/modules/s3/variables.tf b/modules/s3/variables.tf index cba213ba..1b473ee9 100644 --- a/modules/s3/variables.tf +++ b/modules/s3/variables.tf @@ -20,7 +20,7 @@ variable "private_key" { } variable "layer_arn" { - description = " In case you are using SM This is the ARN of the Coralogix Security Layer." + description = "In case you are using Secret Manager This is the ARN of the Coralogix Security lambda Layer." type = string default = "" } @@ -132,9 +132,9 @@ variable "custom_s3_bucket" { type = string default = "" } - + variable "create_secret" { - description = "Set to False In case you want to use SM with your secret that contains coralogix private key" + description = "Set to False In case you want to use secrets manager with a predefine secret that was already created and contains Coralogix Send Your Data API key" type = string default = "True" } \ No newline at end of file