chore: use separate registry package from libnuke with [email protected]

go.mod

@@ -4,7 +4,7 @@ go 1.21.6
 
 require (
 	github.com/aws/aws-sdk-go v1.50.4
-	github.com/ekristen/libnuke v0.8.0
+	github.com/ekristen/libnuke v0.9.1
 	github.com/fatih/color v1.16.0
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.6.0

go.sum

@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/ekristen/libnuke v0.8.0 h1:dxs+RosOcstbzvxnLyWN4mq1mAuOqMRUi7LEBC8rk44=
 github.com/ekristen/libnuke v0.8.0/go.mod h1:WhYx7LDAkvkXwwfhWCASRn7fbifF8kfyhNsUj5zCCVs=
+github.com/ekristen/libnuke v0.9.1 h1:AoX1cggVTanP671Xuh6kJRv0HEp26NLqqPTzwYbz9I0=
+github.com/ekristen/libnuke v0.9.1/go.mod h1:WhYx7LDAkvkXwwfhWCASRn7fbifF8kfyhNsUj5zCCVs=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=

pkg/commands/list/list.go

@@ -10,13 +10,12 @@ import (
 	"github.com/ekristen/aws-nuke/pkg/commands/global"
 	"github.com/ekristen/aws-nuke/pkg/common"
 
-	"github.com/ekristen/libnuke/pkg/resource"
-
 	_ "github.com/ekristen/aws-nuke/resources"
+	"github.com/ekristen/libnuke/pkg/registry"
 )
 
 func execute(c *cli.Context) error {
-	ls := resource.GetNames()
+	ls := registry.GetNames()
 
 	sort.Strings(ls)
 
@@ -25,7 +24,7 @@ func execute(c *cli.Context) error {
 			continue
 		}
 
-		reg := resource.GetRegistration(name)
+		reg := registry.GetRegistration(name)
 
 		if reg.AlternativeResource != "" {
 			color.New(color.Bold).Printf("%-55s\n", name)

pkg/commands/nuke/command.go

@@ -3,6 +3,7 @@ package nuke
 import (
 	"context"
 	"fmt"
+	"github.com/ekristen/libnuke/pkg/registry"
 	"slices"
 	"time"
 
@@ -13,7 +14,6 @@ import (
 
 	libconfig "github.com/ekristen/libnuke/pkg/config"
 	libnuke "github.com/ekristen/libnuke/pkg/nuke"
-	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/scanner"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -67,7 +67,7 @@ func execute(c *cli.Context) error {
 	// Parse the user supplied configuration file to pass in part to configure the nuke process.
 	parsedConfig, err := config.New(libconfig.Options{
 		Path:         c.Path("config"),
-		Deprecations: resource.GetDeprecatedResourceTypeMapping(),
+		Deprecations: registry.GetDeprecatedResourceTypeMapping(),
 	})
 	if err != nil {
 		logrus.Errorf("Failed to parse config file %s", c.Path("config"))
@@ -124,7 +124,7 @@ func execute(c *cli.Context) error {
 	// Resolve the resource types to be used for the nuke process based on the parameters, global configuration, and
 	// account level configuration.
 	resourceTypes := types.ResolveResourceTypes(
-		resource.GetNames(),
+		registry.GetNames(),
 		[]types.Collection{
 			n.Parameters.Includes,
 			parsedConfig.ResourceTypes.GetIncludes(),
@@ -140,7 +140,7 @@ func execute(c *cli.Context) error {
 			parsedConfig.ResourceTypes.GetAlternatives(),
 			accountConfig.ResourceTypes.GetAlternatives(),
 		},
-		resource.GetAlternativeResourceTypeMapping(),
+		registry.GetAlternativeResourceTypeMapping(),
 	)
 
 	// Register the scanners for each region that is defined in the configuration.

pkg/nuke/resource.go

@@ -3,11 +3,11 @@ package nuke
 import (
 	"github.com/aws/aws-sdk-go/aws/session"
 
-	"github.com/ekristen/libnuke/pkg/resource"
+	"github.com/ekristen/libnuke/pkg/registry"
 )
 
 // Account is the resource scope that all resources in AWS Nuke are registered against.
-const Account resource.Scope = "account"
+const Account registry.Scope = "account"
 
 // ListerOpts are the options for the Lister functions of each individual resource. It is passed in as an interface{}
 // so that each implementing tool can define their own options for the lister. Each resource then asserts the type on

resources/accessanalyzer-analyzers.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/accessanalyzer"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -23,7 +24,7 @@ type AccessAnalyzer struct {
 }
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:                AccessAnalyzerResource,
 		Scope:               nuke.Account,
 		Lister:              &AccessAnalyzerLister{},

resources/accessanalyzer-archiverules.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/accessanalyzer"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -14,7 +15,7 @@ import (
 const AccessAnalyzerArchiveRuleResource = "ArchiveRule"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   AccessAnalyzerArchiveRuleResource,
 		Scope:  nuke.Account,
 		Lister: &AccessAnalyzerArchiveRuleLister{},

resources/acm-certificates.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/acm"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -15,7 +16,7 @@ import (
 const ACMCertificateResource = "ACMCertificate"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   ACMCertificateResource,
 		Scope:  nuke.Account,
 		Lister: &ACMCertificateLister{},

resources/acmpca-certificateauthorities.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/acmpca"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -17,7 +18,7 @@ import (
 const ACMPCACertificateAuthorityResource = "ACMPCACertificateAuthority"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:                ACMPCACertificateAuthorityResource,
 		Scope:               nuke.Account,
 		Lister:              &ACMPCACertificateAuthorityLister{},

resources/acmpca-certificateauthoritystates.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/acmpca"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -17,7 +18,7 @@ import (
 const ACMPCACertificateAuthorityStateResource = "ACMPCACertificateAuthorityState"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   ACMPCACertificateAuthorityStateResource,
 		Scope:  nuke.Account,
 		Lister: &ACMPCACertificateAuthorityStateLister{},

resources/apigateway-apikeys.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 
 	"github.com/ekristen/aws-nuke/pkg/nuke"
@@ -14,7 +15,7 @@ import (
 const APIGatewayAPIKeyResource = "APIGatewayAPIKey"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:                APIGatewayAPIKeyResource,
 		Scope:               nuke.Account,
 		Lister:              &APIGatewayAPIKeyLister{},

resources/apigateway-clientcertificates.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 
 	"github.com/ekristen/aws-nuke/pkg/nuke"
@@ -14,7 +15,7 @@ import (
 const APIGatewayClientCertificateResource = "APIGatewayClientCertificate"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:                APIGatewayClientCertificateResource,
 		Scope:               nuke.Account,
 		Lister:              &APIGatewayClientCertificateLister{},

resources/apigateway-domainnames.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 
 	"github.com/ekristen/aws-nuke/pkg/nuke"
@@ -14,7 +15,7 @@ import (
 const APIGatewayDomainNameResource = "APIGatewayDomainName"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   APIGatewayDomainNameResource,
 		Scope:  nuke.Account,
 		Lister: &APIGatewayDomainNameLister{},

resources/apigateway-restapis.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -15,7 +16,7 @@ import (
 const APIGatewayRestAPIResource = "APIGatewayRestAPI"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   APIGatewayRestAPIResource,
 		Scope:  nuke.Account,
 		Lister: &APIGatewayRestAPILister{},

resources/apigateway-usageplans.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -15,7 +16,7 @@ import (
 const APIGatewayUsagePlanResource = "APIGatewayUsagePlan"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:                APIGatewayUsagePlanResource,
 		Scope:               nuke.Account,
 		Lister:              &APIGatewayUsagePlanLister{},

resources/apigateway-vpclinks.go

@@ -5,15 +5,18 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigateway"
-	"github.com/ekristen/aws-nuke/pkg/nuke"
+
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
+
+	"github.com/ekristen/aws-nuke/pkg/nuke"
 )
 
 const APIGatewayVpcLinkResource = "APIGatewayVpcLink"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   APIGatewayVpcLinkResource,
 		Scope:  nuke.Account,
 		Lister: &APIGatewayVpcLinkLister{},

resources/apigatewayv2-apis.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigatewayv2"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -15,7 +16,7 @@ import (
 const APIGatewayV2APIResource = "APIGatewayV2API"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   APIGatewayV2APIResource,
 		Scope:  nuke.Account,
 		Lister: &APIGatewayV2APILister{},

resources/apigatewayv2-vpc-links.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/apigatewayv2"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -15,7 +16,7 @@ import (
 const APIGatewayV2VpcLinkResource = "APIGatewayV2VpcLink"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   APIGatewayV2VpcLinkResource,
 		Scope:  nuke.Account,
 		Lister: &APIGatewayV2VpcLinkLister{},

resources/appconfig-applications.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appconfig"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -21,7 +22,7 @@ type AppConfigApplication struct {
 const AppConfigApplicationResource = "AppConfigApplication"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   AppConfigApplicationResource,
 		Scope:  nuke.Account,
 		Lister: &AppConfigApplicationLister{},

resources/appconfig-configurationprofiles.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appconfig"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -24,7 +25,7 @@ type AppConfigConfigurationProfile struct {
 const AppConfigConfigurationProfileResource = "AppConfigConfigurationProfile"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   AppConfigConfigurationProfileResource,
 		Scope:  nuke.Account,
 		Lister: &AppConfigConfigurationProfileLister{},

resources/appconfig-deploymentstrategies.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appconfig"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -23,7 +24,7 @@ type AppConfigDeploymentStrategy struct {
 const AppConfigDeploymentStrategyResource = "AppConfigDeploymentStrategy"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   AppConfigDeploymentStrategyResource,
 		Scope:  nuke.Account,
 		Lister: &AppConfigDeploymentStrategyLister{},

resources/appconfig-environments.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/appconfig"
 
+	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
 	"github.com/ekristen/libnuke/pkg/types"
 
@@ -24,7 +25,7 @@ type AppConfigEnvironment struct {
 const AppConfigEnvironmentResource = "AppConfigEnvironment"
 
 func init() {
-	resource.Register(&resource.Registration{
+	registry.Register(&registry.Registration{
 		Name:   AppConfigEnvironmentResource,
 		Scope:  nuke.Account,
 		Lister: &AppConfigEnvironmentLister{},