Merge branch 'main' into oreilly-main

Author: sstoops

.github/renovate.json

@@ -47,8 +47,8 @@
     "customManagers": [
         {
             "customType": "regex",
-            "fileMatch": [
-                "^.github/workflows/.*"
+            "managerFilePatterns": [
+                "/^.github/workflows/.*/"
             ],
             "matchStrings": [
                 "go-version: (?<currentValue>.*?)\n"

.github/workflows/aws-sdk-mocks.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: '1.21.x'
       - name: generate-token

.github/workflows/docs.yaml

@@ -31,14 +31,14 @@ jobs:
       - name: setup pages
         uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
       - name: setup python
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: 3.x
       - name: setup cache
         run: |
           echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
       - name: handle cache
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache

.github/workflows/golangci-lint.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: '1.21.x'
           cache: false

.github/workflows/goreleaser.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: setup-go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: 1.21.x
       - name: setup qemu
@@ -79,7 +79,7 @@ jobs:
           QUILL_SIGN_PASSWORD: ${{ secrets.OP_QUILL_SIGN_PASSWORD }}
           QUILL_SIGN_P12: ${{ secrets.OP_QUILL_SIGN_P12 }}
       - name: run goreleaser
-        uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6
+        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6
         with:
           distribution: goreleaser
           version: latest
@@ -92,7 +92,7 @@ jobs:
           docker images --format "{{.Repository}}:{{.Tag}}" | grep "${{ github.repository }}" | xargs -L1 docker push
       - name: upload artifacts
         if: ${{ github.event.pull_request.base.ref == 'main' || github.event_name == 'workflow_dispatch' }}
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: binaries
           path: releases/*.tar.gz

.github/workflows/semantic.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: setup node.js
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: "lts/*"
       - name: generate-token

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: '1.21.x'
       - name: download go mods

Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.14-labs@sha256:bbd3af5735ce9921cfa2a8b59d1006445333e161cb4582c3d88aad0730d9b207
+# syntax=docker/dockerfile:1.15-labs@sha256:94edd5b349df43675bd6f542e2b9a24e7177432dec45fe3066bfcf2ab14c4355
 FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c as base
 RUN apk add --no-cache ca-certificates
 RUN adduser -D aws-nuke

docs/config-custom-endpoints.md

@@ -41,7 +41,7 @@ endpoints:
       - service: acm
         url: https://10.16.145.115/api/v2/aws/acm
 
-account-blocklist:
+blocklist:
   - "account-id-of-custom-region-prod" # production
 
 accounts:
@@ -84,4 +84,4 @@ demo10 - EC2Volume - vol-db80932fb47243efa67c9dd34223c647 - [tag:Name: "web-serv
 demo10 - EC2Volume - vol-dbea1d1083654d30a43366807a125aed - [tag:Name: "volume-555e9f8a"] - would remove
 
 --- truncating long output ---
-```
+```

docs/config-filtering.md

@@ -96,7 +96,7 @@ The following are comparisons  that you can use to filter resources. These are u
 - `exact`
 - `contains`
 - `glob`
-- `regex` 
+- `regex`
 - `dateOlderThan`
 - `dateOlderThanNow`
 
@@ -242,7 +242,7 @@ presets:
 If the current time is `2024-10-15T00:00:00Z`, then the modified now time is `2024-10-14T12:00:00Z`.
 
 If the value of `LastUsedDate` is `2024-10-14T14:30:00Z` then the result of the filter will be `true`. It is **NOT**
-older than the modified time, and since the invert is set to true, anything **newer** to the modified time is filtered. 
+older than the modified time, and since the invert is set to true, anything **newer** to the modified time is filtered.
 
 If the value of `LastUsedDate` is `2024-10-13T12:30:00Z` then the result of the filter will be `false` and the resource
 will be marked for removal.
@@ -251,7 +251,7 @@ will be marked for removal.
 
 By default, when writing a filter if you do not specify a property, it will use the `Name` property. However, resources
 that do no support Properties, aws-nuke will fall back to what is called the `Legacy String`, it's essentially a
-function that returns a string representation of the resource. 
+function that returns a string representation of the resource.
 
 Some resources support filtering via properties. When a resource support these properties, they will be listed in
 the output like in this example:
@@ -310,7 +310,7 @@ presets:
 
 It is possible to filter this is important for not deleting the current user for example or for resources like S3
 Buckets which have a globally shared namespace and might be hard to recreate. Currently, the filtering is based on
-the resource identifier. The identifier will be printed as the first step of *aws-nuke* (eg `i-01b489457a60298dd` 
+the resource identifier. The identifier will be printed as the first step of *aws-nuke* (eg `i-01b489457a60298dd`
 for an EC2 instance).
 
 !!! warning
@@ -327,7 +327,7 @@ regions:
   - global
   - us-east-1
 
-account-blocklist:
+blocklist:
   - 1234567890
 
 accounts:
@@ -361,7 +361,7 @@ regions:
   - "global"
   - "eu-west-1"
 
-account-blocklist:
+blocklist:
   - 1234567890
 
 accounts:
@@ -408,7 +408,7 @@ It is also possible to configure the resource types in the config file like in t
 regions:
   - "us-east-1"
 
-account-blocklist:
+blocklist:
   - 1234567890
 
 resource-types:
@@ -427,7 +427,7 @@ accounts:
 regions:
   - "us-east-1"
 
-account-blocklist:
+blocklist:
   - 1234567890
 
 resource-types: