From 5bd3373c4dadb636ab9451cf3dde03867131d173 Mon Sep 17 00:00:00 2001
From: Daniel Spangenberg <daniel@cloudquery.io>
Date: Thu, 25 Nov 2021 10:53:19 +0100
Subject: [PATCH] Move test

---
 client/mocks/builders_test.go                 | 26 -------------------
 client/mocks/resources_test.go                |  5 ----
 .../config_configuration_recorders_test.go    | 23 ++++++++++------
 3 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/client/mocks/builders_test.go b/client/mocks/builders_test.go
index 89c86cd62..9e2e76bd3 100644
--- a/client/mocks/builders_test.go
+++ b/client/mocks/builders_test.go
@@ -12,8 +12,6 @@ import (
 	cloudwatchTypes "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	cloudwatchlogsTypes "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"
-	"github.com/aws/aws-sdk-go-v2/service/configservice"
-	configserviceTypes "github.com/aws/aws-sdk-go-v2/service/configservice/types"
 	"github.com/aws/aws-sdk-go-v2/service/directconnect"
 	directconnectTypes "github.com/aws/aws-sdk-go-v2/service/directconnect/types"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -226,30 +224,6 @@ func buildCloudwatchLogsFiltersMock(t *testing.T, ctrl *gomock.Controller) clien
 	}
 }
 
-func buildConfigConfigurationRecordersMock(t *testing.T, ctrl *gomock.Controller) client.Services {
-	m := mocks.NewMockConfigServiceClient(ctrl)
-	l := configserviceTypes.ConfigurationRecorder{}
-	if err := faker.FakeData(&l); err != nil {
-		t.Fatal(err)
-	}
-	sl := configserviceTypes.ConfigurationRecorderStatus{}
-	if err := faker.FakeData(&sl); err != nil {
-		t.Fatal(err)
-	}
-	sl.Name = l.Name
-	m.EXPECT().DescribeConfigurationRecorderStatus(gomock.Any(), gomock.Any(), gomock.Any()).Return(
-		&configservice.DescribeConfigurationRecorderStatusOutput{
-			ConfigurationRecordersStatus: []configserviceTypes.ConfigurationRecorderStatus{sl},
-		}, nil)
-	m.EXPECT().DescribeConfigurationRecorders(gomock.Any(), gomock.Any(), gomock.Any()).Return(
-		&configservice.DescribeConfigurationRecordersOutput{
-			ConfigurationRecorders: []configserviceTypes.ConfigurationRecorder{l},
-		}, nil)
-	return client.Services{
-		ConfigService: m,
-	}
-}
-
 func buildDirectconnectGatewaysMock(t *testing.T, ctrl *gomock.Controller) client.Services {
 	m := mocks.NewMockDirectconnectClient(ctrl)
 	l := directconnectTypes.DirectConnectGateway{}
diff --git a/client/mocks/resources_test.go b/client/mocks/resources_test.go
index e0bbd85fd..d1a29aa24 100644
--- a/client/mocks/resources_test.go
+++ b/client/mocks/resources_test.go
@@ -65,11 +65,6 @@ func TestResources(t *testing.T) {
 			mockBuilder: buildCloudwatchLogsFiltersMock,
 			mainTable:   resources.CloudwatchlogsFilters(),
 		},
-		{
-			resource:    "config.configuration_recorders",
-			mockBuilder: buildConfigConfigurationRecordersMock,
-			mainTable:   resources.ConfigConfigurationRecorders(),
-		},
 		{
 			resource:    "directconnect.gateways",
 			mockBuilder: buildDirectconnectGatewaysMock,
diff --git a/resources/config_configuration_recorders_test.go b/resources/config_configuration_recorders_test.go
index b4b0a17b4..45116c32b 100644
--- a/resources/config_configuration_recorders_test.go
+++ b/resources/config_configuration_recorders_test.go
@@ -5,25 +5,32 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/configservice"
 	"github.com/aws/aws-sdk-go-v2/service/configservice/types"
-	"github.com/cloudquery/cq-provider-aws/client"
-	"github.com/cloudquery/cq-provider-aws/client/mocks"
 	"github.com/cloudquery/faker/v3"
 	"github.com/golang/mock/gomock"
+
+	"github.com/cloudquery/cq-provider-aws/client"
+	"github.com/cloudquery/cq-provider-aws/client/mocks"
 )
 
 func buildConfigConfigurationRecorders(t *testing.T, ctrl *gomock.Controller) client.Services {
 	m := mocks.NewMockConfigServiceClient(ctrl)
-
-	cr := types.ConfigurationRecorder{}
-	err := faker.FakeData(&cr)
-	if err != nil {
+	l := types.ConfigurationRecorder{}
+	if err := faker.FakeData(&l); err != nil {
+		t.Fatal(err)
+	}
+	sl := types.ConfigurationRecorderStatus{}
+	if err := faker.FakeData(&sl); err != nil {
 		t.Fatal(err)
 	}
+	sl.Name = l.Name
+	m.EXPECT().DescribeConfigurationRecorderStatus(gomock.Any(), gomock.Any(), gomock.Any()).Return(
+		&configservice.DescribeConfigurationRecorderStatusOutput{
+			ConfigurationRecordersStatus: []types.ConfigurationRecorderStatus{sl},
+		}, nil)
 	m.EXPECT().DescribeConfigurationRecorders(gomock.Any(), gomock.Any(), gomock.Any()).Return(
 		&configservice.DescribeConfigurationRecordersOutput{
-			ConfigurationRecorders: []types.ConfigurationRecorder{cr},
+			ConfigurationRecorders: []types.ConfigurationRecorder{l},
 		}, nil)
-
 	return client.Services{
 		ConfigService: m,
 	}