Fix: Runtime versions in connector commands

cli/connector_command.go

@@ -68,7 +68,6 @@ func ConfigureConnectorCommand(parentCmd commandHost, opts *Options) {
 	saveCmd.Arg("id", "The id of the connector to create or modify").Required().StringVar(&c.id)
 	saveCmd.Flag("file", "Use the connector definition from the given file").Short('f').IsSetByUser(&c.fileSetByUser).Default("./ConnectFile").StringVar(&c.file)
 	saveCmd.Flag("runtime", "The runtime id").Default("wombat").StringVar(&c.runtime)
-	saveCmd.Flag("runtime-version", "The runtime version").Required().StringVar(&c.runtimeVersion)
 
 	copyCmd := connectorCmd.Command("copy", "Copy a connector").Action(c.copyConnector)
 	copyCmd.Arg("id", "The id of the connector to copy").Required().StringVar(&c.id)
@@ -344,9 +343,10 @@ func (c *connectorCommand) saveConnector(pc *fisk.ParseContext) error {
 	var sp spec.ConnectorSpec
 	if exists {
 		sp = spec.ConnectorSpec{
-			Description: conn.Description,
-			RuntimeId:   conn.RuntimeId,
-			Steps:       convert.ConvertStepsToSpec(conn.Steps),
+			Description:    conn.Description,
+			RuntimeId:      conn.RuntimeId,
+			RuntimeVersion: &conn.RuntimeVersion,
+			Steps:          convert.ConvertStepsToSpec(conn.Steps),
 		}
 	} else {
 		if !c.fileSetByUser {
@@ -373,7 +373,11 @@ func (c *connectorCommand) saveConnector(pc *fisk.ParseContext) error {
 
 	var connector *model.Connector
 	if !exists {
-		connector, err = appCtx.Client.CreateConnector(c.id, result.Description, result.RuntimeId, c.runtimeVersion, convert.ConvertStepsFromSpec(result.Steps), c.opts.Timeout)
+		runtimeVersion := ""
+		if result.RuntimeVersion != nil {
+			runtimeVersion = *result.RuntimeVersion
+		}
+		connector, err = appCtx.Client.CreateConnector(c.id, result.Description, result.RuntimeId, runtimeVersion, convert.ConvertStepsFromSpec(result.Steps), c.opts.Timeout)
 		if err != nil {
 			color.Red("Could not save connector: %s", err)
 			os.Exit(1)

cli/render.go

@@ -33,7 +33,11 @@ func renderConnector(c model.Connector) string {
 	tbl.SetTitle(fmt.Sprintf("Connector: %s", c.ConnectorId))
 	tbl.AppendRow(table.Row{"Description", text.WrapSoft(c.Description, 50)})
 
-	tbl.AppendRow(table.Row{"Runtime", c.RuntimeId})
+	runtime := c.RuntimeId
+	if c.RuntimeVersion != "" {
+		runtime = fmt.Sprintf("%s:%s", c.RuntimeId, c.RuntimeVersion)
+	}
+	tbl.AppendRow(table.Row{"Runtime", runtime})
 
 	b, err := yaml.Marshal(c.Steps)
 	fisk.FatalIfError(err, "failed to render steps")

client/connector.go

@@ -76,11 +76,14 @@ func (c *connectorClient) GetConnectorStatus(name string, timeout time.Duration)
 
 func (c *connectorClient) CreateConnector(id, description, runtimeId string, runtimeVersion string, steps model.Steps, timeout time.Duration) (*model.Connector, error) {
 	req := model.ConnectorCreateRequest{
-		Id:             id,
-		Description:    description,
-		RuntimeId:      runtimeId,
-		RuntimeVersion: &runtimeVersion,
-		Steps:          steps,
+		Id:          id,
+		Description: description,
+		RuntimeId:   runtimeId,
+		Steps:       steps,
+	}
+
+	if runtimeVersion != "" {
+		req.RuntimeVersion = &runtimeVersion
 	}
 
 	var resp model.ConnectorCreateResponse

spec/schemas/connector-spec.schema.json

@@ -12,6 +12,10 @@
       "type": "string",
       "description": "The runtime to use for this connector. The runtime can be suffixed with the version, e.g. 'wombat:edge'"
     },
+    "runtime_version": {
+      "type": "string",
+      "description": "The version of the runtime"
+    },
     "steps": {
       "$ref": "connector-steps-model.schema.json"
     }