Merge pull request #619 from cloudskiff/deep_mode

Split suppliers to add deep mode

pkg/analyser/analyzer.go

@@ -36,17 +36,22 @@ func (c *ComputedDiffAlert) ShouldIgnoreResource() bool {
 	return false
 }
 
+type AnalyzerOptions struct {
+	Deep bool
+}
+
 type Analyzer struct {
 	alerter *alerter.Alerter
+	options AnalyzerOptions
 }
 
 type Filter interface {
 	IsResourceIgnored(res resource.Resource) bool
 	IsFieldIgnored(res resource.Resource, path []string) bool
 }
 
-func NewAnalyzer(alerter *alerter.Alerter) Analyzer {
-	return Analyzer{alerter}
+func NewAnalyzer(alerter *alerter.Alerter, options AnalyzerOptions) Analyzer {
+	return Analyzer{alerter, options}
 }
 
 func (a Analyzer) Analyze(remoteResources, resourcesFromState []resource.Resource, filter Filter) (Analysis, error) {
@@ -78,6 +83,11 @@ func (a Analyzer) Analyze(remoteResources, resourcesFromState []resource.Resourc
 		filteredRemoteResource = removeResourceByIndex(i, filteredRemoteResource)
 		analysis.AddManaged(stateRes)
 
+		// Stop there if we are not in deep mode, we do not want to compute diffs
+		if !a.options.Deep {
+			continue
+		}
+
 		var delta diff.Changelog
 		delta, _ = diff.Diff(stateRes.Attributes(), remoteRes.Attributes())
 

pkg/analyser/analyzer_test.go

@@ -955,7 +955,7 @@ func TestAnalyze(t *testing.T) {
 			repo := testresource.InitFakeSchemaRepository("aws", "3.19.0")
 			aws.InitResourcesMetadata(repo)
 
-			analyzer := NewAnalyzer(al)
+			analyzer := NewAnalyzer(al, AnalyzerOptions{Deep: true})
 
 			for _, res := range c.cloud {
 				addSchemaToRes(res, repo)

pkg/cmd/scan.go

@@ -9,6 +9,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/cloudskiff/driftctl/pkg/remote/common"
 	"github.com/cloudskiff/driftctl/pkg/telemetry"
 	"github.com/fatih/color"
 	"github.com/mitchellh/go-homedir"
@@ -31,7 +32,7 @@ import (
 )
 
 func NewScanCmd() *cobra.Command {
-	opts := &pkg.ScanOptions{}
+	opts := &pkg.ScanOptions{Deep: true}
 	opts.BackendOptions = &backend.Options{}
 
 	cmd := &cobra.Command{
@@ -184,8 +185,10 @@ func scanRun(opts *pkg.ScanOptions) error {
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 
 	alerter := alerter.NewAlerter()
+
 	providerLibrary := terraform.NewProviderLibrary()
 	supplierLibrary := resource.NewSupplierLibrary()
+	remoteLibrary := common.NewRemoteLibrary()
 
 	iacProgress := globaloutput.NewProgress("Scanning states", "Scanned states", true)
 	scanProgress := globaloutput.NewProgress("Scanning resources", "Scanned resources", false)
@@ -194,7 +197,7 @@ func scanRun(opts *pkg.ScanOptions) error {
 
 	resFactory := terraform.NewTerraformResourceFactory(resourceSchemaRepository)
 
-	err := remote.Activate(opts.To, opts.ProviderVersion, alerter, providerLibrary, supplierLibrary, scanProgress, resourceSchemaRepository, resFactory, opts.ConfigDir)
+	err := remote.Activate(opts.To, opts.ProviderVersion, alerter, providerLibrary, supplierLibrary, remoteLibrary, scanProgress, resourceSchemaRepository, resFactory, opts.ConfigDir)
 	if err != nil {
 		return err
 	}
@@ -206,7 +209,7 @@ func scanRun(opts *pkg.ScanOptions) error {
 		logrus.Trace("Exited")
 	}()
 
-	scanner := pkg.NewScanner(supplierLibrary.Suppliers(), alerter)
+	scanner := pkg.NewScanner(supplierLibrary.Suppliers(), remoteLibrary, alerter, pkg.ScannerOptions{Deep: opts.Deep})
 
 	iacSupplier, err := supplier.GetIACSupplier(opts.From, providerLibrary, opts.BackendOptions, iacProgress, resFactory)
 	if err != nil {

pkg/driftctl.go

@@ -32,6 +32,7 @@ type ScanOptions struct {
 	ProviderVersion  string
 	ConfigDir        string
 	DriftignorePath  string
+	Deep             bool
 }
 
 type DriftCTL struct {
@@ -58,7 +59,7 @@ func NewDriftCTL(remoteSupplier resource.Supplier,
 		remoteSupplier,
 		iacSupplier,
 		alerter,
-		analyser.NewAnalyzer(alerter),
+		analyser.NewAnalyzer(alerter, analyser.AnalyzerOptions{Deep: opts.Deep}),
 		resFactory,
 		scanProgress,
 		iacProgress,

pkg/driftctl_test.go

@@ -87,7 +87,7 @@ func runTest(t *testing.T, cases TestCases) {
 			}
 
 			if c.options == nil {
-				c.options = &pkg.ScanOptions{}
+				c.options = &pkg.ScanOptions{Deep: true}
 			}
 
 			scanProgress := &output.MockProgress{}
@@ -140,7 +140,7 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 				result.AssertInfrastructureIsInSync()
 			},
 			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
+				return &pkg.ScanOptions{Deep: true}
 			}(t),
 		},
 		{
@@ -152,9 +152,6 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 			assert: func(result *test.ScanResult, err error) {
 				result.AssertDeletedCount(1)
 			},
-			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
-			}(t),
 		},
 		{
 			name:           "we should have unmanaged resource",
@@ -165,9 +162,6 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 			assert: func(result *test.ScanResult, err error) {
 				result.AssertUnmanagedCount(1)
 			},
-			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
-			}(t),
 		},
 		{
 			name: "we should have changes of field update",
@@ -199,9 +193,6 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 					Computed: false,
 				})
 			},
-			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
-			}(t),
 		},
 		{
 			name: "we should have changes on computed field",
@@ -235,9 +226,6 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 					Computed: true,
 				})
 			},
-			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
-			}(t),
 		},
 		{
 			name: "we should have changes on deleted field",
@@ -271,9 +259,6 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 					Computed: false,
 				})
 			},
