Skip to content

Commit

Permalink
Replace testing.T with testing.TestingT (#904)
Browse files Browse the repository at this point in the history
  • Loading branch information
Apostolos Benisis committed May 28, 2021
1 parent 38f3e06 commit 07352c9
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions modules/terraform/var-file.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"fmt"
"io/ioutil"
"reflect"
"testing"

"github.com/gruntwork-io/terratest/modules/testing"

"github.com/hashicorp/hcl/v2/hclparse"
"github.com/stretchr/testify/require"
Expand All @@ -16,7 +17,7 @@ import (

// GetVariableAsStringFromVarFile Gets the string represention of a variable from a provided input file found in VarFile
// For list or map, use GetVariableAsListFromVarFile or GetVariableAsMapFromVarFile, respectively.
func GetVariableAsStringFromVarFile(t *testing.T, fileName string, key string) string {
func GetVariableAsStringFromVarFile(t testing.TestingT, fileName string, key string) string {
result, err := GetVariableAsStringFromVarFileE(t, fileName, key)
require.NoError(t, err)

Expand All @@ -26,7 +27,7 @@ func GetVariableAsStringFromVarFile(t *testing.T, fileName string, key string) s
// GetVariableAsStringFromVarFileE Gets the string represention of a variable from a provided input file found in VarFile
// Will return an error if GetAllVariablesFromVarFileE returns an error or the key provided does not exist in the file.
// For list or map, use GetVariableAsListFromVarFile or GetVariableAsMapFromVarFile, respectively.
func GetVariableAsStringFromVarFileE(t *testing.T, fileName string, key string) (string, error) {
func GetVariableAsStringFromVarFileE(t testing.TestingT, fileName string, key string) (string, error) {
var variables map[string]interface{}
err := GetAllVariablesFromVarFileE(t, fileName, &variables)
if err != nil {
Expand All @@ -44,7 +45,7 @@ func GetVariableAsStringFromVarFileE(t *testing.T, fileName string, key string)

// GetVariableAsMapFromVarFile Gets the map represention of a variable from a provided input file found in VarFile
// Note that this returns a map of strings. For maps containing complex types, use GetAllVariablesFromVarFile.
func GetVariableAsMapFromVarFile(t *testing.T, fileName string, key string) map[string]string {
func GetVariableAsMapFromVarFile(t testing.TestingT, fileName string, key string) map[string]string {
result, err := GetVariableAsMapFromVarFileE(t, fileName, key)
require.NoError(t, err)
return result
Expand All @@ -53,7 +54,7 @@ func GetVariableAsMapFromVarFile(t *testing.T, fileName string, key string) map[
// GetVariableAsMapFromVarFileE Gets the map represention of a variable from a provided input file found in VarFile.
// Note that this returns a map of strings. For maps containing complex types, use GetAllVariablesFromVarFile
// Returns an error if GetAllVariablesFromVarFileE returns an error, the key provided does not exist, or the value associated with the key is not a map
func GetVariableAsMapFromVarFileE(t *testing.T, fileName string, key string) (map[string]string, error) {
func GetVariableAsMapFromVarFileE(t testing.TestingT, fileName string, key string) (map[string]string, error) {
var variables map[string]interface{}
err := GetAllVariablesFromVarFileE(t, fileName, &variables)
if err != nil {
Expand All @@ -79,7 +80,7 @@ func GetVariableAsMapFromVarFileE(t *testing.T, fileName string, key string) (ma

// GetVariableAsListFromVarFile Gets the string list represention of a variable from a provided input file found in VarFile
// Note that this returns a list of strings. For lists containing complex types, use GetAllVariablesFromVarFile.
func GetVariableAsListFromVarFile(t *testing.T, fileName string, key string) []string {
func GetVariableAsListFromVarFile(t testing.TestingT, fileName string, key string) []string {
result, err := GetVariableAsListFromVarFileE(t, fileName, key)
require.NoError(t, err)

Expand All @@ -89,7 +90,7 @@ func GetVariableAsListFromVarFile(t *testing.T, fileName string, key string) []s
// GetVariableAsListFromVarFileE Gets the string list represention of a variable from a provided input file found in VarFile
// Note that this returns a list of strings. For lists containing complex types, use GetAllVariablesFromVarFile.
// Will return error if GetAllVariablesFromVarFileE returns an error, the key provided does not exist, or the value associated with the key is not a list
func GetVariableAsListFromVarFileE(t *testing.T, fileName string, key string) ([]string, error) {
func GetVariableAsListFromVarFileE(t testing.TestingT, fileName string, key string) ([]string, error) {
var variables map[string]interface{}
err := GetAllVariablesFromVarFileE(t, fileName, &variables)
if err != nil {
Expand All @@ -115,15 +116,15 @@ func GetVariableAsListFromVarFileE(t *testing.T, fileName string, key string) ([

// GetAllVariablesFromVarFileE Parses all data from a provided input file found ind in VarFile and stores the result in
// the value pointed to by out.
func GetAllVariablesFromVarFile(t *testing.T, fileName string, out interface{}) {
func GetAllVariablesFromVarFile(t testing.TestingT, fileName string, out interface{}) {
err := GetAllVariablesFromVarFileE(t, fileName, out)
require.NoError(t, err)
}

// GetAllVariablesFromVarFileE Parses all data from a provided input file found ind in VarFile and stores the result in
// the value pointed to by out. Returns an error if the specified file does not exist, the specified file is not
// readable, or the specified file cannot be decoded from HCL.
func GetAllVariablesFromVarFileE(t *testing.T, fileName string, out interface{}) error {
func GetAllVariablesFromVarFileE(t testing.TestingT, fileName string, out interface{}) error {
fileContents, err := ioutil.ReadFile(fileName)
if err != nil {
return err
Expand Down

0 comments on commit 07352c9

Please sign in to comment.