peak_flow_utils 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bdc19548c94f5a84768b360d892e622d4a43e2b93aabd2211ff01aaa90aee1f
-  data.tar.gz: 9144161819e38594b3b8adefd74d9f60c7b9de2c1e5873c5f007058d4ea74eb5
+  metadata.gz: 27b80fe472694a76875b46c4bc5e393e6bf02acb13e4ff2b194e5ce4b61698b7
+  data.tar.gz: 4e4bd827165ad878970df19990af1d80ab229188f7d590464faadb772945b324
 SHA512:
-  metadata.gz: bb753bd4bda442fae033de2b2d1f05a3815f0584ca54a263ffc2d8e2647692cb3af6f40289c7989301087ff0d44cf727681e4a370dc50fba14bd504a71457f57
-  data.tar.gz: 0b8b67efb910799b5a78dda78c12f2e85ac4e45144493d662babafa03dc328f40f2bf4814030fab49072716b5285976c965460e13fc25f9c8965217933b452a2
+  metadata.gz: 11cc3ae6a4bed2cec6209846fbe5463e2133c4a5ff3873a63ef93bec83fbf1a58c90282aa279307dc090e3d1ac30d27bcb93193dc7489914b500939d8a389bb1
+  data.tar.gz: 2b20aedf4ba6b0ae8ad2a6882e8f8664c9212310ce4cd2f555ac6c6436cb5943b6096d23e64502deaf6ea3c02f105e7c941614e1b549e767878a08fe9a4d0080

data/app/controllers/peak_flow_utils/application_controller.rb

@@ -7,7 +7,12 @@ private
 
   def authenticate
     authenticate_or_request_with_http_basic do |username, password|
-      username == ENV.fetch("PEAK_FLOW_PINGS_USERNAME") && password == ENV.fetch("PEAK_FLOW_PINGS_PASSWORD")
+      if ENV["PEAKFLOW_PINGS_USERNAME"].blank? || ENV["PEAKFLOW_PINGS_PASSWORD"].blank?
+        Rails.logger.error "Peakflow utils: Pings called but PEAKFLOW_PINGS_USERNAME or PEAKFLOW_PINGS_PASSWORD wasn't set"
+        false
+      end
+
+      username == ENV.fetch("PEAKFLOW_PINGS_USERNAME") && password == ENV.fetch("PEAKFLOW_PINGS_PASSWORD")
     end
   end
 end

data/app/controllers/peak_flow_utils/pings/postgres_connections_controller.rb

@@ -0,0 +1,9 @@
+class PeakFlowUtils::Pings::PostgresConnectionsController < PeakFlowUtils::ApplicationController
+  def count
+    postgres_connections_count = ActiveRecord::Base.connection.execute("SELECT SUM(numbackends) AS connections_count FROM pg_stat_database").to_a.first
+
+    render json: {
+      postgres_connections_count: postgres_connections_count.fetch("connections_count")
+    }
+  end
+end

data/app/controllers/peak_flow_utils/pings/{sidekiq_pings_controller.rb → sidekiq_controller.rb}

