Merge pull request #198 from ekristen/housekeeping

chore: housekeeping - addressing a few issues

.goreleaser.yml

@@ -24,6 +24,8 @@ builds:
         goarch: arm
       - goos: darwin
         goarch: arm
+    flags:
+      - -trimpath
     ldflags:
       - -s
       - -w

README.md

@@ -4,6 +4,10 @@
 [![release](https://img.shields.io/github/release/ekristen/aws-nuke.svg)](https://github.com/ekristen/aws-nuke/releases)
 [![Go Report Card](https://goreportcard.com/badge/github.com/ekristen/aws-nuke)](https://goreportcard.com/report/github.com/ekristen/aws-nuke)
 [![Maintainability](https://api.codeclimate.com/v1/badges/bf05fb12c69f1ea7f257/maintainability)](https://codeclimate.com/github/ekristen/aws-nuke/maintainability)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/ekristen/aws-nuke/total)
+![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/ekristen/aws-nuke/latest/total)
+
+
 
 ## Overview
 

go.mod

@@ -1,4 +1,4 @@
-module github.com/ekristen/aws-nuke
+module github.com/ekristen/aws-nuke/v3
 
 go 1.21.6
 

main.go

@@ -6,14 +6,14 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 
-	"github.com/ekristen/aws-nuke/pkg/common"
+	"github.com/ekristen/aws-nuke/v3/pkg/common"
 
-	_ "github.com/ekristen/aws-nuke/pkg/commands/account"
-	_ "github.com/ekristen/aws-nuke/pkg/commands/config"
-	_ "github.com/ekristen/aws-nuke/pkg/commands/list"
-	_ "github.com/ekristen/aws-nuke/pkg/commands/nuke"
+	_ "github.com/ekristen/aws-nuke/v3/pkg/commands/account"
+	_ "github.com/ekristen/aws-nuke/v3/pkg/commands/config"
+	_ "github.com/ekristen/aws-nuke/v3/pkg/commands/list"
+	_ "github.com/ekristen/aws-nuke/v3/pkg/commands/nuke"
 
-	_ "github.com/ekristen/aws-nuke/resources"
+	_ "github.com/ekristen/aws-nuke/v3/resources"
 )
 
 func main() {

pkg/awsutil/account.go

@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/sts"
 
-	"github.com/ekristen/aws-nuke/pkg/config"
+	"github.com/ekristen/aws-nuke/v3/pkg/config"
 )
 
 type Account struct {

pkg/awsutil/session.go

@@ -17,7 +17,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3control"
 
-	"github.com/ekristen/aws-nuke/pkg/config"
+	"github.com/ekristen/aws-nuke/v3/pkg/config"
 	liberrors "github.com/ekristen/libnuke/pkg/errors"
 )
 

pkg/awsutil/util_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ekristen/aws-nuke/pkg/awsutil"
+	"github.com/ekristen/aws-nuke/v3/pkg/awsutil"
 )
 
 func TestSecretRegex(t *testing.T) {

pkg/commands/account/account.go

@@ -11,11 +11,11 @@ import (
 	libconfig "github.com/ekristen/libnuke/pkg/config"
 	"github.com/ekristen/libnuke/pkg/registry"
 
-	"github.com/ekristen/aws-nuke/pkg/awsutil"
-	"github.com/ekristen/aws-nuke/pkg/commands/global"
-	"github.com/ekristen/aws-nuke/pkg/commands/nuke"
-	"github.com/ekristen/aws-nuke/pkg/common"
-	"github.com/ekristen/aws-nuke/pkg/config"
+	"github.com/ekristen/aws-nuke/v3/pkg/awsutil"
+	"github.com/ekristen/aws-nuke/v3/pkg/commands/global"
+	"github.com/ekristen/aws-nuke/v3/pkg/commands/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/common"
+	"github.com/ekristen/aws-nuke/v3/pkg/config"
 )
 
 func execute(c *cli.Context) error {

pkg/commands/config/config.go

@@ -11,11 +11,11 @@ import (
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/awsutil"
-	"github.com/ekristen/aws-nuke/pkg/commands/global"
-	"github.com/ekristen/aws-nuke/pkg/commands/nuke"
-	"github.com/ekristen/aws-nuke/pkg/common"
-	"github.com/ekristen/aws-nuke/pkg/config"
+	"github.com/ekristen/aws-nuke/v3/pkg/awsutil"
+	"github.com/ekristen/aws-nuke/v3/pkg/commands/global"
+	"github.com/ekristen/aws-nuke/v3/pkg/commands/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/common"
+	"github.com/ekristen/aws-nuke/v3/pkg/config"
 )
 
 func execute(c *cli.Context) error { //nolint:funlen,gocyclo

pkg/commands/list/list.go

@@ -7,10 +7,10 @@ import (
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
 
-	"github.com/ekristen/aws-nuke/pkg/commands/global"
-	"github.com/ekristen/aws-nuke/pkg/common"
+	"github.com/ekristen/aws-nuke/v3/pkg/commands/global"
+	"github.com/ekristen/aws-nuke/v3/pkg/common"
 
-	_ "github.com/ekristen/aws-nuke/resources"
+	_ "github.com/ekristen/aws-nuke/v3/resources"
 	"github.com/ekristen/libnuke/pkg/registry"
 )
 

pkg/commands/nuke/nuke.go

@@ -18,11 +18,11 @@ import (
 	"github.com/ekristen/libnuke/pkg/scanner"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/awsutil"
-	"github.com/ekristen/aws-nuke/pkg/commands/global"
-	"github.com/ekristen/aws-nuke/pkg/common"
-	"github.com/ekristen/aws-nuke/pkg/config"
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/awsutil"
+	"github.com/ekristen/aws-nuke/v3/pkg/commands/global"
+	"github.com/ekristen/aws-nuke/v3/pkg/common"
+	"github.com/ekristen/aws-nuke/v3/pkg/config"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 // ConfigureCreds is a helper function to configure the awsutil.Credentials object from the cli.Context
@@ -113,6 +113,7 @@ func execute(c *cli.Context) error { //nolint:funlen,gocyclo
 	n := libnuke.New(params, filters, parsedConfig.Settings)
 
 	n.SetRunSleep(5 * time.Second)
+	n.SetLogger(logrus.WithField("component", "libnuke"))
 	n.RegisterVersion(fmt.Sprintf("> %s", common.AppVersion.String()))
 
 	// Register our custom validate handler that validates the account and AWS nuke unique alias checks

pkg/nuke/prompt.go

@@ -7,7 +7,7 @@ import (
 	libnuke "github.com/ekristen/libnuke/pkg/nuke"
 	"github.com/ekristen/libnuke/pkg/utils"
 
-	"github.com/ekristen/aws-nuke/pkg/awsutil"
+	"github.com/ekristen/aws-nuke/v3/pkg/awsutil"
 )
 
 // Prompt struct provides a way to provide a custom prompt to the libnuke library this allows

resources/accessanalyzer-analyzers.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AccessAnalyzerResource = "AccessAnalyzer"

resources/accessanalyzer-archiverules.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AccessAnalyzerArchiveRuleResource = "ArchiveRule"

resources/acm-certificates.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const ACMCertificateResource = "ACMCertificate"

resources/acmpca-certificateauthorities.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const ACMPCACertificateAuthorityResource = "ACMPCACertificateAuthority"

resources/acmpca-certificateauthoritystates.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const ACMPCACertificateAuthorityStateResource = "ACMPCACertificateAuthorityState"

resources/apigateway-apikeys.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayAPIKeyResource = "APIGatewayAPIKey"

resources/apigateway-clientcertificates.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayClientCertificateResource = "APIGatewayClientCertificate"

resources/apigateway-domainnames.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayDomainNameResource = "APIGatewayDomainName"

resources/apigateway-restapis.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayRestAPIResource = "APIGatewayRestAPI"

resources/apigateway-usageplans.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayUsagePlanResource = "APIGatewayUsagePlan"

resources/apigateway-vpclinks.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayVpcLinkResource = "APIGatewayVpcLink"

resources/apigatewayv2-apis.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayV2APIResource = "APIGatewayV2API"

resources/apigatewayv2-vpc-links.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const APIGatewayV2VpcLinkResource = "APIGatewayV2VpcLink"

resources/appconfig-applications.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppConfigApplication struct {

resources/appconfig-configurationprofiles.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppConfigConfigurationProfile struct {

resources/appconfig-deploymentstrategies.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppConfigDeploymentStrategy struct {

resources/appconfig-environments.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppConfigEnvironment struct {

resources/appconfig-hostedconfigurationversions.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppConfigHostedConfigurationVersion struct {

resources/applicationautoscaling-scalable-targets.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const ApplicationAutoScalingScalableTargetResource = "ApplicationAutoScalingScalableTarget"

resources/appmesh-gatewayroute.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AppMeshGatewayRouteResource = "AppMeshGatewayRoute"

resources/appmesh-mesh.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AppMeshMeshResource = "AppMeshMesh"

resources/appmesh-route.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AppMeshRouteResource = "AppMeshRoute"

resources/appmesh-virtualgateway.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AppMeshVirtualGatewayResource = "AppMeshVirtualGateway"

resources/appmesh-virtualnode.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 const AppMeshVirtualNodeResource = "AppMeshVirtualNode"

resources/appmesh-virtualrouter.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppMeshVirtualRouter struct {

resources/appmesh-virtualservice.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppMeshVirtualService struct {

resources/apprunner-connection.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
 
 type AppRunnerConnection struct {