Automatically replaces duplicate containers.

Allows customisation of mock listen port.

Author: outofcoffee

README.md

@@ -42,7 +42,13 @@ Available Commands:
   validate    Validate a file against the OpenDeps schema
 ```
 
-Create and start mocks:
+#### Create and start mocks
+
+Example:
+
+    opendeps mock
+
+Usage:
 
 ```
 Starts a live mock of your API dependencies, based
@@ -53,9 +59,19 @@ by this tool.
 
 Usage:
   opendeps mock OPENDEPS_FILE
+
+Flags:
+  -p, --port   Port on which to listen (default 8080)
 ```
 
-Test dependencies are available:
+#### Test dependencies are available
+
+Example:
+
+    opendeps test
+
+Usage:
+
 ```
 Invokes the availability endpoints of each dependency,
 optionally ignoring failures if the dependency is not
@@ -72,7 +88,13 @@ Flags:
   -s, --server stringToString   Override server base URL for a dependency (e.g. foo_service=https://example.com) (default [])
 ```
 
-Create an OpenDeps manifest based on OpenAPI files:
+#### Create an OpenDeps manifest from OpenAPI files
+
+Example:
+
+    opendeps scaffold
+
+Usage:
 
 ```
 Creates an OpenDeps manifest based on the OpenAPI specification files in a directory.
@@ -87,7 +109,13 @@ Flags:
   -h, --help              help for scaffold
 ```
 
-Validate OpenDeps file:
+#### Validate OpenDeps file
+
+Example:
+
+    opendeps validate
+
+Usage:
 
 ```
 Validates a YAML manifest file against the OpenDeps schema.
@@ -96,7 +124,7 @@ Usage:
   opendeps validate OPENDEPS_FILE
 ```
 
-Help:
+#### Help
 
 ```
 Provides help for any command in the application.

cmd/mock.go

@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"fmt"
 	"gatehill.io/imposter/engine"
 	"gatehill.io/imposter/engine/docker"
 	"github.com/sirupsen/logrus"
@@ -32,6 +33,8 @@ import (
 	"syscall"
 )
 
+var flagPort int
+
 // mockCmd represents the mock command
 var mockCmd = &cobra.Command{
 	Use:   "mock OPENDEPS_FILE",
@@ -58,11 +61,12 @@ by this tool.`,
 		openapi.BundleSpecs(stagingDir, manifestPath, manifest, flagForceOverwrite)
 
 		mockEngine := docker.BuildEngine(stagingDir, engine.StartOptions{
-			Port:           8080,
+			Port:           flagPort,
 			Version:        "latest",
 			PullPolicy:     engine.PullIfNotPresent,
 			LogLevel:       "DEBUG",
 			ReplaceRunning: true,
+			Deduplicate:    genDeduplicationKey(manifestPath, flagPort),
 		})
 		wg := &sync.WaitGroup{}
 		mockEngine.Start(wg)
@@ -72,7 +76,14 @@ by this tool.`,
 	},
 }
 
+// genDeduplicationKey overrides the default deduplication key to a
+// stable value, since the staging dir is dynamic
+func genDeduplicationKey(manifestPath string, port int) string {
+	return fmt.Sprintf("%v:%d", manifestPath, port)
+}
+
 func init() {
+	mockCmd.Flags().IntVarP(&flagPort, "port", "p", 8080, "Port on which to listen")
 	rootCmd.AddCommand(mockCmd)
 }
 

docs/install.md

@@ -25,6 +25,10 @@ curl -L https://raw.githubusercontent.com/opendeps/cli/main/install/install_open
 
 See [Releases](https://github.com/opendeps/cli/releases) for the latest version.
 
+---
+
+# Advanced installation steps
+
 ## macOS
 
 Only Intel x86_64 is supported on macOS.

go.mod

@@ -2,10 +2,10 @@ module opendeps.org/opendeps
 
 go 1.17
 
-replace gatehill.io/imposter => github.com/gatehill/imposter-cli v0.6.7
+replace gatehill.io/imposter => github.com/gatehill/imposter-cli v0.6.9
 
 require (
-	gatehill.io/imposter v0.6.7
+	gatehill.io/imposter v0.6.9
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect

go.sum

@@ -279,8 +279,8 @@ github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWp
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/gatehill/imposter-cli v0.6.7 h1:zdJupU6tdRrpQAFATRBLRjj8JnGs3FbYFDSronqZDsM=
-github.com/gatehill/imposter-cli v0.6.7/go.mod h1:xSgU6ap03w66qq8EnP//1OpX8GUZwJr9tmW+X7yHZfw=
+github.com/gatehill/imposter-cli v0.6.9 h1:ZWBFxRJTd8k1cZtoxS7q1sJKKVst8F/RoNTY1He/VJU=
+github.com/gatehill/imposter-cli v0.6.9/go.mod h1:xSgU6ap03w66qq8EnP//1OpX8GUZwJr9tmW+X7yHZfw=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=