Skip to content

Commit 9943ca3

Browse files
surajkotasurajkota
authored
run go fmt on unit test commit (#79)
Generating code on the main branch has a bunch of linting changes. Missed in unit test PR since there was no code generation and `go fmt` runs in build-controller script after code is generated Testing ``` make test ```
1 parent a2dc2db commit 9943ca3

File tree

18 files changed

+381
-381
lines changed

18 files changed

+381
-381
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ack_generate_info:
2-
build_date: "2021-07-30T19:09:55Z"
2+
build_date: "2021-08-12T00:32:37Z"
33
build_hash: c77aa9c75d944952dee198029ba9822691cd82b0
4-
go_version: go1.16.4 darwin/amd64
4+
go_version: go1.16.4 linux/amd64
55
version: v0.6.0
66
api_directory_checksum: c8f263a8d1a2e21f53c85b1ca5e2be3687045dd0
77
api_version: v1alpha1
8-
aws_sdk_go_version: ""
8+
aws_sdk_go_version: v1.38.11
99
generator_config_info:
1010
file_checksum: 795f6cf17e64a254ed063ee36e489b2949a031ef
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation
14-
timestamp: 2021-07-30 19:10:09.128773 +0000 UTC
14+
timestamp: 2021-08-12 00:32:40.304705695 +0000 UTC

‎pkg/resource/data_quality_job_definition/manager_test_suite_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ package data_quality_job_definition
1616
import (
1717
"errors"
1818
"fmt"
19-
20-
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
19+
2120
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
22-
"github.com/ghodss/yaml"
23-
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
21+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
2422
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
23+
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
24+
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2525
svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
26+
"github.com/ghodss/yaml"
2627
"github.com/google/go-cmp/cmp"
2728
"github.com/google/go-cmp/cmp/cmpopts"
29+
"go.uber.org/zap/zapcore"
2830
"path/filepath"
29-
"testing"
3031
ctrlrtzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
32-
"go.uber.org/zap/zapcore"
32+
"testing"
3333
)
3434

3535
// provideResourceManagerWithMockSDKAPI accepts MockSageMakerAPI and returns pointer to resourceManager
@@ -53,12 +53,12 @@ func provideResourceManagerWithMockSDKAPI(mockSageMakerAPI *mocksvcsdkapi.SageMa
5353

5454
// TestDataQualityJobDefinitionTestSuite runs the test suite for data quality job definition
5555
func TestDataQualityJobDefinitionTestSuite(t *testing.T) {
56-
defer func() {
57-
if r := recover(); r != nil {
58-
fmt.Println(testutil.RecoverPanicString, r)
59-
t.Fail()
60-
}
61-
}()
56+
defer func() {
57+
if r := recover(); r != nil {
58+
fmt.Println(testutil.RecoverPanicString, r)
59+
t.Fail()
60+
}
61+
}()
6262
var ts = testutil.TestSuite{}
6363
testutil.LoadFromFixture(filepath.Join("testdata", "test_suite.yaml"), &ts)
6464
var delegate = testRunnerDelegate{t: t}
@@ -91,13 +91,13 @@ func (d *testRunnerDelegate) EmptyServiceAPIOutput(apiName string) (interface{},
9191
switch apiName {
9292
case "CreateDataQualityJobDefinitionWithContext":
9393
var output svcsdk.CreateDataQualityJobDefinitionOutput
94-
return &output, nil
94+
return &output, nil
9595
case "DescribeDataQualityJobDefinitionWithContext":
9696
var output svcsdk.DescribeDataQualityJobDefinitionOutput
97-
return &output, nil
97+
return &output, nil
9898
case "DeleteDataQualityJobDefinitionWithContext":
9999
var output svcsdk.DeleteDataQualityJobDefinitionOutput
100-
return &output, nil
100+
return &output, nil
101101
}
102102
return nil, errors.New(fmt.Sprintf("no matching API name found for: %s", apiName))
103103
}

‎pkg/resource/endpoint/manager_test_suite_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ package endpoint
1616
import (
1717
"errors"
1818
"fmt"
19-
20-
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
19+
2120
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
22-
"github.com/ghodss/yaml"
23-
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
21+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
2422
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
23+
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
24+
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2525
svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
26+
"github.com/ghodss/yaml"
2627
"github.com/google/go-cmp/cmp"
2728
"github.com/google/go-cmp/cmp/cmpopts"
29+
"go.uber.org/zap/zapcore"
2830
"path/filepath"
29-
"testing"
3031
ctrlrtzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
32-
"go.uber.org/zap/zapcore"
32+
"testing"
3333
)
3434

3535
// provideResourceManagerWithMockSDKAPI accepts MockSageMakerAPI and returns pointer to resourceManager
@@ -53,12 +53,12 @@ func provideResourceManagerWithMockSDKAPI(mockSageMakerAPI *mocksvcsdkapi.SageMa
5353

5454
// TestEndpointTestSuite runs the test suite for endpoint
5555
func TestEndpointTestSuite(t *testing.T) {
56-
defer func() {
57-
if r := recover(); r != nil {
58-
fmt.Println(testutil.RecoverPanicString, r)
59-
t.Fail()
60-
}
61-
}()
56+
defer func() {
57+
if r := recover(); r != nil {
58+
fmt.Println(testutil.RecoverPanicString, r)
59+
t.Fail()
60+
}
61+
}()
6262
var ts = testutil.TestSuite{}
6363
testutil.LoadFromFixture(filepath.Join("testdata", "test_suite.yaml"), &ts)
6464
var delegate = testRunnerDelegate{t: t}
@@ -91,7 +91,7 @@ func (d *testRunnerDelegate) EmptyServiceAPIOutput(apiName string) (interface{},
9191
switch apiName {
9292
case "CreateEndpointWithContext":
9393
var output svcsdk.CreateEndpointOutput
94-
return &output, nil
94+
return &output, nil
9595
case "DeleteEndpointWithContext":
9696
var output svcsdk.DeleteEndpointOutput
9797
return &output, nil

‎pkg/resource/endpoint_config/manager_test_suite_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,38 @@ import (
1717
"errors"
1818
"fmt"
1919

20-
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2120
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
22-
"github.com/ghodss/yaml"
23-
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
21+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
2422
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
23+
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
24+
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2525
svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
26+
"github.com/ghodss/yaml"
2627
"github.com/google/go-cmp/cmp"
2728
"github.com/google/go-cmp/cmp/cmpopts"
29+
"go.uber.org/zap/zapcore"
2830
"path/filepath"
29-
"testing"
3031
ctrlrtzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
32-
"go.uber.org/zap/zapcore"
32+
"testing"
3333
)
3434

3535
// provideResourceManagerWithMockSDKAPI accepts MockSageMakerAPI and returns pointer to resourceManager
3636
// the returned resourceManager is configured to use mockapi api.
3737
func provideResourceManagerWithMockSDKAPI(mockSageMakerAPI *mocksvcsdkapi.SageMakerAPI) *resourceManager {
38-
zapOptions := ctrlrtzap.Options{
39-
Development: true,
40-
Level: zapcore.InfoLevel,
41-
}
42-
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43-
return &resourceManager{
44-
rr: nil,
45-
awsAccountID: "",
46-
awsRegion: "",
47-
sess: nil,
48-
sdkapi: mockSageMakerAPI,
49-
log: fakeLogger,
50-
metrics: ackmetrics.NewMetrics("sagemaker"),
51-
}
38+
zapOptions := ctrlrtzap.Options{
39+
Development: true,
40+
Level: zapcore.InfoLevel,
41+
}
42+
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43+
return &resourceManager{
44+
rr: nil,
45+
awsAccountID: "",
46+
awsRegion: "",
47+
sess: nil,
48+
sdkapi: mockSageMakerAPI,
49+
log: fakeLogger,
50+
metrics: ackmetrics.NewMetrics("sagemaker"),
51+
}
5252
}
5353

5454
// TestEndpointConfigTestSuite runs the test suite for endpoint config.

‎pkg/resource/feature_group/manager_test_suite_test.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,47 @@ import (
1818
"fmt"
1919

2020
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
21-
"github.com/ghodss/yaml"
22-
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
23-
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
21+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
2422
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
23+
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
24+
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2525
svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
26+
"github.com/ghodss/yaml"
2627
"github.com/google/go-cmp/cmp"
2728
"github.com/google/go-cmp/cmp/cmpopts"
29+
"go.uber.org/zap/zapcore"
2830
"path/filepath"
29-
"testing"
3031
ctrlrtzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
32-
"go.uber.org/zap/zapcore"
32+
"testing"
3333
)
3434

3535
// provideResourceManagerWithMockSDKAPI accepts MockSageMakerAPI and returns pointer to resourceManager
3636
// the returned resourceManager is configured to use mockapi api.
3737
func provideResourceManagerWithMockSDKAPI(mockSageMakerAPI *mocksvcsdkapi.SageMakerAPI) *resourceManager {
38-
zapOptions := ctrlrtzap.Options{
39-
Development: true,
40-
Level: zapcore.InfoLevel,
41-
}
42-
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43-
return &resourceManager{
44-
rr: nil,
45-
awsAccountID: "",
46-
awsRegion: "",
47-
sess: nil,
48-
sdkapi: mockSageMakerAPI,
49-
log: fakeLogger,
50-
metrics: ackmetrics.NewMetrics("sagemaker"),
51-
}
38+
zapOptions := ctrlrtzap.Options{
39+
Development: true,
40+
Level: zapcore.InfoLevel,
41+
}
42+
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43+
return &resourceManager{
44+
rr: nil,
45+
awsAccountID: "",
46+
awsRegion: "",
47+
sess: nil,
48+
sdkapi: mockSageMakerAPI,
49+
log: fakeLogger,
50+
metrics: ackmetrics.NewMetrics("sagemaker"),
51+
}
5252
}
5353

5454
// TestFeatureGroupTestSuite runs the test suite for feature group
5555
func TestFeatureGroupTestSuite(t *testing.T) {
56-
defer func() {
57-
if r := recover(); r != nil {
58-
fmt.Println(testutil.RecoverPanicString, r)
59-
t.Fail()
60-
}
61-
}()
56+
defer func() {
57+
if r := recover(); r != nil {
58+
fmt.Println(testutil.RecoverPanicString, r)
59+
t.Fail()
60+
}
61+
}()
6262
var ts = testutil.TestSuite{}
6363
testutil.LoadFromFixture(filepath.Join("testdata", "test_suite.yaml"), &ts)
6464
var delegate = testRunnerDelegate{t: t}

‎pkg/resource/hyper_parameter_tuning_job/manager_test_suite_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,38 @@ import (
1717
"errors"
1818
"fmt"
1919

20-
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2120
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
22-
"github.com/ghodss/yaml"
23-
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
21+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
2422
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
23+
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
24+
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2525
svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
26+
"github.com/ghodss/yaml"
2627
"github.com/google/go-cmp/cmp"
2728
"github.com/google/go-cmp/cmp/cmpopts"
29+
"go.uber.org/zap/zapcore"
2830
"path/filepath"
29-
"testing"
3031
ctrlrtzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
32-
"go.uber.org/zap/zapcore"
32+
"testing"
3333
)
3434

3535
// provideResourceManagerWithMockSDKAPI accepts MockSageMakerAPI and returns pointer to resourceManager
3636
// the returned resourceManager is configured to use mockapi api.
3737
func provideResourceManagerWithMockSDKAPI(mockSageMakerAPI *mocksvcsdkapi.SageMakerAPI) *resourceManager {
38-
zapOptions := ctrlrtzap.Options{
39-
Development: true,
40-
Level: zapcore.InfoLevel,
41-
}
42-
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43-
return &resourceManager{
44-
rr: nil,
45-
awsAccountID: "",
46-
awsRegion: "",
47-
sess: nil,
48-
sdkapi: mockSageMakerAPI,
49-
log: fakeLogger,
50-
metrics: ackmetrics.NewMetrics("sagemaker"),
51-
}
38+
zapOptions := ctrlrtzap.Options{
39+
Development: true,
40+
Level: zapcore.InfoLevel,
41+
}
42+
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43+
return &resourceManager{
44+
rr: nil,
45+
awsAccountID: "",
46+
awsRegion: "",
47+
sess: nil,
48+
sdkapi: mockSageMakerAPI,
49+
log: fakeLogger,
50+
metrics: ackmetrics.NewMetrics("sagemaker"),
51+
}
5252
}
5353

5454
// TestHyperParameterTuningJobTestSuite runs the test suite for hyper parameter tuning job.

‎pkg/resource/model/manager_test_suite_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,38 @@ import (
1717
"errors"
1818
"fmt"
1919

20-
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2120
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
22-
"github.com/ghodss/yaml"
23-
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
21+
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
2422
acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
23+
"github.com/aws-controllers-k8s/sagemaker-controller/pkg/testutil"
24+
mocksvcsdkapi "github.com/aws-controllers-k8s/sagemaker-controller/test/mocks/aws-sdk-go/sagemaker"
2525
svcsdk "github.com/aws/aws-sdk-go/service/sagemaker"
26+
"github.com/ghodss/yaml"
2627
"github.com/google/go-cmp/cmp"
2728
"github.com/google/go-cmp/cmp/cmpopts"
29+
"go.uber.org/zap/zapcore"
2830
"path/filepath"
29-
"testing"
3031
ctrlrtzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
31-
ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
32-
"go.uber.org/zap/zapcore"
32+
"testing"
3333
)
3434

3535
// provideResourceManagerWithMockSDKAPI accepts MockSageMakerAPI and returns pointer to resourceManager
3636
// the returned resourceManager is configured to use mockapi api.
3737
func provideResourceManagerWithMockSDKAPI(mockSageMakerAPI *mocksvcsdkapi.SageMakerAPI) *resourceManager {
38-
zapOptions := ctrlrtzap.Options{
39-
Development: true,
40-
Level: zapcore.InfoLevel,
41-
}
42-
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43-
return &resourceManager{
44-
rr: nil,
45-
awsAccountID: "",
46-
awsRegion: "",
47-
sess: nil,
48-
sdkapi: mockSageMakerAPI,
49-
log: fakeLogger,
50-
metrics: ackmetrics.NewMetrics("sagemaker"),
51-
}
38+
zapOptions := ctrlrtzap.Options{
39+
Development: true,
40+
Level: zapcore.InfoLevel,
41+
}
42+
fakeLogger := ctrlrtzap.New(ctrlrtzap.UseFlagOptions(&zapOptions))
43+
return &resourceManager{
44+
rr: nil,
45+
awsAccountID: "",
46+
awsRegion: "",
47+
sess: nil,
48+
sdkapi: mockSageMakerAPI,
49+
log: fakeLogger,
50+
metrics: ackmetrics.NewMetrics("sagemaker"),
51+
}
5252
}
5353

5454
// TestModelTestSuite runs the test suite for model

0 commit comments

Comments
 (0)