Skip to content

Commit

Permalink
Merge pull request #1554 from snyk/chore/extracted_enumeration
Browse files Browse the repository at this point in the history 
Extract enumeration to it's own module
  • Loading branch information
@eliecharra
eliecharra authored Jul 7, 2022
2 parents 516609f + 3c7a52b commit 172e121
Show file tree
Hide file tree
Showing 1,266 changed files with 4,012 additions and 2,968 deletions.
0 pkg/alerter/alert.go → enumeration/alerter/alert.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/alerter/alerter.go → enumeration/alerter/alerter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package alerter
import (
"fmt"

"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/enumeration/resource"
)

type AlerterInterface interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/alerter/alerter_test.go → enumeration/alerter/alerter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/enumeration/resource"
)

func TestAlerter_Alert(t *testing.T) {
Expand Down
9 changes: 9 additions & 0 deletions enumeration/filter.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package enumeration

import "github.com/snyk/driftctl/enumeration/resource"

type Filter interface {
IsTypeIgnored(ty resource.ResourceType) bool
IsResourceIgnored(res *resource.Resource) bool
IsFieldIgnored(res *resource.Resource, path []string) bool
}
55 changes: 55 additions & 0 deletions enumeration/mock_Filter.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 pkg/parallel/parallel_runner.go → enumeration/parallel/parallel_runner.go
View file
File renamed without changes.
0 pkg/parallel/parallel_runner_test.go → enumeration/parallel/parallel_runner_test.go
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions enumeration/progress.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package enumeration

type ProgressCounter interface {
Inc()
}
7 changes: 4 additions & 3 deletions pkg/remote/alerts/alerts.go → enumeration/remote/alerts/alerts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package alerts
import (
"fmt"

"github.com/snyk/driftctl/enumeration/alerter"
"github.com/snyk/driftctl/enumeration/remote/common"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"

"github.com/sirupsen/logrus"
"github.com/snyk/driftctl/pkg/alerter"
"github.com/snyk/driftctl/pkg/remote/common"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
)

type ScanningPhase int
Expand Down
8 changes: 4 additions & 4 deletions ...ote/aws/api_gateway_account_enumerator.go → ...ote/aws/api_gateway_account_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayAccountEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...ote/aws/api_gateway_api_key_enumerator.go → ...ote/aws/api_gateway_api_key_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayApiKeyEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions .../aws/api_gateway_authorizer_enumerator.go → .../aws/api_gateway_authorizer_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayAuthorizerEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...i_gateway_base_path_mapping_enumerator.go → ...i_gateway_base_path_mapping_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayBasePathMappingEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...aws/api_gateway_domain_name_enumerator.go → ...aws/api_gateway_domain_name_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayDomainNameEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...pi_gateway_gateway_response_enumerator.go → ...pi_gateway_gateway_response_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayGatewayResponseEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...aws/api_gateway_integration_enumerator.go → ...aws/api_gateway_integration_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayIntegrationEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...ateway_integration_response_enumerator.go → ...ateway_integration_response_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayIntegrationResponseEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...mote/aws/api_gateway_method_enumerator.go → ...mote/aws/api_gateway_method_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayMethodEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...api_gateway_method_response_enumerator.go → ...api_gateway_method_response_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayMethodResponseEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...api_gateway_method_settings_enumerator.go → ...api_gateway_method_settings_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayMethodSettingsEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...emote/aws/api_gateway_model_enumerator.go → ...emote/aws/api_gateway_model_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayModelEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...i_gateway_request_validator_enumerator.go → ...i_gateway_request_validator_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayRequestValidatorEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...te/aws/api_gateway_resource_enumerator.go → ...te/aws/api_gateway_resource_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayResourceEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...te/aws/api_gateway_rest_api_enumerator.go → ...te/aws/api_gateway_rest_api_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayRestApiEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...api_gateway_rest_api_policy_enumerator.go → ...api_gateway_rest_api_policy_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayRestApiPolicyEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...emote/aws/api_gateway_stage_enumerator.go → ...emote/aws/api_gateway_stage_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package aws

import (
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"strings"

"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayStageEnumerator struct {
Expand Down
8 changes: 4 additions & 4 deletions ...te/aws/api_gateway_vpc_link_enumerator.go → ...te/aws/api_gateway_vpc_link_enumerator.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"github.com/snyk/driftctl/pkg/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/pkg/remote/error"
"github.com/snyk/driftctl/pkg/resource"
"github.com/snyk/driftctl/pkg/resource/aws"
"github.com/snyk/driftctl/enumeration/remote/aws/repository"
remoteerror "github.com/snyk/driftctl/enumeration/remote/error"
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/enumeration/resource/aws"
)

type ApiGatewayVpcLinkEnumerator struct {
Expand Down
Loading

0 comments on commit 172e121

Please sign in to comment.