Skip to content

Commit 7a32dc0

Browse files
support helm provider version 1.2.2
1 parent 03d2dc1 commit 7a32dc0

File tree

9 files changed

+118
-44
lines changed

9 files changed

+118
-44
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: validate
1+
name: commit-check
22
# This workflow is triggered on pushes to the repository.
33
on: [push, pull_request]
44

@@ -32,22 +32,3 @@ jobs:
3232
- name: Check All Files
3333
run: |
3434
pre-commit run --all-files
35-
36-
minimum:
37-
name: Minimum version check
38-
runs-on: ubuntu-latest
39-
container:
40-
image: hashicorp/terraform:0.12.25
41-
steps:
42-
- uses: actions/checkout@master
43-
- name: Validate Code
44-
env:
45-
TF_WARN_OUTPUT_ERRORS: 1
46-
run: |
47-
cat > provider.tf <<~EOS
48-
provider "aws" {
49-
region = "us-west-1"
50-
}
51-
EOS
52-
terraform init
53-
terraform validate -var "alias_name=test"

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
WITH_V: true
99
DEFAULT_BUMP: patch
10-
INITIAL_VERSION: 0.0.0
10+
INITIAL_VERSION: 0.12.0
1111
TERRAFORM_VERSION: 0.12
1212

1313
jobs:
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@master
2020
with:
21-
fetch-depth: '10'
21+
fetch-depth: '1'
2222

2323
- name: register values
2424
id: register
@@ -44,6 +44,6 @@ jobs:
4444
draft: false
4545
prerelease: false
4646
body: |
47-
Changes in this Release ${{ steps.register.outputs.changelog }}
47+
Changes in this Release ${{ steps.register.outputs.release_timestamp }}
4848
- ${{ steps.register.outputs.changelog }}
4949
- Terraform Version: ${{ env.TERRAFORM_VERSION }}

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v3.0.1
3+
rev: v3.1.0
44
hooks:
55
- id: check-added-large-files
66
args: ['--maxkb=500']
@@ -17,11 +17,12 @@ repos:
1717
- id: detect-aws-credentials
1818
args: ['--allow-missing-credentials']
1919
- repo: git://github.com/antonbabenko/pre-commit-terraform
20-
rev: v1.30.0
20+
rev: v1.31.0
2121
hooks:
2222
- id: terraform_fmt
2323
- id: terraform_docs
24-
- repo: git://github.com/smian/pre-commit-makefile
24+
- id: terraform_tflint
25+
- repo: https://github.com/smian/pre-commit-makefile.git
2526
rev: 261f8fb4b31dfdc05d1a1d7fbde1f1462ecde66d
2627
hooks:
2728
- id: makefile-doc

.tflint.hcl

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,45 @@
11
config {
22
deep_check = false
3-
ignore_rule = {}
43
ignore_module = {}
54
varfile = []
6-
}
5+
}
6+
7+
rule "terraform_documented_variables" {
8+
enabled = true
9+
}
10+
11+
rule "terraform_documented_outputs" {
12+
enabled = true
13+
}
14+
15+
rule "terraform_comment_syntax" {
16+
enabled = true
17+
}
18+
19+
rule "terraform_naming_convention" {
20+
enabled = true
21+
}
22+
23+
rule "terraform_deprecated_interpolation" {
24+
enabled = true
25+
}
26+
27+
rule "terraform_deprecated_index" {
28+
enabled = true
29+
}
30+
31+
rule "terraform_required_providers" {
32+
enabled = true
33+
}
34+
35+
rule "terraform_required_version" {
36+
enabled = true
37+
}
38+
39+
rule "terraform_typed_variables" {
40+
enabled = true
41+
}
42+
43+
rule "terraform_unused_declarations" {
44+
enabled = true
45+
}

CHANGELOG.md

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,49 @@
11
<a name="unreleased"></a>
22
## [Unreleased]
33

4+
5+
6+
<a name="v2.6.5"></a>
7+
## [v2.7.0] - 2020-06-07
8+
9+
- support helm provider version 1.2.2
10+
- funding set. #skip
11+
12+
13+
<a name="v2.6.4"></a>
14+
## [v2.6.4] - 2020-05-17
15+
16+
- job not releasing. #fix
17+
18+
19+
<a name="v2.6.3"></a>
20+
## [v2.6.3] - 2020-05-17
21+
22+
- optinal set
23+
24+
25+
<a name="v2.6.2"></a>
26+
## [v2.6.2] - 2020-05-17
27+
28+
- tflint fix
29+
30+
31+
<a name="v2.6.1"></a>
32+
## [v2.6.1] - 2020-05-17
33+
34+
- readme update
35+
36+
437
<a name="v2.6.0"></a>
538
## [v2.6.0] - 2020-05-17
639

