Skip to content

Commit 3a0298d

Browse files
committed
Merge remote-tracking branch 'origin/main' into oreilly-main
# Conflicts: # resources/cloudformation-stack_test.go
2 parents 83a1b4b + 9bf1118 commit 3a0298d

23 files changed

+586
-245
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
persist-credentials: false
2121
fetch-depth: 0
22-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
22+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
2323
with:
2424
go-version: '1.21.x'
2525
- name: generate-token

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
4040
- name: handle cache
41-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4
41+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
4242
with:
4343
key: mkdocs-material-${{ env.cache_id }}
4444
path: .cache

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
16-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
16+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
1717
with:
1818
go-version: '1.21.x'
1919
cache: false

.github/workflows/goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333
- name: setup-go
34-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
34+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
3535
with:
3636
go-version: 1.21.x
3737
- name: setup qemu
@@ -41,7 +41,7 @@ jobs:
4141
id: buildx
4242
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
4343
- name: Login to GitHub Container Registry
44-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
44+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
4545
with:
4646
registry: ghcr.io
4747
username: ${{ github.actor }}

.github/workflows/semantic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: setup node.js
26-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
26+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
2727
with:
2828
node-version: "lts/*"
2929
- name: generate-token

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
17-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
17+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
1818
with:
1919
go-version: '1.21.x'
2020
- name: download go mods

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ cosign.key
66
/*-config.yaml
77
/config.*.yaml
88
*.p12
9-
*.p8
9+
*.p8
10+
**/public

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.13-labs@sha256:d4250176a22a73cb8cdeb0cdcd3ea65d39baad1245f2f1dcb5eceadedd0518b8
1+
# syntax=docker/dockerfile:1.14-labs@sha256:bbd3af5735ce9921cfa2a8b59d1006445333e161cb4582c3d88aad0730d9b207
22
FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c as base
33
RUN apk add --no-cache ca-certificates
44
RUN adduser -D aws-nuke

docs/resources/dsql-cluster.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
generated: true
3+
---
4+
5+
# DSQLCluster
6+
7+
8+
## Resource
9+
10+
```text
11+
DSQLCluster
12+
```
13+
14+
## Properties
15+
16+
17+
- `Arn`: The ARN of the cluster
18+
- `CreationTime`: The creation timestamp of the cluster
19+
- `DeletionProtectionEnabled`: Boolean indicating cluster deletion prevention
20+
- `Identifier`: The identifier of the cluster (eg. iiabt5az32iwdnj4xpxwl5mz3e)
21+
- `Status`: The status of the cluster at list time
22+
- `tag:<key>:`: This resource has tags with property `Tags`. These are key/value pairs that are
23+
added as their own property with the prefix of `tag:` (e.g. [tag:example: "value"])
24+
25+
!!! note - Using Properties
26+
Properties are what [Filters](../config-filtering.md) are written against in your configuration. You use the property
27+
names to write filters for what you want to **keep** and omit from the nuke process.
28+
29+
### String Property
30+
31+
The string representation of a resource is generally the value of the Name, ID or ARN field of the resource. Not all
32+
resources support properties. To write a filter against the string representation, simply omit the `property` field in
33+
the filter.
34+
35+
The string value is always what is used in the output of the log format when a resource is identified.
36+
37+
## Settings
38+
39+
- `DisableDeletionProtection`
40+
41+
42+
### DisableDeletionProtection
43+
44+
!!! note
45+
There is currently no description for this setting. Often times settings are fairly self-explanatory. However, we
46+
are working on adding descriptions for all settings.
47+
48+
```text
49+
DisableDeletionProtection
50+
```
51+

docs/resources/neptune-graph.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
generated: true
3+
---
4+
5+
# NeptuneGraph
6+
7+
8+
## Resource
9+
10+
```text
11+
NeptuneGraph
12+
```
13+
14+
## Properties
15+
16+
17+
- `Arn`: The Neptune Graph resource ARN
18+
- `ID`: The Neptune Graph identifier (e.g. g-prz5mldixa)
19+
- `Name`: The name of the Neptune Graph
20+
- `Status`: The status of the Neptune Graph (e.g. Available/Deleting/Updating)
21+
- `tag:<key>:`: This resource has tags with property `Tags`. These are key/value pairs that are
22+
added as their own property with the prefix of `tag:` (e.g. [tag:example: "value"])
23+
24+
!!! note - Using Properties
25+
Properties are what [Filters](../config-filtering.md) are written against in your configuration. You use the property
26+
names to write filters for what you want to **keep** and omit from the nuke process.
27+
28+
### String Property
29+
30+
The string representation of a resource is generally the value of the Name, ID or ARN field of the resource. Not all
31+
resources support properties. To write a filter against the string representation, simply omit the `property` field in
32+
the filter.
33+
34+
The string value is always what is used in the output of the log format when a resource is identified.
35+
36+
## Settings
37+
38+
- `DisableDeletionProtection`
39+
40+
41+
### DisableDeletionProtection
42+
43+
!!! note
44+
There is currently no description for this setting. Often times settings are fairly self-explanatory. However, we
45+
are working on adding descriptions for all settings.
46+
47+
```text
48+
DisableDeletionProtection
49+
```
50+

go.mod

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@ require (
88
github.com/aws/aws-sdk-go v1.55.6
99
github.com/aws/aws-sdk-go-v2 v1.36.3
1010
github.com/aws/aws-sdk-go-v2/config v1.28.11
11-
github.com/aws/aws-sdk-go-v2/credentials v1.17.60
11+
github.com/aws/aws-sdk-go-v2/credentials v1.17.62
1212
github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.12
1313
github.com/aws/aws-sdk-go-v2/service/appsync v1.42.3
14-
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.11
14+
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.12
1515
github.com/aws/aws-sdk-go-v2/service/dsql v1.1.1
16+
github.com/aws/aws-sdk-go-v2/service/ecs v1.54.2
1617
github.com/aws/aws-sdk-go-v2/service/iam v1.38.10
17-
github.com/aws/aws-sdk-go-v2/service/route53profiles v1.4.16
18+
github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.17.2
19+
github.com/aws/aws-sdk-go-v2/service/route53profiles v1.4.17
1820
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.3
1921
github.com/aws/aws-sdk-go-v2/service/s3control v1.52.7
2022
github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.3.10
21-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.15
23+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17
2224
github.com/aws/aws-sdk-go-v2/service/transfer v1.55.5
2325
github.com/aws/smithy-go v1.22.3
24-
github.com/ekristen/libnuke v0.24.3
26+
github.com/ekristen/libnuke v0.24.5
2527
github.com/fatih/color v1.18.0
2628
github.com/golang/mock v1.6.0
2729
github.com/google/uuid v1.6.0
@@ -30,25 +32,25 @@ require (
3032
github.com/pkg/errors v0.9.1
3133
github.com/sirupsen/logrus v1.9.3
3234
github.com/stretchr/testify v1.10.0
33-
github.com/urfave/cli/v2 v2.27.5
35+
github.com/urfave/cli/v2 v2.27.6
3436
go.uber.org/ratelimit v0.3.1
3537
golang.org/x/text v0.22.0
3638
gopkg.in/yaml.v3 v3.0.1
3739
)
3840

3941
require (
4042
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
41-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.29 // indirect
43+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
4244
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
4345
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
4446
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
4547
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 // indirect
4648
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
4749
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
4951
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.10 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.16 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
5254
github.com/benbjohnson/clock v1.3.0 // indirect
5355
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
5456
github.com/davecgh/go-spew v1.1.1 // indirect

0 commit comments

Comments
 (0)