Skip to content

Commit

Permalink
provider/import_test: fix expected func not called
Browse files Browse the repository at this point in the history
Since we continue on importing error, HCL and State are skipped for
filtered/error resources.
  • Loading branch information
talset committed Nov 29, 2019
1 parent 1ae0ab6 commit db6d0f9
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion cmd/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ func init() {
awsCmd.Flags().String("secret-key", "", "Secret Key (required)")
awsCmd.Flags().String("region", "", "Region to search in, for now * it's not supported (required)")


// Filter flags
awsCmd.Flags().StringSliceVarP(&tags, "tags", "t", []string{}, "List of tags to filter with format 'NAME:VALUE'")
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require (
cloud.google.com/go/storage v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.25.4
github.com/chr4/pwgen v1.1.0
github.com/cycloidio/raws v1.0.1
github.com/cycloidio/raws v1.0.2
github.com/go-kit/kit v0.9.0
github.com/golang/mock v1.3.1
github.com/golang/snappy v0.0.1 // indirect
Expand Down
4 changes: 0 additions & 4 deletions provider/import_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,8 @@ func TestImport(t *testing.T) {
iamUser1.EXPECT().Read(f).Return(errcode.ErrProviderResourceDoNotMatchTag)
iamUser2.EXPECT().Read(f).Return(nil)

iamUser1.EXPECT().HCL(hw).Return(nil)
iamUser2.EXPECT().HCL(hw).Return(nil)

iamUser1.EXPECT().State(sw).Return(nil)
iamUser2.EXPECT().State(sw).Return(nil)

hw.EXPECT().Sync().Return(nil)
Expand Down Expand Up @@ -231,7 +229,6 @@ func TestImport(t *testing.T) {
iamUser1.EXPECT().Read(f).Return(errcode.ErrProviderResourceDoNotMatchTag)
iamUser2.EXPECT().Read(f).Return(nil)

iamUser1.EXPECT().State(sw).Return(nil)
iamUser2.EXPECT().State(sw).Return(nil)

sw.EXPECT().Sync().Return(nil)
Expand Down Expand Up @@ -270,7 +267,6 @@ func TestImport(t *testing.T) {
iamUser1.EXPECT().Read(f).Return(errcode.ErrProviderResourceDoNotMatchTag)
iamUser2.EXPECT().Read(f).Return(nil)

iamUser1.EXPECT().HCL(hw).Return(nil)
iamUser2.EXPECT().HCL(hw).Return(nil)

hw.EXPECT().Sync().Return(nil)
Expand Down

0 comments on commit db6d0f9

Please sign in to comment.