-			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
-			}(t),
 		},
 		{
 			name: "we should have changes of added field",
@@ -307,9 +292,6 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 					Computed: false,
 				})
 			},
-			options: func(t *testing.T) *pkg.ScanOptions {
-				return &pkg.ScanOptions{}
-			}(t),
 		},
 		{
 			name: "we should ignore default AWS IAM role when strict mode is disabled",
@@ -396,6 +378,7 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 			options: func(t *testing.T) *pkg.ScanOptions {
 				return &pkg.ScanOptions{
 					StrictMode: false,
+					Deep:       true,
 				}
 			}(t),
 		},
@@ -484,6 +467,7 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 			options: func(t *testing.T) *pkg.ScanOptions {
 				return &pkg.ScanOptions{
 					StrictMode: true,
+					Deep:       true,
 				}
 			}(t),
 		},
@@ -581,6 +565,7 @@ func TestDriftctlRun_BasicBehavior(t *testing.T) {
 				return &pkg.ScanOptions{
 					Filter:     f,
 					StrictMode: true,
+					Deep:       true,
 				}
 			}(t),
 		},
@@ -617,7 +602,7 @@ func TestDriftctlRun_BasicFilter(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -646,7 +631,7 @@ func TestDriftctlRun_BasicFilter(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -677,7 +662,7 @@ func TestDriftctlRun_BasicFilter(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 	}
@@ -751,7 +736,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -864,7 +849,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -963,7 +948,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -1026,7 +1011,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -1088,7 +1073,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -1404,7 +1389,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{
@@ -1542,7 +1527,7 @@ func TestDriftctlRun_Middlewares(t *testing.T) {
 					t.Fatalf("Unable to build filter expression: %s\n%s", filterStr, err)
 				}
 
-				return &pkg.ScanOptions{Filter: f}
+				return &pkg.ScanOptions{Filter: f, Deep: true}
 			}(t),
 		},
 		{

pkg/remote/aws/init.go

@@ -6,6 +6,7 @@ import (
 	"github.com/cloudskiff/driftctl/pkg/remote/aws/client"
 	"github.com/cloudskiff/driftctl/pkg/remote/aws/repository"
 	"github.com/cloudskiff/driftctl/pkg/remote/cache"
+	"github.com/cloudskiff/driftctl/pkg/remote/common"
 	"github.com/cloudskiff/driftctl/pkg/resource"
 	"github.com/cloudskiff/driftctl/pkg/resource/aws"
 	"github.com/cloudskiff/driftctl/pkg/terraform"
@@ -21,6 +22,7 @@ const RemoteAWSTerraform = "aws+tf"
 func Init(version string, alerter *alerter.Alerter,
 	providerLibrary *terraform.ProviderLibrary,
 	supplierLibrary *resource.SupplierLibrary,
+	remoteLibrary *common.RemoteLibrary,
 	progress output.Progress,
 	resourceSchemaRepository *resource.SchemaRepository,
 	factory resource.ResourceFactory,
@@ -56,7 +58,9 @@ func Init(version string, alerter *alerter.Alerter,
 	deserializer := resource.NewDeserializer(factory)
 	providerLibrary.AddProvider(terraform.AWS, provider)
 
-	supplierLibrary.AddSupplier(NewS3BucketSupplier(provider, s3Repository, deserializer))
+	remoteLibrary.AddEnumerator(NewS3BucketEnumerator(s3Repository, factory, provider.Config))
+	remoteLibrary.AddDetailsFetcher(aws.AwsS3BucketResourceType, NewS3BucketDetailsFetcher(provider, deserializer))
+
 	supplierLibrary.AddSupplier(NewS3BucketAnalyticSupplier(provider, s3Repository, deserializer))
 	supplierLibrary.AddSupplier(NewS3BucketInventorySupplier(provider, s3Repository, deserializer))
 	supplierLibrary.AddSupplier(NewS3BucketMetricSupplier(provider, s3Repository, deserializer))

pkg/remote/aws/repository/s3_repository.go

@@ -17,7 +17,7 @@ type S3Repository interface {
 	ListBucketInventoryConfigurations(bucket *s3.Bucket, region string) ([]*s3.InventoryConfiguration, error)
 	ListBucketMetricsConfigurations(bucket *s3.Bucket, region string) ([]*s3.MetricsConfiguration, error)
 	ListBucketAnalyticsConfigurations(bucket *s3.Bucket, region string) ([]*s3.AnalyticsConfiguration, error)
-	GetBucketLocation(bucket *s3.Bucket) (string, error)
+	GetBucketLocation(bucketName string) (string, error)
 }
 
 type s3Repository struct {
@@ -148,19 +148,19 @@ func (s *s3Repository) ListBucketAnalyticsConfigurations(bucket *s3.Bucket, regi
 	return analyticsConfigurationList, nil
 }
 
-func (s *s3Repository) GetBucketLocation(bucket *s3.Bucket) (string, error) {
-	cacheKey := fmt.Sprintf("s3GetBucketLocation_%s", *bucket.Name)
+func (s *s3Repository) GetBucketLocation(bucketName string) (string, error) {
+	cacheKey := fmt.Sprintf("s3GetBucketLocation_%s", bucketName)
 	if v := s.cache.Get(cacheKey); v != nil {
 		return v.(string), nil
 	}
 
-	bucketLocationRequest := s3.GetBucketLocationInput{Bucket: bucket.Name}
+	bucketLocationRequest := s3.GetBucketLocationInput{Bucket: &bucketName}
 	bucketLocationResponse, err := s.clientFactory.GetS3Client(nil).GetBucketLocation(&bucketLocationRequest)
 	if err != nil {
 		awsErr, ok := err.(awserr.Error)
 		if ok && awsErr.Code() == s3.ErrCodeNoSuchBucket {
 			logrus.WithFields(logrus.Fields{
-				"bucket": *bucket.Name,
+				"bucket": bucketName,
 			}).Warning("Unable to retrieve bucket region, this may be an inconsistency in S3 api for fresh deleted bucket, skipping ...")
 			return "", nil
 		}