Fix failing TestHCPLinkConnected Test (#19474)

* replace use of os.Unsetenv in test with t.Setenv and remove t.Parallel from test that rely on env being modified.

* experiment with using fromJSON function

* revert previous experiment

* including double quotes in the output value for the string ubuntu-latest

* use go run to launch gofumpt
This commit is contained in:
Marc Boudreau 2023-03-09 13:46:54 -05:00 committed by GitHub
parent 5da90d563b
commit f286ee5b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions

View File

@ -21,7 +21,7 @@ jobs:
echo 'enterprise=1' >> $GITHUB_OUTPUT
echo 'go-tags=ent enterprise' >> $GITHUB_OUTPUT
else
echo 'runs-on=ubuntu-latest' >> $GITHUB_OUTPUT
echo 'runs-on="ubuntu-latest"' >> $GITHUB_OUTPUT
echo 'enterprise=' >> $GITHUB_OUTPUT
echo 'go-tags=' >> $GITHUB_OUTPUT
fi

View File

@ -217,7 +217,7 @@ fmtcheck:
#@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
fmt:
find . -name '*.go' | grep -v pb.go | grep -v vendor | xargs gofumpt -w
find . -name '*.go' | grep -v pb.go | grep -v vendor | xargs go run mvdan.cc/gofumpt -w
semgrep:
semgrep --include '*.go' --exclude 'vendor' -a -f tools/semgrep .

View File

@ -1,7 +1,6 @@
package server
import (
"os"
"testing"
"github.com/go-test/deep"
@ -10,9 +9,9 @@ import (
)
func TestHCPLinkConfig(t *testing.T) {
os.Unsetenv("HCP_CLIENT_ID")
os.Unsetenv("HCP_CLIENT_SECRET")
os.Unsetenv("HCP_RESOURCE_ID")
t.Setenv("HCP_CLIENT_ID", "")
t.Setenv("HCP_CLIENT_SECRET", "")
t.Setenv("HCP_RESOURCE_ID", "")
config, err := LoadConfigFile("./test-fixtures/hcp_link_config.hcl")
if err != nil {

View File

@ -8,7 +8,6 @@ import (
)
func TestHCPLinkConnected(t *testing.T) {
t.Parallel()
cluster := getTestCluster(t, 2)
defer cluster.Cleanup()