scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing TestHCPLinkConnected Test (#19474)

Browse Source 
* 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 9f8d831d94
commit e44bd4c61d
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

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

2
Makefile
View File

@@ -217,7 +217,7 @@ fmtcheck:
#@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" #@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
fmt: 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:
semgrep --include '*.go' --exclude 'vendor' -a -f tools/semgrep . semgrep --include '*.go' --exclude 'vendor' -a -f tools/semgrep .

7
command/server/hcp_link_config_test.go
View File

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

1
vault/external_tests/hcp_link/hcp_link_test.go
View File

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