Skip to content

Commit af37be8

Browse files
authored
Merge branch 'main' into release-please--branches--main
2 parents 6f7c3c9 + ef658ed commit af37be8

File tree

11 files changed

+46
-38
lines changed

11 files changed

+46
-38
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"cpu",
9494
"cpus",
9595
"cpuset",
96+
"exfiltration",
9697
"gitter",
9798
"imds",
9899
"netsh",

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
kics:
6060
runs-on: ubuntu-latest
6161
container:
62-
image: checkmarx/kics:v2.1.13-debian@sha256:5dcabefe00678cdb539f6ddbc60e47304d7f7c4ee35b21e183156ec69c0bbafc
62+
image: checkmarx/kics:v2.1.14-debian@sha256:65bbc05cc9531e3cd6485c407c2f07f04516bb8fb7a6cfeb5f84bc6b78598e2f
6363
steps:
6464
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
6565
# ignore: "tags not used", "access analyzer not used", "shield advanced not used"
@@ -72,13 +72,13 @@ jobs:
7272
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
7373
name: Checkout source code
7474

75-
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
75+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
7676
name: Cache plugin dir
7777
with:
7878
path: ~/.tflint.d/plugins
7979
key: tflint-${{ hashFiles('.tflint.hcl') }}
8080

81-
- uses: terraform-linters/setup-tflint@ae78205cfffec9e8d93fd2b3115c7e9d3166d4b6 # v5
81+
- uses: terraform-linters/setup-tflint@acd1575d3c037258ce5b2dd01379dc49ce24c6b7 # v6
8282
name: Setup TFLint
8383
env:
8484
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/feature_branch-megalinter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: ml
3131
# You can override MegaLinter flavor used to have faster performances
3232
# More info at https://megalinter.io/flavors/
33-
uses: oxsecurity/megalinter@e08c2b05e3dbc40af4c23f41172ef1e068a7d651 # v8.8.0
33+
uses: oxsecurity/megalinter@62c799d895af9bcbca5eacfebca29d527f125a57 # v9.1.0
3434
env:
3535
# All available variables are described in documentation
3636
# https://megalinter.io/configuration/

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
pull-requests: write
1616
steps:
17-
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10
17+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
1818
with:
1919
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
2020
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 15 days.'

.github/workflows/tfsec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
sarif_file: tfsec.sarif
3535

3636
- name: Upload SARIF file
37-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
37+
uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
3838
with:
3939
# Path to SARIF file relative to the root of the repository
4040
sarif_file: tfsec.sarif

.terraform.lock.hcl

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

.tflint.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ plugin "terraform" {
55

66
plugin "aws" {
77
enabled = true
8-
version = "0.42.0"
8+
version = "0.43.0"
99
source = "github.com/terraform-linters/tflint-ruleset-aws"
1010
}

main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,11 @@ resource "aws_iam_instance_profile" "instance" {
357357
tags = local.tags
358358
}
359359

360+
# "AWS EIP not attached to any instance": we attach it via user-data script
361+
# kics-scan ignore-block
360362
resource "aws_eip" "gitlab_runner" {
361363
# checkov:skip=CKV2_AWS_19:We can't use NAT gateway here as we are contacted from the outside.
364+
# checkov:skip=CKV2_AWS_20:We can't use NAT gateway here as we are contacted from the outside.
362365
count = var.runner_instance.use_eip ? 1 : 0
363366

364367
tags = local.tags

modules/cache/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ data "aws_iam_policy_document" "docker_machine_cache_policy" {
132132
sid = "allowGitLabRunnersAccessCache"
133133
effect = "Allow"
134134
resources = ["${aws_s3_bucket.build_cache.arn}/*"] # tfsec:ignore:aws-iam-no-policy-wildcards # allows full access to the own bucket
135+
# "IAM policy allows for data exfiltration": resources are specified below, so we can't access any other objects
136+
# kics-scan ignore-line
135137
actions = [
136138
"s3:PutObject",
137139
"s3:PutObjectAcl",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
boto3 == 1.40.30
2-
botocore == 1.40.30
1+
boto3 ==1.40.48
2+
botocore ==1.40.48

0 commit comments

Comments
 (0)