Skip to content

Commit

Permalink
Merge pull request #37 from lgallard/fix/update-provider-requirement
Browse files Browse the repository at this point in the history
Fix/update provider requirement
  • Loading branch information
lgallard authored Apr 22, 2021
2 parents db57ee6 + 9cf9be6 commit c404840
Show file tree
Hide file tree
Showing 19 changed files with 141 additions and 98 deletions.
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Local .terraform directories
**/.terraform/*

# .tfstate files
*.tfstate
*.tfstate.*

# Crash log files
crash.log

# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
# .tfvars files are managed as part of configuration and so should be included in
# version control.
#
# example.tfvars

# Ignore override files as they are usually used to override resources locally and so
# are not checked in
override.tf
override.tf.json
*_override.tf
*_override.tf.json

# Include override files you do wish to add to version control using negated pattern
#
# !example_override.tf

# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
# example: *tfplan*
16 changes: 16 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files
- id: detect-aws-credentials
- repo: git://github.com/antonbabenko/pre-commit-terraform
rev: v1.49.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
hooks:
- id: terraform_fmt
- id: terraform_validate
- id: terraform_docs
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
## 0.9.0 (April 12, 2021)
## 0.9.1 (April 22, 2021)

ENHANCEMENTS:

* Add pre-commit config file
* Add .gitignore file
* Update README

FIXES:

* Add AWS provider requirement (>= 3.35.0)

## 0.9.0 (April 12, 2021)

ENHANCEMENTS:

Expand Down
154 changes: 78 additions & 76 deletions README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AWS Elasticsearch domain with Advanced Security Options using master user ARN example
# AWS Elasticsearch domain with Advanced Security Options using master user ARN example

```
module "aws_es" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ data "aws_caller_identity" "current" {}

# To obtain the name of the AWS region configured on the provider
data "aws_region" "current" {}


Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ provider "aws" {
region = var.region
profile = var.profile
}

Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ variable "es_version" {}
variable "whitelist" {
default = []
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AWS Elasticsearch domain with Advanced Security Options using name and password example
# AWS Elasticsearch domain with Advanced Security Options using name and password example

```
module "aws_es" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ data "aws_caller_identity" "current" {}

# To obtain the name of the AWS region configured on the provider
data "aws_region" "current" {}


Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ provider "aws" {
region = var.region
profile = var.profile
}

Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ variable "es_version" {}
variable "whitelist" {
default = []
}

2 changes: 0 additions & 2 deletions examples/public/datasources.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ data "aws_caller_identity" "current" {}

# To obtain the name of the AWS region configured on the provider
data "aws_region" "current" {}


1 change: 0 additions & 1 deletion examples/public/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ provider "aws" {
region = var.region
profile = var.profile
}

1 change: 0 additions & 1 deletion examples/public/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ variable "es_version" {}
variable "whitelist" {
default = []
}

2 changes: 0 additions & 2 deletions examples/vpc/datasources.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ data "aws_caller_identity" "current" {}

# To obtain the name of the AWS region configured on the provider
data "aws_region" "current" {}


1 change: 0 additions & 1 deletion examples/vpc/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ provider "aws" {
region = var.region
profile = var.profile
}

6 changes: 3 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ variable "node_to_node_encryption_enabled" {
default = true
}

# cluster_config
# cluster_config
variable "cluster_config" {
description = "Cluster configuration of the domain"
type = map
Expand Down Expand Up @@ -268,7 +268,7 @@ variable "vpc_options_subnet_ids" {
default = []
}

# log_publishing_options
# log_publishing_options
variable "log_publishing_options" {
description = "Options for publishing slow logs to CloudWatch Logs"
type = map
Expand Down Expand Up @@ -300,7 +300,7 @@ variable "log_publishing_options_retention" {
}


# cognito_options
# cognito_options
variable "cognito_options" {
description = "Options for Amazon Cognito Authentication for Kibana"
type = map
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ terraform {
required_version = ">= 0.12.9"

required_providers {
aws = ">= 2.69.0"
aws = ">= 3.35.0"
}
}

0 comments on commit c404840

Please sign in to comment.