@@ -1,5 +1,7 @@
-class PeakFlowUtils::Pings::SidekiqPingsController < PeakFlowUtils::ApplicationController
-  def create
+require "sidekiq/api"
+
+class PeakFlowUtils::Pings::SidekiqController < PeakFlowUtils::ApplicationController
+  def index
     sidekiq_queue = Sidekiq::Queue.new
 
     render json: {

data/config/routes.rb

@@ -1,2 +1,6 @@
 PeakFlowUtils::Engine.routes.draw do
+  namespace :pings do
+    get "postgres_connections", to: "postgres_connections#count"
+    get "sidekiq", to: "sidekiq#index"
+  end
 end

data/lib/peak_flow_utils.rb

@@ -5,6 +5,7 @@ require "service_pattern"
 
 module PeakFlowUtils
   path = "#{File.dirname(__FILE__)}/peak_flow_utils"
+  models_path = "#{File.dirname(__FILE__)}/peak_flow_utils/models"
 
   autoload :Notifier, "#{path}/notifier"
   autoload :NotifierErrorParser, "#{path}/notifier_error_parser"
@@ -14,4 +15,12 @@ module PeakFlowUtils
   autoload :NotifierSidekiq, "#{path}/notifier_sidekiq"
   autoload :RspecHelper, "#{path}/rspec_helper"
   autoload :HandlerHelper, "#{path}/handler_helper"
+
+  autoload :ApplicationRecord, "#{models_path}/application_record"
+  autoload :Group, "#{models_path}/group"
+  autoload :HandlerText, "#{models_path}/handler_text"
+  autoload :Handler, "#{models_path}/handler"
+  autoload :ScannedFile, "#{models_path}/scanned_file"
+  autoload :TranslationKey, "#{models_path}/translation_key"
+  autoload :TranslationValue, "#{models_path}/translation_value"
 end

data/lib/peak_flow_utils/notifier.rb

@@ -1,4 +1,5 @@
 class PeakFlowUtils::Notifier
+  class FailedToReportError < RuntimeError; end
   class NotConfiguredError < RuntimeError; end
 
   attr_reader :auth_token
@@ -8,7 +9,7 @@ class PeakFlowUtils::Notifier
   end
 
   def self.current
-    raise PeakFlowUtils::Notifier::NotConfiguredError, "Hasn't been configured" unless @current
+    raise PeakFlowUtils::Notifier::NotConfiguredError, "Hasn't been configured" if !@current && Rails.env.test?
 
     @current
   end
@@ -54,8 +55,29 @@ class PeakFlowUtils::Notifier
     request.body = JSON.generate(data)
 
     response = https.request(request)
+
+    raise FailedToReportError, error_message_from_response(response) unless response.code == "200"
+
     response_data = JSON.parse(response.body)
 
-    PeakFlowUtils::NotifierResponse.new(url: response_data["url"]) # URL not always present so dont use fetch
+    # Data not always present so dont use fetch
+    PeakFlowUtils::NotifierResponse.new(
+      bug_report_id: response_data["bug_report_id"],
+      bug_report_instance_id: response_data["bug_report_instance_id"],
+      project_id: response_data["project_id"],
+      project_slug: response_data["project_slug"],
+      url: response_data["url"]
+    )
+  end
+
+  def error_message_from_response(response)
+    message = "Couldn't report error to Peakflow (code #{response.code})"
+
+    if response["content-type"]&.starts_with?("application/json")
+      response_data = JSON.parse(response.body)
+      message << ": #{response_data.fetch("errors").join(". ")}" if response_data["errors"]
+    end
+
+    message
   end
 end

data/lib/peak_flow_utils/notifier_response.rb

@@ -1,7 +1,11 @@
 class PeakFlowUtils::NotifierResponse
-  attr_reader :url
+  attr_reader :bug_report_id, :bug_report_instance_id, :project_id, :project_slug, :url
 
-  def initialize(url:)
+  def initialize(bug_report_id:, bug_report_instance_id:, project_id:, project_slug:, url:)
+    @bug_report_id = bug_report_id
+    @bug_report_instance_id = bug_report_instance_id
+    @project_id = project_id
+    @project_slug = project_slug
     @url = url
   end
 end

data/lib/peak_flow_utils/version.rb

@@ -1,3 +1,3 @@
 module PeakFlowUtils
-  VERSION = "0.1.11".freeze
+  VERSION = "0.1.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peak_flow_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,11 +119,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/peak_flow_utils_manifest.js
-- app/assets/javascripts/peak_flow_utils/application.js
-- app/assets/stylesheets/peak_flow_utils/application.css
 - app/controllers/peak_flow_utils/application_controller.rb
-- app/controllers/peak_flow_utils/pings/sidekiq_pings_controller.rb
+- app/controllers/peak_flow_utils/pings/postgres_connections_controller.rb
+- app/controllers/peak_flow_utils/pings/sidekiq_controller.rb
 - app/handlers/peak_flow_utils/application_handler.rb
 - app/handlers/peak_flow_utils/devise_handler.rb
 - app/handlers/peak_flow_utils/file_handler.rb
@@ -132,16 +130,6 @@ files:
 - app/handlers/peak_flow_utils/simple_form_handler.rb
 - app/handlers/peak_flow_utils/validations_handler.rb
 - app/handlers/peak_flow_utils/will_paginate_handler.rb
-- app/helpers/peak_flow_utils/application_helper.rb
-- app/jobs/peak_flow_utils/application_job.rb
-- app/mailers/peak_flow_utils/application_mailer.rb
-- app/models/peak_flow_utils/application_record.rb
-- app/models/peak_flow_utils/group.rb
-- app/models/peak_flow_utils/handler.rb
-- app/models/peak_flow_utils/handler_text.rb
-- app/models/peak_flow_utils/scanned_file.rb
-- app/models/peak_flow_utils/translation_key.rb
-- app/models/peak_flow_utils/translation_value.rb
 - app/services/peak_flow_utils/application_migration.rb
 - app/services/peak_flow_utils/application_service.rb
 - app/services/peak_flow_utils/attribute_service.rb
@@ -155,7 +143,6 @@ files:
 - app/services/peak_flow_utils/model_inspector.rb
 - app/services/peak_flow_utils/translation_service.rb
 - app/services/peak_flow_utils/translations_parser_service.rb
-- app/views/layouts/peak_flow_utils/application.html.erb
 - bin/peak_flow_rspec_files
 - config/routes.rb
 - lib/peak_flow_utils.rb
@@ -167,6 +154,13 @@ files:
 - lib/peak_flow_utils/migrations/20150908085500_create_translation_values.rb
 - lib/peak_flow_utils/migrations/20150908090800_create_handler_texts.rb
 - lib/peak_flow_utils/migrations/20160411190500_create_scanned_files.rb
+- lib/peak_flow_utils/models/application_record.rb
+- lib/peak_flow_utils/models/group.rb
+- lib/peak_flow_utils/models/handler.rb
+- lib/peak_flow_utils/models/handler_text.rb
+- lib/peak_flow_utils/models/scanned_file.rb
+- lib/peak_flow_utils/models/translation_key.rb
+- lib/peak_flow_utils/models/translation_value.rb
 - lib/peak_flow_utils/notifier.rb
 - lib/peak_flow_utils/notifier_error_parser.rb
 - lib/peak_flow_utils/notifier_rack.rb

data/app/assets/config/peak_flow_utils_manifest.js

@@ -1,2 +0,0 @@
-//= link_directory ../javascripts/peak_flow_utils .js
-//= link_directory ../stylesheets/peak_flow_utils .css

data/app/assets/javascripts/peak_flow_utils/application.js

@@ -1,14 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require activestorage
-//= require_tree .

data/app/assets/stylesheets/peak_flow_utils/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/helpers/peak_flow_utils/application_helper.rb

@@ -1,2 +0,0 @@
-module PeakFlowUtils::ApplicationHelper
-end

data/app/jobs/peak_flow_utils/application_job.rb

@@ -1,2 +0,0 @@
-class PeakFlowUtils::ApplicationJob < ActiveJob::Base
-end

data/app/mailers/peak_flow_utils/application_mailer.rb

@@ -1,4 +0,0 @@
-class PeakFlowUtils::ApplicationMailer < ActionMailer::Base
-  default from: "from@example.com"
-  layout "mailer"
-end

data/app/views/layouts/peak_flow_utils/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Peak flow utils</title>
-  <%= stylesheet_link_tag    "peak_flow_utils/application", media: "all" %>
-  <%= javascript_include_tag "peak_flow_utils/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>