Skip to content

Commit

Permalink
Ready branch for merge
Browse files Browse the repository at this point in the history
  • Loading branch information
bjfish25 committed Jan 17, 2025
1 parent 7a072b7 commit 959c49f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions cmd/codebuild/reset/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ func nukeAccount(svc *service, isDryRun bool) error {
ChildAccountID: config.childAccountID,
RoleName: config.accountAdminRoleName,
ConfigPath: configFile,
NoDryRun: !isDryRun,
Token: svc.tokenService(),
}

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/aws/aws-sdk-go v1.55.5
github.com/awslabs/aws-lambda-go-api-proxy v0.8.0
github.com/caarlos0/env v3.5.0+incompatible
github.com/ekristen/libnuke v0.24.0
github.com/ekristen/libnuke v0.24.1
github.com/go-ozzo/ozzo-validation v3.6.0+incompatible
github.com/google/uuid v1.6.0
github.com/gorilla/handlers v1.5.2
Expand Down Expand Up @@ -137,4 +137,4 @@ require (
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
)

replace github.com/ekristen/aws-nuke/v3 => github.com/Optum/aws-nuke-new/v3 v3.35.2-0.20250107173557-e7fb07ab857e
replace github.com/ekristen/aws-nuke/v3 => github.com/Optum/aws-nuke-new/v3 v3.44.1
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3
github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Optum/aws-nuke-new/v3 v3.35.2-0.20250107173557-e7fb07ab857e h1:CNfXwr3lFIK7MkoJ5jFnqXA/kpZyoQGScLDr//MF6JA=
github.com/Optum/aws-nuke-new/v3 v3.35.2-0.20250107173557-e7fb07ab857e/go.mod h1:WfGJAVxJmNVfRW6AhNeeEBF0NskRAQ7bpq7elt4+5ek=
github.com/Optum/aws-nuke-new/v3 v3.44.1 h1:56UGksoUhcI+cD0upXSQXTL/ozfH+vCEbkYvBRVnGI4=
github.com/Optum/aws-nuke-new/v3 v3.44.1/go.mod h1:0JyNx/YCEhGNs56hOxMH3QeBZsLtwlDLME4NJiGqY5Q=
github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
Expand Down Expand Up @@ -318,8 +318,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
github.com/ekristen/libnuke v0.24.0 h1:DCzkOwT+n/2G37KoNSlTOU1DoAVcBgtdaJSNpQl6NJw=
github.com/ekristen/libnuke v0.24.0/go.mod h1:+hh3UCSxmkfBweQJv9pa5twY82n7MhO4DK+AA+oUoTM=
github.com/ekristen/libnuke v0.24.1 h1:vm4+KA8d+VJ7MTrAlQhW6XxnG9yrPW1f5MNMlui9tT0=
github.com/ekristen/libnuke v0.24.1/go.mod h1:+hh3UCSxmkfBweQJv9pa5twY82n7MhO4DK+AA+oUoTM=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand Down
1 change: 1 addition & 0 deletions pkg/reset/nuke.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type NukeAccountInput struct {
ChildAccountID string
RoleName string
ConfigPath string
NoDryRun bool
Token common.TokenService
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/reset/nuker.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func NewNuker(parsedConfig *config.Config, nukeInput *NukeAccountInput) (*Nuker,
params := &libnuke.Parameters{
Force: true,
ForceSleep: 5,
NoDryRun: false,
NoDryRun: nukeInput.NoDryRun,
MaxWaitRetries: 100,
}

Expand Down

0 comments on commit 959c49f

Please sign in to comment.