Skip to content

Commit 7ed5a8b

Browse files
authored
Merge branch 'main' into refactor-variables
2 parents 5d23628 + b8fdc06 commit 7ed5a8b

File tree

20 files changed

+99
-87
lines changed

20 files changed

+99
-87
lines changed

.checkov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
skip-check:
2+
# Ensure Terraform module sources use a commit hash
3+
# no attack vector here as we use external modules in the examples only
4+
- CKV_TF_1

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
id: ml
7171
# You can override MegaLinter flavor used to have faster performances
7272
# More info at https://megalinter.io/flavors/
73-
uses: oxsecurity/megalinter@v7.1.0
73+
uses: oxsecurity/megalinter@v7.3.0
7474
env:
7575
# All available variables are described in documentation
7676
# https://megalinter.io/configuration/

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
appInstallationValue: ${{ github.repository }}
2626
# bootstrap-sha and release-as needs to be removed after first release
2727
- name: Release
28-
uses: google-github-actions/release-please-action@8016a6649226f2ec88ed05441c11bb5410a22d29 # ratchet:google-github-actions/release-please-action@v3
28+
uses: google-github-actions/release-please-action@ca6063f4ed81b55db15b8c42d1b6f7925866342d # ratchet:google-github-actions/release-please-action@v3
2929
with:
3030
release-type: terraform-module
3131
token: ${{ steps.token.outputs.token }}

.mega-linter.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ DISABLE_LINTERS:
1212
# The tables created by TfDoc are not formatted according to the standard. And there is no option to deactivate the check for a
1313
# section of the file.
1414
- MARKDOWN_MARKDOWN_TABLE_FORMATTER
15-
# CSpell does a great job. No need for a second linter.
15+
# CSpell does a great job. No need for another spell checker
1616
- SPELL_MISSPELL
17+
- SPELL_LYCHEE
1718
# DevSkim as it has issues ignoring files/directories, e.g. .mypy_cache
1819
- REPOSITORY_DEVSKIM
1920

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [6.5.2](https://github.com/cattle-ops/terraform-aws-gitlab-runner/compare/6.5.1...6.5.2) (2023-08-31)
4+
5+
6+
### Bug Fixes
7+
8+
* remove empty elements from tag list ([#936](https://github.com/cattle-ops/terraform-aws-gitlab-runner/issues/936)) ([3b4a95e](https://github.com/cattle-ops/terraform-aws-gitlab-runner/commit/3b4a95ed75648d216f5d234b8e651f8bf2335f93))
9+
310
## [6.5.1](https://github.com/cattle-ops/terraform-aws-gitlab-runner/compare/6.5.0...6.5.1) (2023-06-06)
411

512

examples/runner-default/.terraform.lock.hcl

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/runner-default/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ check `.terraform-version` for the tested version.
3030
| Name | Version |
3131
|------|---------|
3232
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1 |
33-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.1.0 |
33+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.14.0 |
3434
| <a name="requirement_local"></a> [local](#requirement\_local) | 2.4.0 |
3535
| <a name="requirement_null"></a> [null](#requirement\_null) | 3.2.1 |
3636
| <a name="requirement_random"></a> [random](#requirement\_random) | 3.5.1 |
@@ -40,22 +40,22 @@ check `.terraform-version` for the tested version.
4040

4141
| Name | Version |
4242
|------|---------|
43-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.1.0 |
43+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.14.0 |
4444

4545
## Modules
4646

4747
| Name | Source | Version |
4848
|------|--------|---------|
4949
| <a name="module_runner"></a> [runner](#module\_runner) | ../../ | n/a |
50-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.0.0 |
51-
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.0.0 |
50+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.1.1 |
51+
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | 5.1.1 |
5252

5353
## Resources
5454

5555
| Name | Type |
5656
|------|------|
57-
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.1.0/docs/data-sources/availability_zones) | data source |
58-
| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.1.0/docs/data-sources/security_group) | data source |
57+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/5.14.0/docs/data-sources/availability_zones) | data source |
58+
| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/5.14.0/docs/data-sources/security_group) | data source |
5959

6060
## Inputs
6161

examples/runner-default/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ data "aws_security_group" "default" {
1111
# kics-scan ignore-line
1212
module "vpc" {
1313
source = "terraform-aws-modules/vpc/aws"
14-
version = "5.0.0"
14+
version = "5.1.1"
1515

1616
name = "vpc-${var.environment}"
1717
cidr = "10.0.0.0/16"
@@ -31,7 +31,7 @@ module "vpc" {
3131

3232
module "vpc_endpoints" {
3333
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
34-
version = "5.0.0"
34+
version = "5.1.1"
3535

3636
vpc_id = module.vpc.vpc_id
3737

examples/runner-default/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = "5.6.2"
7+
version = "5.14.0"
88
}
99
local = {
1010
source = "hashicorp/local"

examples/runner-docker/.terraform.lock.hcl

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)