Parametrize pact broker password, make publishing part of the consumer tests.

Author: pmacik

.make/test.mk

@@ -197,6 +197,8 @@ test-integration-no-coverage: prebuild-check migrate-database $(SOURCES)
 test-contract-auth-consumers:
 	cd $(CONTRACT_TESTS)/auth && \
 	PACT_DIR=$(CONTRACT_TESTS)/pacts \
+	PACT_VERSION=$(PACT_VERSION) \
+	PACT_BROKER_URL=$(PACT_BROKER_URL) \
 	./consumer-contracts.sh
 
 .PHONY: test-contract-auth-publish

test/contracts/.gitignore

@@ -1,3 +1,4 @@
 **/*log
 **/*logs
-**/*pacts
+**/*pacts
+.password

test/contracts/auth/auth_api_user.go

@@ -73,7 +73,8 @@ type MissingToken struct {
 	} `json:"errors"`
 }
 
-const JWSRegex = "[a-zA-Z0-9\\-_]+?\\.?[a-zA-Z0-9\\-_]+?\\.?([a-zA-Z0-9\\-_]+)?"
+const jwsRegex = "[a-zA-Z0-9\\-_]+?\\.?[a-zA-Z0-9\\-_]+?\\.?([a-zA-Z0-9\\-_]+)?"
+const userNameRegex = "[a-zA-Z\\-0-9]+"
 
 // AuthAPIUserByNameConsumer defines contract of /api/users?filter[username]=<user_name> endpoint
 func AuthAPIUserByNameConsumer(t *testing.T, pact *dsl.Pact) {
@@ -106,7 +107,7 @@ func AuthAPIUserByNameConsumer(t *testing.T, pact *dsl.Pact) {
 			Query: dsl.MapMatcher{
 				"filter[username]": dsl.Term(
 					userName,
-					".*",
+					userNameRegex,
 				),
 			},
 			Headers: dsl.MapMatcher{"Content-Type": dsl.String("application/json")},
@@ -152,7 +153,7 @@ func AuthAPIUserByIDConsumer(t *testing.T, pact *dsl.Pact) {
 			Method: "GET",
 			Path: dsl.Term(
 				fmt.Sprintf("/api/users/%s", userID),
-				"/api/users/.*",
+				fmt.Sprintf("/api/users/%s", userNameRegex),
 			),
 			Headers: dsl.MapMatcher{"Content-Type": dsl.String("application/json")},
 		}).
@@ -203,7 +204,7 @@ func AuthAPIUserInvalidToken(t *testing.T, pact *dsl.Pact) {
 				"Content-Type": dsl.String("application/json"),
 				"Authorization": dsl.Term(
 					fmt.Sprintf("Bearer %s", invalidToken),
-					fmt.Sprintf("^Bearer %s$", JWSRegex),
+					fmt.Sprintf("^Bearer %s$", jwsRegex),
 				),
 			},
 		}).

test/contracts/auth/consumer-contracts.sh

@@ -4,3 +4,8 @@
 
 # run test
 go test -v -run 'Test*'
+TEST_EXIT=$?
+
+if [ "$TEST_EXIT" == "0" ]; then
+    ./publish-contracts.sh
+fi

test/contracts/auth/contract_test.go

@@ -14,6 +14,7 @@ func TestAuthAPI(t *testing.T) {
 	pact := &dsl.Pact{
 		Consumer:          os.Getenv("PACT_CONSUMER"),
 		Provider:          os.Getenv("PACT_PROVIDER"),
+		PactDir:           os.Getenv("PACT_DIR"),
 		Host:              "localhost",
 		PactFileWriteMode: "merge",
 	}

test/contracts/auth/setenv.sh

@@ -6,12 +6,16 @@ set -a
 GOPATH="$GOPATH:$(pwd)"
 
 # A directory to save pact files
-PACT_DIR="${PACT_DIR:-pacts}"
+PACT_DIR="${PACT_DIR:-$(pwd)/pacts}"
 PACT_CONSUMER="${PACT_CONSUMER:-Fabric8TenantService}"
 PACT_PROVIDER="${PACT_PROVIDER:-Fabric8AuthService}"
 
 PACT_BROKER_URL="${PACT_BROKER_URL:-http://pact-broker-pact-broker.193b.starter-ca-central-1.openshiftapps.com}"
 PACT_BROKER_USERNAME="${PACT_BROKER_USERNAME:-pact_broker}"
-PACT_BROKER_PASSWORD="${PACT_BROKER_PASSWORD:-}"
+if [ -z "$PACT_BROKER_PASSWORD" ]; then
+    if [ -f .password ]; then
+        PACT_BROKER_PASSWORD="$(cat .password)"
+    fi
+fi
 
 PACT_PROVIDER_BASE_URL="${PACT_PROVIDER_BASE_URL:-https://auth.openshift.io}"