support helm provider version 1.2.2

terraform-module · Jun 7, 2020 · 7a32dc0 · 7a32dc0
1 parent 03d2dc1
commit 7a32dc0
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 44 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,4 +1,4 @@
-name: validate
+name: commit-check
 # This workflow is triggered on pushes to the repository.
 on: [push, pull_request]
 
@@ -32,22 +32,3 @@ jobs:
       - name: Check All Files
         run: |
           pre-commit run --all-files
-
-  minimum:
-    name: Minimum version check
-    runs-on: ubuntu-latest
-    container:
-      image: hashicorp/terraform:0.12.25
-    steps:
-      - uses: actions/checkout@master
-      - name: Validate Code
-        env:
-          TF_WARN_OUTPUT_ERRORS: 1
-        run: |
-          cat > provider.tf <<~EOS
-          provider "aws" {
-            region  = "us-west-1"
-          }
-          EOS
-          terraform init
-          terraform validate -var "alias_name=test"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,7 +7,7 @@ on:
 env:
   WITH_V: true
   DEFAULT_BUMP: patch
-  INITIAL_VERSION: 0.0.0
+  INITIAL_VERSION: 0.12.0
   TERRAFORM_VERSION: 0.12
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
       with:
-        fetch-depth: '10'
+        fetch-depth: '1'
 
     - name: register values
       id: register
@@ -44,6 +44,6 @@ jobs:
         draft: false
         prerelease: false
         body: |
