Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ if command_exists ./node_modules/.bin/prettier; then
echo "$files" | xargs ./node_modules/.bin/prettier --ignore-unknown --write
fi

if command_exists tflint; then
tflint --init
tflint --config "$(pwd)/.tflint.hcl" --color --recursive
fi
# We don't have `tflint` in pre-commit hook because it doesn't ignore files
# ignored in `.gitignore`. More details: https://github.com/terraform-linters/tflint/issues/2283

# Add the modified/prettified files to staging
echo "$files" | xargs git add
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Self-Managed StackSet Example

This is a basic example of using the `elastio-asset-account-stack-set` terraform module with the self-managed AWS Cloudformation StackSet.
This is a basic example of using the `elastio-asset-account-stack-set` terraform module with the self-managed AWS CloudFormation StackSet.

You can deploy it even within a single account. Just specify the `template_url` input variable at minimum.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Service-Managed StackSet Example

This is a basic example of using the `elastio-asset-account-stack-set` terraform module with the service-managed AWS Cloudformation StackSet.
This is a basic example of using the `elastio-asset-account-stack-set` terraform module with the service-managed AWS CloudFormation StackSet.

You'll need to deploy it from the AWS Management account. You'll also need to specify both the input variables: `accounts` and `organizational_unit_ids`.

Expand Down
2 changes: 1 addition & 1 deletion codegen/src/policies/ElastioAssetAccountDeployer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default {
Sid: "ElastioIamDelete",
Action: ["iam:DeleteRole", "iam:DeletePolicy"],

// A name wildcard is required here because if Cloudformation tries to delete
// A name wildcard is required here because if CloudFormation tries to delete
// a non-existing resource with a Condition based on `elastio:resource` tag,
// then it'll get a 403 AccessDenied error which it doesn't handle properly.
// It stops the stack deletion process in a DELETE_FAILED state:
Expand Down
8 changes: 4 additions & 4 deletions connector/terraform/README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions connector/terraform/modules/account/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `elastio-connector-account` module

Deploys an AWS Cloudformation stack named `elastio-account-level-stack`, which is deployed once per AWS account and contains the required IAM resources (roles, policies, etc.) for Elastio Connector to operate in the same account.
Deploys an AWS CloudFormation stack named `elastio-account-level-stack`, which is deployed once per AWS account and contains the required IAM resources (roles, policies, etc.) for Elastio Connector to operate in the same account.

See the [`elastio-connector` module implementation](../../main.tf) for an example of how this module should be used.

Expand Down Expand Up @@ -59,7 +59,7 @@ No modules.
| <a name="input_global_managed_policies"></a> [global_managed_policies](#input_global_managed_policies) | List of IAM managed policies ARNs to attach to all Elastio IAM roles | `set(string)` | `null` | no |
| <a name="input_global_permission_boundary"></a> [global_permission_boundary](#input_global_permission_boundary) | The ARN of the IAM managed policy to use as a permission boundary for all Elastio IAM roles | `string` | `null` | no |
| <a name="input_iam_resource_names_prefix"></a> [iam_resource_names_prefix](#input_iam_resource_names_prefix) | Add a custom prefix to names of all IAM resources deployed by this stack.<br/> The sum of the length of the prefix and suffix must not exceed 14 characters. | `string` | `null` | no |
| <a name="input_iam_resource_names_static"></a> [iam_resource_names_static](#input_iam_resource_names_static) | If enabled, the stack will use static resource names without random characters in them.<br/><br/> This parameter is set to `true` by default, and it shouldn't be changed. The older<br/> versions of Elastio stack used random names generated by Cloudformation for IAM<br/> resources, which is inconvenient to work with. New deployments that use the terraform<br/> automation should have this set to `true` for easier management of IAM resources. | `bool` | `true` | no |
| <a name="input_iam_resource_names_static"></a> [iam_resource_names_static](#input_iam_resource_names_static) | If enabled, the stack will use static resource names without random characters in them.<br/><br/> This parameter is set to `true` by default, and it shouldn't be changed. The older<br/> versions of Elastio stack used random names generated by CloudFormation for IAM<br/> resources, which is inconvenient to work with. New deployments that use the terraform<br/> automation should have this set to `true` for easier management of IAM resources. | `bool` | `true` | no |
| <a name="input_iam_resource_names_suffix"></a> [iam_resource_names_suffix](#input_iam_resource_names_suffix) | Add a custom prefix to names of all IAM resources deployed by this stack.<br/> The sum of the length of the prefix and suffix must not exceed 14 characters. | `string` | `null` | no |
| <a name="input_lambda_tracing"></a> [lambda_tracing](#input_lambda_tracing) | Enable AWS X-Ray tracing for Lambda functions. This increases the cost of<br/> the stack. Enable only if needed | `bool` | `null` | no |
| <a name="input_network_configuration"></a> [network_configuration](#input_network_configuration) | Can be set to either `Auto` or `Manual`. If set to `Auto`, Elastio will<br/> automatically create a VPC and subnets in the specified regions for the<br/> scan clusters to run in.<br/><br/> If set to `Manual`, you must provide the `vpc_id` and `subnet_ids` in the<br/> `region` module with the network config for each region. | `string` | `"Auto"` | no |
Expand Down
2 changes: 1 addition & 1 deletion connector/terraform/modules/account/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ variable "iam_resource_names_static" {
If enabled, the stack will use static resource names without random characters in them.

This parameter is set to `true` by default, and it shouldn't be changed. The older
versions of Elastio stack used random names generated by Cloudformation for IAM
versions of Elastio stack used random names generated by CloudFormation for IAM
resources, which is inconvenient to work with. New deployments that use the terraform
automation should have this set to `true` for easier management of IAM resources.
DESCR
Expand Down
2 changes: 1 addition & 1 deletion connector/terraform/modules/nat-provision/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `elastio-nat-provision` module

Creates an AWS Cloudformation stack named `elastio-nat-provision-lambda` which deploys NAT gateways in the private subnets where Elastio scan job workers run. This is necessary only if you deploy Elastio into private subnets that don't have outbound Internet access already. Alternatively, you can deploy your own NAT gateway if you want to.
Creates an AWS CloudFormation stack named `elastio-nat-provision-lambda` which deploys NAT gateways in the private subnets where Elastio scan job workers run. This is necessary only if you deploy Elastio into private subnets that don't have outbound Internet access already. Alternatively, you can deploy your own NAT gateway if you want to.

See the [`elastio-connector` module implementation](../../main.tf) for an example of how this module should be used.

Expand Down
4 changes: 2 additions & 2 deletions connector/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ variable "elastio_nat_provision_stack" {
description = <<DESCR
Specifies the version of Elastio NAT provision stack to deploy (e.g. `v5`).

This is a Cloudformation stack that automatically provisions NAT Gateways in
This is a CloudFormation stack that automatically provisions NAT Gateways in
your VPC when Elastio worker instances run to provide them with the outbound
Internet access when Elastio is deployed in private subnets.

Expand Down Expand Up @@ -173,7 +173,7 @@ variable "iam_resource_names_static" {
If enabled, the stack will use static resource names without random characters in them.

This parameter is set to `true` by default, and it shouldn't be changed. The older
versions of Elastio stack used random names generated by Cloudformation for IAM
versions of Elastio stack used random names generated by CloudFormation for IAM
resources, which is inconvenient to work with. New deployments that use the terraform
automation should have this set to `true` for easier management of IAM resources.
DESCR
Expand Down
3 changes: 3 additions & 0 deletions typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[default.extend-identifiers]

Cloudformation = "CloudFormation"