Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flag --mock-port / -m to specify port for Mock #47

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion command/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
var port int
var network string
var address string
var mockPort int
var daemonCmdInstance *daemon.Daemon
var daemonCmd = &cobra.Command{
Use: "daemon",
Expand All @@ -16,7 +17,9 @@ var daemonCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
setLogLevel(verbose, logLevel)

mock := &daemon.MockService{}
mock := &daemon.MockService{
Port: mockPort,
}
mock.Setup()
verifier := &daemon.VerificationService{}
verifier.Setup()
Expand All @@ -29,5 +32,6 @@ func init() {
daemonCmd.Flags().IntVarP(&port, "port", "p", 6666, "Local daemon port to listen on")
daemonCmd.Flags().StringVarP(&network, "network", "n", "tcp", "Local network interface to listen on ('tcp', 'tcp4', 'tcp6')")
daemonCmd.Flags().StringVarP(&address, "address", "a", "", "Local network address to listen on (e.g. '', '127.0.0.1', '[::1]' etc.)")
daemonCmd.Flags().IntVarP(&mockPort, "mock-port", "m", 0, "Local port for mock service to attach to if not provided will be random (for use in containers)")
RootCmd.AddCommand(daemonCmd)
}
10 changes: 9 additions & 1 deletion daemon/mock_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,19 @@ import (
// MockService is a wrapper for the Pact Mock Service.
type MockService struct {
ServiceManager

// Extra field for only MockService
Port int
}

// NewService creates a new MockService with default settings.
func (m *MockService) NewService(args []string) (int, Service) {
port, _ := utils.GetFreePort()
var port int
if m.Port != 0 {
port = m.Port
} else {
port, _ = utils.GetFreePort()
}
log.Println("[DEBUG] starting mock service on port:", port)

m.Args = []string{
Expand Down