Merge pull request #65 from vidispine/fixes-1.26

gre9ory · web-flow · commit a7f139c67b37 · 2023-03-13T16:46:32.000+01:00
fix identifier
diff --git a/hull-vidispine-addon/hull-vidispine-addon.yaml b/hull-vidispine-addon/hull-vidispine-addon.yaml
@@ -1205,7 +1205,7 @@ hull:
                             if ($overwriteExisting)
                             {
                                 $this.WriteLog("**** '$entityType' entry '$identifier' already exists, hence PUTing instead of POSTing to update entity")
-                                $this.PutEntity($uriPut, $content, $putQueryParams, $auth, $contentType, $headers)
+                                $this.PutEntity($uriPut, $identifier, $content, $putQueryParams, $auth, $contentType, $headers)
                                 $lastMethod = "PUT"
                                 $lastUri = $uriPut
                             }
@@ -1220,7 +1220,7 @@ hull:
                             if ($putInsteadOfPost)
                             {
                                 $this.WriteLog("**** PUTting '$entityType' entry '$identifier' to create it since 'putInsteadOfPost' is set to true")
-                                $this.PutEntity($uriPut, $content, $putQueryParams, $auth, $contentType, $headers)
+                                $this.PutEntity($uriPut, $identifier, $content, $putQueryParams, $auth, $contentType, $headers)
                                 $lastMethod = "PUT"
                                 $lastUri = $uriPut
                             }
@@ -1253,7 +1253,7 @@ hull:
                   }
 
                   # Put an entity
-                  hidden [PSCustomObject] PutEntity([string] $putUrl, [string] $json, [PSCustomObject] $putQueryParams, [PSCustomObject] $auth, [string] $contentType, [PSCustomObject] $headers)
+                  hidden [PSCustomObject] PutEntity([string] $putUrl, [string] $identifier, [string] $json, [PSCustomObject] $putQueryParams, [PSCustomObject] $auth, [string] $contentType, [PSCustomObject] $headers)
                   {
                       $url = $this.AppendQueryParamsToUri($putUrl, $putQueryParams, $identifier, $false)
                       return $this.InvokeWebRequest($url, "PUT", $json, $headers)

Original file line number	Diff line number	Diff line change
`@@ -1205,7 +1205,7 @@ hull:`
`1205`	`1205`	`if ($overwriteExisting)`
`1206`	`1206`	`{`
`1207`	`1207`	`$this.WriteLog("**** '$entityType' entry '$identifier' already exists, hence PUTing instead of POSTing to update entity")`
`1208`		`- $this.PutEntity($uriPut, $content, $putQueryParams, $auth, $contentType, $headers)`
	`1208`	`+ $this.PutEntity($uriPut, $identifier, $content, $putQueryParams, $auth, $contentType, $headers)`
`1209`	`1209`	`$lastMethod = "PUT"`
`1210`	`1210`	`$lastUri = $uriPut`
`1211`	`1211`	`}`
`@@ -1220,7 +1220,7 @@ hull:`
`1220`	`1220`	`if ($putInsteadOfPost)`
`1221`	`1221`	`{`
`1222`	`1222`	`$this.WriteLog("**** PUTting '$entityType' entry '$identifier' to create it since 'putInsteadOfPost' is set to true")`
`1223`		`- $this.PutEntity($uriPut, $content, $putQueryParams, $auth, $contentType, $headers)`
	`1223`	`+ $this.PutEntity($uriPut, $identifier, $content, $putQueryParams, $auth, $contentType, $headers)`
`1224`	`1224`	`$lastMethod = "PUT"`
`1225`	`1225`	`$lastUri = $uriPut`
`1226`	`1226`	`}`
`@@ -1253,7 +1253,7 @@ hull:`
`1253`	`1253`	`}`
`1254`	`1254`
`1255`	`1255`	`# Put an entity`
`1256`		`- hidden [PSCustomObject] PutEntity([string] $putUrl, [string] $json, [PSCustomObject] $putQueryParams, [PSCustomObject] $auth, [string] $contentType, [PSCustomObject] $headers)`
	`1256`	`+ hidden [PSCustomObject] PutEntity([string] $putUrl, [string] $identifier, [string] $json, [PSCustomObject] $putQueryParams, [PSCustomObject] $auth, [string] $contentType, [PSCustomObject] $headers)`
`1257`	`1257`	`{`
`1258`	`1258`	`$url = $this.AppendQueryParamsToUri($putUrl, $putQueryParams, $identifier, $false)`
`1259`	`1259`	`return $this.InvokeWebRequest($url, "PUT", $json, $headers)`