gitlab_support_readiness 1.0.29 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ca2350536014a634279c6a491c0658ffe7b24904cac0037a6ec5c3a06316854
-  data.tar.gz: f629f6087c8b8d7479e942c5c2ad70f15c2a9464dcb3e8949191e8384d5bf8be
+  metadata.gz: 2d9a3197a7aab52f7e7b6e05e0b83db132ec43921a793e409ce057e938817117
+  data.tar.gz: 60d63acfc1b36dc09cc35128b6e5b0ef4f39768b55c417e4219ce7d879c0cee7
 SHA512:
-  metadata.gz: 46212ae44f7841397bf47051df2d493cda9a13868cd9355f75430756f3c9a415834f3fd02321d8a5f7f7fe3f13477f0c6ab76cac79eff2c8e451709ee1ae8ee8
-  data.tar.gz: 1c72dd362a329149b6fec68c379a6aea2271ab7185ff5aafcf9f7a5f54cbd0be2b620af83ff3bf1dded0ed4bf58be17665ab63f31786b315fb68fd5a2f95c944
+  metadata.gz: ba3da2135b041d519cc58781dd8ae35173f856eb1af3f9147d632cfebb37d53fa4f6e50e23dbb35b02517de105db0cf7505caf5899373bf8f35457d0469dfcfa
+  data.tar.gz: 5236fd74099cca70f3e4420aa8438519587b2143b5c75165ce9d26144793f8b83339412c3fce15cdca573a80b2ff8183c69a14c40139516b6fca5fe43bf8ffd8

data/lib/support_readiness/zendesk/themes.rb

@@ -198,7 +198,7 @@ module Readiness
           }
         }
         response = client.connection.post 'guide/theming/jobs/themes/updates', object.to_json
-        handle_request_error(1, 'Zendesk', response.status, { action: 'Upload app', id: file }) unless response.status == 200
+        handle_request_error(1, 'Zendesk', response.status, { action: 'Upload theme', id: theme.id }) unless response.status == 200
         ThemeJobStatuses.new(Oj.load(response.body)['job'])
       end
 
@@ -259,11 +259,21 @@ module Readiness
       #   pp job.id
       #   # => "a66e7bde543c6b6d018f0e07a654feaf"
       def self.upload!(client, job, file)
-        object = job['data']['upload']['parameters'].merge(
+        url = if job.is_a?(Hash)
+                job['data']['upload']['url']
+              else
+                job.data['upload']['url']
+              end
+        params = if job.is_a?(Hash)
+                   job['data']['upload']['parameters']
+                 else
+                   job.data['upload']['parameters']
+                 end
+        object = params.merge(
           file: ::Faraday::UploadIO.new(file, 'application/zip')
         )
-        response = client.upload_connection.post job['data']['upload']['url'], object
-        ThemeJobStatuses.find!(client, job['id'])
+        response = client.upload_connection.post job.data['upload']['url'], object
+        ThemeJobStatuses.find!(client, job.id)
       end
 
       ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.31
 platform: ruby
 authors:
 - Jason Colyer