diff --git a/helpers/foundation-deployer/go.mod b/helpers/foundation-deployer/go.mod index 42376a0df..fc274f3e6 100644 --- a/helpers/foundation-deployer/go.mod +++ b/helpers/foundation-deployer/go.mod @@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-example-foundation/helpers/ go 1.22 -toolchain go1.22.5 +toolchain go1.22.6 require ( github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 @@ -10,7 +10,7 @@ require ( github.com/hashicorp/hcl/v2 v2.21.0 github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 github.com/stretchr/testify v1.9.0 - github.com/terraform-google-modules/terraform-example-foundation/test/integration v0.0.0-20240530101341-20e72789e0ac + github.com/terraform-google-modules/terraform-example-foundation/test/integration v0.0.0-20240808135927-5f1fd0f4104a github.com/tidwall/gjson v1.17.3 ) @@ -55,7 +55,7 @@ require ( golang.org/x/crypto v0.21.0 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.20.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/helpers/foundation-deployer/go.sum b/helpers/foundation-deployer/go.sum index 02493abd7..9bffcc149 100644 --- a/helpers/foundation-deployer/go.sum +++ b/helpers/foundation-deployer/go.sum @@ -410,8 +410,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/terraform-google-modules/terraform-example-foundation/test/integration v0.0.0-20240530101341-20e72789e0ac h1:hKmWS3gfdchjfK1xC6z0Tll65D+Poxr0aBCgRgGoaNs= -github.com/terraform-google-modules/terraform-example-foundation/test/integration v0.0.0-20240530101341-20e72789e0ac/go.mod h1:tQ3UD4Hq6eDIfxNp5qKK6UVePeTc+fQBUqjx8jN/NyM= +github.com/terraform-google-modules/terraform-example-foundation/test/integration v0.0.0-20240808135927-5f1fd0f4104a h1:4Ih0BauwdUTF+YuA55/qY8Q+d5brYKPpae0YWkB9D2A= +github.com/terraform-google-modules/terraform-example-foundation/test/integration v0.0.0-20240808135927-5f1fd0f4104a/go.mod h1:p8CvVuYRey5Nb8dipH5KM+eY+TnqfLgDnQ5M1a7oHiw= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94= github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -567,8 +567,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= -golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/helpers/foundation-deployer/steps/steps_test.go b/helpers/foundation-deployer/steps/steps_test.go index d87a4a28a..a10a5f413 100644 --- a/helpers/foundation-deployer/steps/steps_test.go +++ b/helpers/foundation-deployer/steps/steps_test.go @@ -77,7 +77,7 @@ func TestProcessSteps(t *testing.T) { badStepMsg := "bad step" assert.False(t, s.IsStepComplete("bad"), "check if 'bad' is 'COMPLETED' should be false") err = s.RunStep("bad", func() error { - return fmt.Errorf(badStepMsg) + return fmt.Errorf("%s", badStepMsg) }) assert.Error(t, err) assert.False(t, s.IsStepComplete("bad"), "check if 'bad' is 'COMPLETED' should be false") @@ -86,7 +86,7 @@ func TestProcessSteps(t *testing.T) { // complete states are not executed again assert.True(t, s.IsStepComplete("good"), "check if 'good' is 'COMPLETED' should be true") err = s.RunStep("good", func() error { - return fmt.Errorf("will fail if executed") + return fmt.Errorf("%s", "will fail if executed") }) assert.NoError(t, err) assert.True(t, s.IsStepComplete("good"), "check if 'good' is 'COMPLETED' should be true") @@ -103,7 +103,7 @@ func TestProcessSteps(t *testing.T) { assert.NoError(t, err) assert.False(t, s.IsStepDestroyed("destroy"), "check if 'destroy' is 'DESTROYED' should be false") err = s.RunDestroyStep("destroy", func() error { - return fmt.Errorf(badStepMsg) + return fmt.Errorf("%s", badStepMsg) }) assert.Error(t, err) assert.False(t, s.IsStepDestroyed("destroy"), "check if 'destroy' is 'DESTROYED' should be false") @@ -113,7 +113,7 @@ func TestProcessSteps(t *testing.T) { assert.NoError(t, err) assert.True(t, s.IsStepDestroyed("gone"), "check if 'gone' is 'DESTROYED' should be true") err = s.RunDestroyStep("gone", func() error { - return fmt.Errorf("will fail if executed") + return fmt.Errorf("%s", "will fail if executed") }) assert.NoError(t, err) assert.True(t, s.IsStepDestroyed("gone"), "check if 'gone' is 'DESTROYED' should be true") diff --git a/test/integration/go.mod b/test/integration/go.mod index 51bea2ab7..d7e5c890b 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-example-foundation/test/int go 1.22 -toolchain go1.22.5 +toolchain go1.22.6 require ( github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1