7-
ENHANCEMENTS:
8-
- Use `set` argument. `set_string`: [DEPRECATED]
9-
- `app` values are optional. Waiting for `https://github.com/hashicorp/terraform/issues/19898`
40+
- remove deprecation warning. app no longer type safe. #minor
1041

11-
BREAKING CHANGES:
12-
- Removed type check for `app` variable
1342

1443
<a name="v2.5.0"></a>
1544
## [v2.5.0] - 2020-03-22
1645

46+
- version bump
1747
- wrong folder
1848
- merge 2.4 with master. add git flow
1949
- fixed bug with set sensitive
@@ -54,7 +84,13 @@ BREAKING CHANGES:
5484
- Initial commit
5585

5686

57-
[Unreleased]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.5.0...HEAD
87+
[Unreleased]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.7.0...HEAD
88+
[v2.7.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.4...v2.7.0
89+
[v2.6.4]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.3...v2.6.4
90+
[v2.6.3]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.2...v2.6.3
91+
[v2.6.2]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.1...v2.6.2
92+
[v2.6.1]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.6.0...v2.6.1
93+
[v2.6.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.5.0...v2.6.0
5894
[v2.5.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.4.0...v2.5.0
5995
[v2.4.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.3.0...v2.4.0
6096
[v2.3.0]: https://github.com/terraform-module/terraform-helm-release.git/compare/v2.2.0...v2.3.0

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@ validate: ## Validate with pre-commit hooks
1515

1616
changelog: ## Update changelog
1717
git-chglog -o CHANGELOG.md --next-tag `semtag final -s minor -o`
18-
19-
release: ## Create release version
20-
semtag final -s minor

README.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![](https://img.shields.io/github/license/terraform-module/terraform-helm-release)](https://github.com/terraform-module/terraform-helm-release)
44
![](https://img.shields.io/github/v/tag/terraform-module/terraform-helm-release)
5-
[![](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)
6-
![](https://github.com/terraform-module/terraform-helm-release/workflows/Validator/badge.svg)
5+
[![](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)
6+
![](https://github.com/terraform-module/terraform-helm-release/workflows/commit-check/badge.svg)
77
![](https://img.shields.io/issues/github/terraform-module/terraform-helm-release)
88
![](https://img.shields.io/github/issues/terraform-module/terraform-helm-release)
99
![](https://img.shields.io/github/issues-closed/terraform-module/terraform-helm-release)
@@ -14,6 +14,25 @@
1414
![](https://img.shields.io/github/contributors/terraform-module/terraform-helm-release)
1515
![](https://img.shields.io/github/last-commit/terraform-module/terraform-helm-release)
1616

17+
## Table Of Contents
18+
19+
- [Helm Release Module](#helm-release-module)
20+
* [Usage example](#usage-example)
21+
* [Module Variables](#module-variables)
22+
* [Requirements](#requirements)
23+
* [Providers](#providers)
24+
* [Inputs](#inputs)
25+
* [Outputs](#outputs)
26+
* [Commands](#commands)
27+
* [Validate creation of components](#validate-creation-of-components)
28+
+ [:memo: Guidelines](#-memo--guidelines)
29+
* [License](#license)
30+
* [How to Contribute](#how-to-contribute)
31+
- [Authors](#authors)
32+
* [Terraform Registry](#terraform-registry)
33+
34+
<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
35+
1736
## Usage example
1837

1938
Here's the gist of using it via github.
@@ -86,7 +105,7 @@ module jenkins {
86105
| Name | Description | Type | Default | Required |
87106
|------|-------------|------|---------|:--------:|
88107
| app | an application to deploy | `map` | n/a | yes |
89-
| namespace | namespace where to deploy an application | `any` | n/a | yes |
108+
| namespace | namespace where to deploy an application | `string` | n/a | yes |
90109
| repository | Helm repository | `string` | n/a | yes |
91110
| 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 |
92111
| 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.
102121

103122
<!-- START makefile-doc -->
104123
```
105-
$ make help
124+
$ make help
106125
hooks Commit hooks setup
107126
validate Validate with pre-commit hooks
108-
changelog Update changelog
109-
release Create release version
127+
changelog Update changelog
110128
```
111129
<!-- END makefile-doc -->
112130

main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ resource helm_release this {
99
wait = lookup(var.app, "wait", true)
1010
recreate_pods = lookup(var.app, "recreate_pods", true)
1111
max_history = lookup(var.app, "max_history", 0)
12+
lint = lookup(var.app, "lint", true)
1213
values = var.values
1314

1415
dynamic "set" {

variables.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
variable "namespace" {
22
description = "namespace where to deploy an application"
3+
type = string
34
}
45

56
variable "app" {
@@ -33,4 +34,4 @@ variable "set_sensitive" {
3334
variable "repository" {
3435
description = "Helm repository"
3536
type = string
36-
}
37+
}

0 commit comments

Comments
 (0)