unset PACT_BROKER_USERNAME/PASSWORD if TOKEN is set

pact-foundation · May 7, 2024 · 3d5a41e · 3d5a41e
1 parent 67293ae
commit 3d5a41e
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ env:
   APP_REF: ${{ github.ref }}
   LD_LIBRARY_PATH: /tmp
   PACT_GO_LIB_DOWNLOAD_PATH: /tmp
-  LOG_LEVEL: debug
+  LOG_LEVEL: info
   COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:

diff --git a/examples/consumer_v2_test.go b/examples/consumer_v2_test.go
@@ -35,7 +35,7 @@ var ArrayMinLike = matchers.ArrayMinLike
 type Map = matchers.MapMatcher
 
 func TestConsumerV2(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 
 	mockProvider, err := consumer.NewV2Pact(consumer.MockHTTPProviderConfig{
 		Consumer: "PactGoV2Consumer",
@@ -79,7 +79,7 @@ func TestConsumerV2(t *testing.T) {
 }
 
 func TestConsumerV2_Match(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 
 	mockProvider, err := consumer.NewV2Pact(consumer.MockHTTPProviderConfig{
 		Consumer: "PactGoV2ConsumerMatch",
@@ -111,7 +111,7 @@ func TestConsumerV2_Match(t *testing.T) {
 }
 
 func TestConsumerV2AllInOne(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 
 	mockProvider, err := consumer.NewV2Pact(consumer.MockHTTPProviderConfig{
 		Consumer: "PactGoV2ConsumerAllInOne",

diff --git a/examples/consumer_v3_test.go b/examples/consumer_v3_test.go
@@ -30,7 +30,7 @@ var TimeGenerated = matchers.TimeGenerated
 var DateTimeGenerated = matchers.DateTimeGenerated
 
 func TestConsumerV3(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 
 	mockProvider, err := consumer.NewV3Pact(consumer.MockHTTPProviderConfig{
 		Consumer: "PactGoV3Consumer",
@@ -90,7 +90,7 @@ func TestConsumerV3(t *testing.T) {
 	assert.NoError(t, err)
 }
 func TestMessagePact(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 
 	provider, err := message.NewMessagePact(message.Config{
 		Consumer: "PactGoV3MessageConsumer",

diff --git a/examples/consumer_v4_test.go b/examples/consumer_v4_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestConsumerV4(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 
 	mockProvider, err := consumer.NewV4Pact(consumer.MockHTTPProviderConfig{
 		Consumer: "PactGoV4Consumer",

diff --git a/examples/grpc/grpc_provider_test.go b/examples/grpc/grpc_provider_test.go
@@ -21,7 +21,7 @@ import (
 
 func TestGrpcProvider(t *testing.T) {
 	go startProvider()
-	l.SetLogLevel("TRACE")
+	l.SetLogLevel("INFO")
 
 	verifier := provider.NewVerifier()
 

diff --git a/examples/protobuf-message/protobuf_provider_test.go b/examples/protobuf-message/protobuf_provider_test.go
@@ -23,7 +23,7 @@ func TestPluginMessageProvider(t *testing.T) {
 	var dir, _ = os.Getwd()
 	var pactDir = fmt.Sprintf("%s/../pacts", dir)
 
-	err := pactlog.SetLogLevel("TRACE")
+	err := pactlog.SetLogLevel("INFO")
 	assert.NoError(t, err)
 
 	pactversion.CheckVersion()

diff --git a/examples/provider_test.go b/examples/provider_test.go
@@ -27,7 +27,7 @@ var requestFilterCalled = false
 var stateHandlerCalled = false
 
 func TestV3HTTPProvider(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 	version.CheckVersion()
 
 	// Start provider API in the background
@@ -101,7 +101,7 @@ func TestV3HTTPProvider(t *testing.T) {
 }
 
 func TestV3MessageProvider(t *testing.T) {
-	log.SetLogLevel("TRACE")
+	log.SetLogLevel("INFO")
 	var user *User
 
 	verifier := provider.NewVerifier()

diff --git a/internal/native/message_server_test.go b/internal/native/message_server_test.go
@@ -349,7 +349,7 @@ func TestGetPluginAsyncMessageContentsAsBytes(t *testing.T) {
 func TestGrpcPluginInteraction(t *testing.T) {
 	tmpPactFolder, err := os.MkdirTemp("", "pact-go")
 	assert.NoError(t, err)
-	_ = log.SetLogLevel("TRACE")
+	_ = log.SetLogLevel("INFO")
 
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 
@@ -426,7 +426,7 @@ func TestGrpcPluginInteraction(t *testing.T) {
 func TestGrpcPluginInteraction_ErrorResponse(t *testing.T) {
 	tmpPactFolder, err := os.MkdirTemp("", "pact-go")
 	assert.NoError(t, err)
-	_ = log.SetLogLevel("TRACE")
+	_ = log.SetLogLevel("INFO")
 
 	m := NewMessageServer("test-message-consumer", "test-message-provider")
 

diff --git a/internal/native/mock_server_test.go b/internal/native/mock_server_test.go
@@ -167,7 +167,7 @@ func TestHandleBasedHTTPTests(t *testing.T) {
 func TestPluginInteraction(t *testing.T) {
 	tmpPactFolder, err := os.MkdirTemp("", "pact-go")
 	assert.NoError(t, err)
-	_ = log.SetLogLevel("trace")
+	_ = log.SetLogLevel("INFO")
 
 	m := NewHTTPPact("test-plugin-consumer", "test-plugin-provider")
 

diff --git a/internal/native/verifier_test.go b/internal/native/verifier_test.go
@@ -29,7 +29,7 @@ func TestVerifier_Verify(t *testing.T) {
 			"--state-change-url",
 			"http://localhost:55827/__setup/",
 			"--loglevel",
-			"trace",
+			"info",
 		}
 
 		res := v.Verify(args)

diff --git a/make/config.mk b/make/config.mk
@@ -1,5 +1,8 @@
 export PATH := $(PWD)/pact/bin:$(PATH)
 export PATH
 export PACT_BROKER_BASE_URL?=http://127.0.0.1
-export PACT_BROKER_USERNAME?=pact_workshop
-export PACT_BROKER_PASSWORD?=pact_workshop
+
+ifndef PACT_BROKER_TOKEN
+	export PACT_BROKER_USERNAME?=pact_workshop
+	export PACT_BROKER_PASSWORD?=pact_workshop
+endif
diff --git a/message/v4/asynchronous_message_test.go b/message/v4/asynchronous_message_test.go
@@ -14,7 +14,7 @@ func TestAsyncTypeSystem(t *testing.T) {
 		Provider: "asyncprovider",
 		PactDir:  "/tmp/",
 	})
-	_ = log.SetLogLevel("TRACE")
+	_ = log.SetLogLevel("INFO")
 
 	type foo struct {
 		Foo string `json:"foo"`

diff --git a/message/v4/synchronous_message_test.go b/message/v4/synchronous_message_test.go
@@ -16,7 +16,7 @@ func TestSyncTypeSystem(t *testing.T) {
 		Provider: "provider",
 		PactDir:  "/tmp/",
 	})
-	_ = log.SetLogLevel("TRACE")
+	_ = log.SetLogLevel("INFO")
 
 	dir, _ := os.Getwd()
 	path := fmt.Sprintf("%s/../../internal/native/pact_plugin.proto", dir)