-          Changes in this Release ${{ steps.register.outputs.changelog }}
+          Changes in this Release ${{ steps.register.outputs.release_timestamp }}
           - ${{ steps.register.outputs.changelog }}
           - Terraform Version: ${{ env.TERRAFORM_VERSION }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.0.1
+  rev: v3.1.0
   hooks:
   - id: check-added-large-files
     args: ['--maxkb=500']
@@ -17,11 +17,12 @@ repos:
   - id: detect-aws-credentials
     args: ['--allow-missing-credentials']
 - repo: git://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.30.0
+  rev: v1.31.0
   hooks:
   - id: terraform_fmt
   - id: terraform_docs
-- repo: git://github.com/smian/pre-commit-makefile
+  - id: terraform_tflint
+- repo: https://github.com/smian/pre-commit-makefile.git
   rev: 261f8fb4b31dfdc05d1a1d7fbde1f1462ecde66d
   hooks:
   - id: makefile-doc
diff --git a/.tflint.hcl b/.tflint.hcl
@@ -1,6 +1,45 @@
 config {
   deep_check = false
-  ignore_rule = {}
   ignore_module = {}
   varfile = []
-}
+}
+
+rule "terraform_documented_variables" {
+  enabled = true
+}
+
+rule "terraform_documented_outputs" {
+  enabled = true
+}
+
+rule "terraform_comment_syntax" {
+  enabled = true
+}
+
+rule "terraform_naming_convention" {
+  enabled = true
+}
+
+rule "terraform_deprecated_interpolation" {
+  enabled = true
+}
+
+rule "terraform_deprecated_index" {
+  enabled = true
+}
+
+rule "terraform_required_providers" {
+  enabled = true
+}
+
+rule "terraform_required_version" {
+  enabled = true
+}
+
+rule "terraform_typed_variables" {
+  enabled = true
+}
+
+rule "terraform_unused_declarations" {
+  enabled = true
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,49 @@
 <a name="unreleased"></a>
 ## [Unreleased]
 
+
+
+<a name="v2.6.5"></a>
+## [v2.7.0] - 2020-06-07
+
+- support helm provider version 1.2.2
+- funding set. #skip
+
+
+<a name="v2.6.4"></a>
+## [v2.6.4] - 2020-05-17
+
+- job not releasing. #fix
+
+
+<a name="v2.6.3"></a>
+## [v2.6.3] - 2020-05-17
+
+- optinal set
+
+
+<a name="v2.6.2"></a>
+## [v2.6.2] - 2020-05-17
+
+- tflint fix
+
+
+<a name="v2.6.1"></a>
+## [v2.6.1] - 2020-05-17
+
+- readme update
+
+
 <a name="v2.6.0"></a>
 ## [v2.6.0] - 2020-05-17
 
-ENHANCEMENTS:
-- Use `set` argument. `set_string`: [DEPRECATED]
-- `app` values are optional. Waiting for `https://github.com/hashicorp/terraform/issues/19898`
+- remove deprecation warning. app no longer type safe. #minor
 
-BREAKING CHANGES:
-- Removed type check for `app` variable
 
 <a name="v2.5.0"></a>
 ## [v2.5.0] - 2020-03-22
 
+- version bump
 - wrong folder
 - merge 2.4 with master. add git flow
 - fixed bug with set sensitive
@@ -54,7 +84,13 @@ BREAKING CHANGES:
 - Initial commit
 
 
-[Unreleased]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.5.0...HEAD
+[Unreleased]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.7.0...HEAD
+[v2.7.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.4...v2.7.0
+[v2.6.4]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.3...v2.6.4
+[v2.6.3]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.2...v2.6.3
+[v2.6.2]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.1...v2.6.2
+[v2.6.1]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.0...v2.6.1
+[v2.6.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.5.0...v2.6.0
 [v2.5.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.4.0...v2.5.0
 [v2.4.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.3.0...v2.4.0
 [v2.3.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.2.0...v2.3.0

diff --git a/Makefile b/Makefile
@@ -15,6 +15,3 @@ validate: ## Validate with pre-commit hooks
 
 changelog: ## Update changelog
 	git-chglog -o CHANGELOG.md --next-tag `semtag final -s minor -o`
-
-release: ## Create release version
-	semtag final -s minor
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 [![](https://img.shields.io/github/license/terraform-module/terraform-helm-release)](https://github.com/terraform-module/terraform-helm-release)
 ![](https://img.shields.io/github/v/tag/terraform-module/terraform-helm-release)
-[![](https://img.shields.io/github/workflow/status/terraform-module/terraform-helm-release/validate/master)](https://github.com/terraform-module/terraform-helm-release/actions?query=is%3Acompleted)
-![](https://github.com/terraform-module/terraform-helm-release/workflows/Validator/badge.svg)
+[![](https://img.shields.io/github/workflow/status/terraform-module/terraform-helm-release/commit-check/master)](https://github.com/terraform-module/terraform-helm-release/actions?query=is%3Acommit-check)
+![](https://github.com/terraform-module/terraform-helm-release/workflows/commit-check/badge.svg)
 ![](https://img.shields.io/issues/github/terraform-module/terraform-helm-release)
 ![](https://img.shields.io/github/issues/terraform-module/terraform-helm-release)
 ![](https://img.shields.io/github/issues-closed/terraform-module/terraform-helm-release)
@@ -14,6 +14,25 @@
 ![](https://img.shields.io/github/contributors/terraform-module/terraform-helm-release)
 ![](https://img.shields.io/github/last-commit/terraform-module/terraform-helm-release)
 
+## Table Of Contents
+
+- [Helm Release Module](#helm-release-module)
+  * [Usage example](#usage-example)
+  * [Module Variables](#module-variables)
+  * [Requirements](#requirements)
+  * [Providers](#providers)
+  * [Inputs](#inputs)
+  * [Outputs](#outputs)
+  * [Commands](#commands)
+  * [Validate creation of components](#validate-creation-of-components)
+    + [:memo: Guidelines](#-memo--guidelines)
+  * [License](#license)
+  * [How to Contribute](#how-to-contribute)
+- [Authors](#authors)
+  * [Terraform Registry](#terraform-registry)
+
+<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
+
 ## Usage example
 
 Here's the gist of using it via github.
@@ -86,7 +105,7 @@ module jenkins {
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | app | an application to deploy | `map` | n/a | yes |
-| namespace | namespace where to deploy an application | `any` | n/a | yes |
+| namespace | namespace where to deploy an application | `string` | n/a | yes |
 | repository | Helm repository | `string` | n/a | yes |
 | set | Value block with custom STRING values to be merged with the values yaml. | <pre>list(object({<br>    name  = string<br>    value = string<br>  }))</pre> | `null` | no |
 | set\_sensitive | Value block with custom sensitive values to be merged with the values yaml that won't be exposed in the plan's diff. | <pre>list(object({<br>    path  = string<br>    value = string<br>  }))</pre> | `null` | no |
@@ -102,11 +121,10 @@ No output.
 
 <!-- START makefile-doc -->
 ```
-$ make help
+$ make help 
 hooks                          Commit hooks setup
 validate                       Validate with pre-commit hooks
-changelog                      Update changelog
-release                        Create release version
+changelog                      Update changelog 
 ```
 <!-- END makefile-doc -->
 

diff --git a/main.tf b/main.tf
@@ -9,6 +9,7 @@ resource helm_release this {
   wait          = lookup(var.app, "wait", true)
   recreate_pods = lookup(var.app, "recreate_pods", true)
   max_history   = lookup(var.app, "max_history", 0)
+  lint          = lookup(var.app, "lint", true)
   values        = var.values
 
   dynamic "set" {

diff --git a/variables.tf b/variables.tf
@@ -1,5 +1,6 @@
 variable "namespace" {
   description = "namespace where to deploy an application"
+  type        = string
 }
 
 variable "app" {
@@ -33,4 +34,4 @@ variable "set_sensitive" {
 variable "repository" {
   description = "Helm repository"
   type        = string
-}
+}