oso-cloud 1.9.0 → 1.9.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '09a0acf3356e34f0288272f0bf655b9894da2dff0493e147213241d04e1f2abd'
4
- data.tar.gz: d0a7c5adc5c08f845cd22bca5f6cd40ec00a57ceab7c6e3a4ff9174e1582299f
3
+ metadata.gz: 971ae28cc897b2bb71f88e0129fedb100bccc8edf285b49c7c62b045bdf360cc
4
+ data.tar.gz: 75e108ed7c4090b207ff9f2860d67c80e5b2e0e257ba4e6ee12f7b89148228f6
5
5
  SHA512:
6
- metadata.gz: ad73f20bdd9a4443d871c7a234ca616dbc64e05f157fa0f529535fbd13d45d8897eb437c15df79a4c3c7eb79a5fd257ce4b8a36d2c671d1ed2c0e939f967d662
7
- data.tar.gz: 57b85901e6aa9bc8c337d993b8f29c12b04eea2224c34156e48ef22a5a0389acc8476fd6f44b76caf80299f52b942e3614d8613623c80b488e93ffee9b46890a
6
+ metadata.gz: ad4bcfe3809d95409113caf477b43fdf3dd18b24a8d4d5fc2479cdae0207fc187a16121406bc63a573c8c160d41e4a37e8aa56f761a0cd8195552238df68882e
7
+ data.tar.gz: e7dc543034f9175b7a533569e780166caf07fa836a614881a482e295d66cfdce82e691a5c46a4b23603e25c256458c5dc50fb1f4eb305649fdadc2e610a7a6e3
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- oso-cloud (1.9.0)
4
+ oso-cloud (1.9.1)
5
5
  faraday (~> 2.5.2)
6
6
  faraday-net_http_persistent (~> 2.0)
7
7
  faraday-retry (~> 2.0.0)
data/lib/oso/api.rb CHANGED
@@ -511,6 +511,9 @@ module OsoCloud
511
511
  req.params = params unless params.nil?
512
512
  req.headers = headers
513
513
  end
514
+
515
+ create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
516
+
514
517
  response.body
515
518
  rescue Faraday::BadRequestError, Faraday::ServerError, Faraday::ConnectionFailed, Faraday::TimeoutError,
516
519
  Faraday::SSLError => e
@@ -520,6 +523,9 @@ module OsoCloud
520
523
  req.params = params unless params.nil?
521
524
  req.headers = headers
522
525
  end
526
+
527
+ create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
528
+
523
529
  response.body
524
530
  end
525
531
  rescue Faraday::Error => e
@@ -542,6 +548,8 @@ module OsoCloud
542
548
  req.headers = headers
543
549
  end
544
550
 
551
+ create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
552
+
545
553
  @last_offset = response.headers[:OsoOffset] if isMutation
546
554
  response.body
547
555
  # only attempt fallback on 5xx, and connection failure conditions
@@ -554,6 +562,7 @@ module OsoCloud
554
562
  req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
555
563
  req.headers = headers
556
564
  end
565
+ create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
557
566
  response.body
558
567
  end
559
568
  rescue Faraday::Error => e
@@ -573,6 +582,9 @@ module OsoCloud
573
582
  req.headers = headers
574
583
  req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
575
584
  end
585
+
586
+ create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
587
+
576
588
  response.body
577
589
  rescue Faraday::Error => e
578
590
  handle_faraday_error e
@@ -580,14 +592,18 @@ module OsoCloud
580
592
 
581
593
  def handle_faraday_error(error)
582
594
  resp = error.response
595
+ create_api_error(resp, error.message)
596
+ end
597
+
598
+ def create_api_error(resp, message)
583
599
  formatted_request_id = if resp.nil? || resp[:headers].nil? || resp[:headers]['X-Request-ID'].nil?
584
600
  ''
585
601
  else
586
602
  ' (Request ID: ' + resp[:headers]['X-Request-ID'] + ')'
587
603
  end
588
604
 
589
- err = if resp.nil? || resp[:body].nil? || resp[:body][:message].nil?
590
- error.message
605
+ err = if resp.nil? || resp[:body].nil? || !resp[:body].is_a?(Hash) || resp[:body][:message].nil?
606
+ message
591
607
  else
592
608
  resp[:body][:message]
593
609
  end
data/lib/oso/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OsoCloud
2
- VERSION = '1.9.0'.freeze
2
+ VERSION = '1.9.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oso-cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.0
4
+ version: 1.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Oso Security, Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-01-23 00:00:00.000000000 Z
11
+ date: 2025-01-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday