Use required.NoError for faster failure in tests

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

3 files changed, 12 insertions, 9 deletions

diff --git a/aws/ec2info_test.go b/aws/ec2info_test.go
index b2ca9336..2a9efefe 100644
--- a/aws/ec2info_test.go
+++ b/aws/ec2info_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTag_MissingKey(t *testing.T) {
@@ -144,25 +145,25 @@ func TestGetRegion(t *testing.T) {
 	os.Setenv("AWS_REGION", "kalamazoo")
 	os.Unsetenv("AWS_DEFAULT_REGION")
 	region, err := getRegion()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, region)
 
 	os.Setenv("AWS_DEFAULT_REGION", "kalamazoo")
 	os.Unsetenv("AWS_REGION")
 	region, err = getRegion()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, region)
 
 	os.Unsetenv("AWS_DEFAULT_REGION")
 	metaClient := NewDummyEc2Meta()
 	region, err = getRegion(metaClient)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "unknown", region)
 
 	ec2meta := MockEC2Meta(nil, nil, "us-east-1")
 
 	region, err = getRegion(ec2meta)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "us-east-1", region)
 }
 
diff --git a/aws/kms_test.go b/aws/kms_test.go
index 72eab2b4..f40c1fec 100644
--- a/aws/kms_test.go
+++ b/aws/kms_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/kms"
 	b64 "github.com/hairyhenderson/gomplate/v4/base64"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // MockKMS is a mock KMSAPI implementation
@@ -34,7 +35,7 @@ func TestEncrypt(t *testing.T) {
 
 	// Success
 	resp, err := kmsClient.Encrypt("dummykey", "plaintextvalue")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	expectedResp, _ := b64.Encode([]byte("PLAINTEXTVALUE"))
 	assert.EqualValues(t, expectedResp, resp)
 }
@@ -47,6 +48,6 @@ func TestDecrypt(t *testing.T) {
 
 	// Success
 	resp, err := kmsClient.Decrypt(encodedCiphertextBlob)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.EqualValues(t, "ciphervalue", resp)
 }
diff --git a/aws/sts_test.go b/aws/sts_test.go
index 85bbeccd..f3bc2e89 100644
--- a/aws/sts_test.go
+++ b/aws/sts_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewSTS(t *testing.T) {
@@ -22,7 +23,7 @@ func TestNewSTS(t *testing.T) {
 	}
 
 	out, err := s.getCallerID()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.EqualValues(t, &sts.GetCallerIdentityOutput{
 		Account: aws.String("acct"),
 		Arn:     aws.String("arn"),
@@ -44,7 +45,7 @@ func TestNewSTS(t *testing.T) {
 	defer func() { identifierClient = oldIDClient }()
 
 	out, err = s.getCallerID()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.EqualValues(t, &sts.GetCallerIdentityOutput{
 		Account: aws.String("acct"),
 		Arn:     aws.String("arn"),
@@ -68,7 +69,7 @@ func TestGetCallerIDErrors(t *testing.T) {
 	}
 
 	out, err := s.Account()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "acct", out)
 
 	s = NewSTS(ClientOptions{})