fastlane-plugin-dynatrace 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 920b0c5553ebb02953f85441f6ab8a4bba712003435f354e3f11458c0c23f7f9
-  data.tar.gz: 64d293694d00bd694df462fbd5ee5e16ed12359c93e18817e9bf9fe8a92f9c5d
+  metadata.gz: e893f895c684763a074f06dfa448156b4f4bdf639f7d287e409cd09c437a1709
+  data.tar.gz: c758ebf1327254eed71f2b138efe9b50b9058a38a3e2a235411fcbeb06fcefb2
 SHA512:
-  metadata.gz: 9be84816a06cf7df02d04d625c7b982e317a7b23a62f839de9cb1600c18ea08779c7f5d23d71de5cf802d507240c7826c61dd4daa07dd939f6e41cad9ad656ac
-  data.tar.gz: d452461f103ff34d7b290cd5a1bd3f4e988c01956779707cc5166572665101c817a3f880865d5ead209a547864b3a2e894875aa93e03cccdb4c3010748e560f4
+  metadata.gz: 3ba82e96e1e13c05504f5f732f7313ad10b743664da56f7198d4e5701e278c92a6fb4512088419200fede8b6e596f447a3ebccf921356a072fd067a2c333a978
+  data.tar.gz: 3f752665d4a5128e32d8340b795ce5ab323b97ae4314619f4d0f78d9482c572a273aa677db50cd6fc2786c35be1731a51e9cc330c33a09706bab22dfeba042dc

data/lib/fastlane/plugin/dynatrace/actions/dynatrace_action.rb

@@ -40,7 +40,10 @@ module Fastlane
             when '413'
               UI.user_error! "Failed to upload. The symbol file storage quota is exhausted. See https://www.dynatrace.com/support/help/shortlink/mobile-symbolication#manage-the-uploaded-symbol-files for more information."
             else
-              message = JSON.parse(response.body)["error"]["message"]
+              message = nil
+              unless response.body.nil?
+                message = JSON.parse(response.body)["error"]["message"]
+              end
               if message.nil?
                 UI.user_error! "Symbol upload error (Response Code: #{response.code}). Please try again in a few minutes or contact the Dynatrace support (https://www.dynatrace.com/services-support/)." 
               else
@@ -131,7 +134,7 @@ module Fastlane
         command << "versionStr=\"#{params[:versionStr]}\""
         command << "version=\"#{params[:version]}\""
         command << symbolFilesCommandSnippet
-        command << "server=\"#{Helper::DynatraceHelper.get_base_url(params)}\""
+        command << "server=\"#{Helper::DynatraceHelper.without_trailing_slash(params[:server])}\""
         command << "DTXLogLevel=ALL -verbose" if params[:debugMode] == true
         command << "forced=1" # if the file already exists
 

data/lib/fastlane/plugin/dynatrace/helper/dynatrace_helper.rb

@@ -21,7 +21,7 @@ module Fastlane
         end
 
         # get latest version info
-        clientUri = URI("#{self.get_base_url(params)}/api/config/v1/symfiles/dtxdss-download?Api-Token=#{params[:apitoken]}")
+        clientUri = URI("#{self.without_trailing_slash(params[:server])}/api/config/v1/symfiles/dtxdss-download?Api-Token=#{params[:apitoken]}")
         response = Net::HTTP.get_response(clientUri)
 
         # filter any http errors
@@ -113,9 +113,12 @@ module Fastlane
         return dtxDssClientPath
       end
 
-      def self.get_base_url(params)
-        uri = URI.split(params[:server])
-        return uri[0] + '://' + uri[2]
+      def self.without_trailing_slash(server)
+        if server[-1] == '/'
+          return server[0..-2]
+        else
+          return server
+        end
       end
 
       def self.get_host_name(params)
@@ -136,6 +139,16 @@ module Fastlane
       def self.put_android_symbols(params, bundleId)
         path = "/api/config/v1/symfiles/#{params[:appId]}/#{bundleId}/ANDROID/#{params[:version]}/#{params[:versionStr]}"
 
+        # if path points to dynatrace managed, we need to prepend the path component from the server (/e/{your-environment-id})
+        if params[:server].include? '/e/'
+          uri = URI.split(params[:server])
+          if uri[5].nil?
+            UI.user_error! "The path component of your managed Dynatrace URL is empty. Does the server URL follow the correct pattern (https://{your-domain}/e/{your-environment-id})?"
+          end
+          path = self.without_trailing_slash(uri[5]) + path
+        end
+
+
         req = Net::HTTP::Put.new(path, initheader = { 'Content-Type' => 'text/plain',
                                                       'Authorization' => "Api-Token #{params[:apitoken]}"} )
 

data/lib/fastlane/plugin/dynatrace/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Dynatrace
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-dynatrace
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Dynatrace LLC
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry