killbill-client 3.0.0 → 3.3.1

data/bin/retry

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+x() {
+    echo "+ $*" >&2
+    "$@"
+}
+
+retry_delay_seconds=10
+
+i="0"
+while [ $i -lt 4 ]
+do
+    x "$@" && exit 0
+    sleep "${retry_delay_seconds}"
+    i=$[$i+1]
+done
+
+echo "$0: retrying [$*] timed out" >&2
+exit 1

data/docker/docker-compose.ci.mysql.yml

@@ -0,0 +1,21 @@
+version: '3.8'
+
+services:
+  killbill:
+    network_mode: host
+    image: killbill/killbill:0.22.20
+    environment:
+      - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
+      - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill
+      - KILLBILL_DAO_USER=root
+      - KILLBILL_DAO_PASSWORD=root
+      - KILLBILL_SERVER_TEST_MODE=true
+      - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false
+      - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1
+    depends_on:
+      - db
+  db:
+    network_mode: host
+    image: killbill/mariadb:0.22
+    environment:
+      - MYSQL_ROOT_PASSWORD=root

data/docker/docker-compose.ci.postgresql.yml

@@ -0,0 +1,21 @@
+version: '3.8'
+
+services:
+  killbill:
+    network_mode: host
+    image: killbill/killbill:0.22.20
+    environment:
+      - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
+      - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill
+      - KILLBILL_DAO_USER=postgres
+      - KILLBILL_DAO_PASSWORD=postgres
+      - KILLBILL_SERVER_TEST_MODE=true
+      - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false
+      - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1
+    depends_on:
+      - db
+  db:
+    network_mode: host
+    image: killbill/postgresql:0.22
+    environment:
+      - POSTGRES_PASSWORD=postgres

data/killbill_client.gemspec

@@ -19,7 +19,7 @@ require 'killbill_client/version'
 
 Gem::Specification.new do |s|
   s.name        = 'killbill-client'
-  s.version     = KillBillClient::Version.to_s
+  s.version     = KillBillClient::VERSION
   s.summary     = 'Kill Bill client library.'
   s.description = 'An API client library for Kill Bill.'
 
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     s.add_dependency 'json', '>= 1.2.0', '< 2.0.0'
   end
 
+  s.add_development_dependency 'gem-release', '~> 2.2'
   s.add_development_dependency 'rake', '>= 10.0.0', '< 11.0.0'
   s.add_development_dependency 'rspec', '~> 3.4'
 end

data/lib/killbill_client.rb

@@ -41,6 +41,8 @@ module KillBillClient
 
     attr_writer :url
 
+    attr_accessor :read_timeout
+    attr_accessor :connection_timeout
     attr_accessor :disable_ssl_verification
     attr_accessor :return_full_stacktraces
 

data/lib/killbill_client/api/api.rb

@@ -70,7 +70,7 @@ module KillBillClient
 
       # @return [String]
       def user_agent
-        "killbill/#{Version}; #{RUBY_DESCRIPTION}"
+        "killbill/#{VERSION}; #{RUBY_DESCRIPTION}"
       end
 
       private

data/lib/killbill_client/api/net_http_adapter.rb

@@ -86,8 +86,16 @@ module KillBillClient
 
         def create_http_client(uri, options = {})
           http = ::Net::HTTP.new uri.host, uri.port
-          http.read_timeout = options[:read_timeout].to_f / 1000 if options[:read_timeout].is_a? Numeric
-          http.open_timeout = options[:connection_timeout].to_f / 1000 if options[:connection_timeout].is_a? Numeric
+          if options[:read_timeout].is_a? Numeric
+            http.read_timeout = options[:read_timeout].to_f / 1000
+          elsif KillBillClient.read_timeout.is_a? Numeric
+            http.read_timeout = KillBillClient.read_timeout.to_f / 1000
+          end
+          if options[:connection_timeout].is_a? Numeric
+            http.open_timeout = options[:connection_timeout].to_f / 1000
+          elsif KillBillClient.connection_timeout.is_a? Numeric
+            http.open_timeout = KillBillClient.connection_timeout.to_f / 1000
+          end
           http.use_ssl = uri.scheme == 'https'
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE if (options[:disable_ssl_verification] || KillBillClient.disable_ssl_verification)
           http
@@ -110,8 +118,11 @@ module KillBillClient
           # Configure RBAC, if enabled
           username = options[:username] || KillBillClient.username
           password = options[:password] || KillBillClient.password
+          bearer = options[:bearer]
           if username and password
             request.basic_auth(*[username, password].flatten[0, 2])
+          elsif bearer
+            request['authorization'] = 'Bearer ' + bearer
           end
           session_id = options[:session_id]
           if session_id

data/lib/killbill_client/models/account.rb

@@ -143,20 +143,18 @@ module KillBillClient
                        Bundle
       end
 
-      def invoices(with_items=false, options = {})
+      def invoices(options = {})
         self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoices",
                        {
-                           :withItems => with_items
                        },
                        options,
                        Invoice
       end
 
-      def migration_invoices(with_items=false, options = {})
+      def migration_invoices(options = {})
         self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoices",
                        {
-                           :withMigrationInvoices => true,
-                           :withItems => with_items
+                           :withMigrationInvoices => true
                        },
                        options,
                        Invoice

data/lib/killbill_client/models/credit.rb

@@ -1,6 +1,6 @@
 module KillBillClient
   module Model
-    class Credit < CreditAttributes
+    class Credit < InvoiceItemAttributes
       KILLBILL_API_CREDITS_PREFIX = "#{KILLBILL_API_PREFIX}/credits"
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
@@ -9,13 +9,13 @@ module KillBillClient
           get "#{KILLBILL_API_CREDITS_PREFIX}/#{credit_id}",
               {},
               options,
-              CreditAttributes
+              InvoiceItemAttributes
         end
       end
 
       def create(auto_commit = false, user = nil, reason = nil, comment = nil, options = {})
-        created_credit = self.class.post KILLBILL_API_CREDITS_PREFIX,
-                                         to_json,
+        created_credits = self.class.post KILLBILL_API_CREDITS_PREFIX,
+                                         [to_hash].to_json,
                                          {
                                              :autoCommit => auto_commit
                                          },
@@ -24,7 +24,7 @@ module KillBillClient
                                              :reason => reason,
                                              :comment => comment,
                                          }.merge(options)
-        created_credit.refresh(options)
+        created_credits
       end
 
     end

data/lib/killbill_client/models/custom_field.rb

@@ -28,6 +28,23 @@ module KillBillClient
               },
               options
         end
+
+        def find_in_batches_by_search_type_name(object_type, field_name, field_value, offset = 0, limit = 100, options = {})
+
+          query_fields = {
+              :objectType => object_type,
+              :fieldName => field_name,
+              :fieldValue => field_value,
+              :offset => offset,
+              :limit  => limit
+          }
+          query_fields[:fieldValue] = field_value if field_value
+
+          get "#{KILLBILL_API_CUSTOM_FIELDS_PREFIX}/search",
+              query_fields,
+              options
+        end
+
       end
     end
   end

data/lib/killbill_client/models/gen/invoice_attributes.rb

@@ -42,6 +42,7 @@ module KillBillClient
       attribute :bundle_keys
       attribute :credits
       attribute :items
+      attribute :tracking_ids
       attribute :is_parent_invoice
       attribute :parent_invoice_id
       attribute :parent_account_id

data/lib/killbill_client/models/gen/invoice_item_attributes.rb

@@ -52,6 +52,7 @@ module KillBillClient
       attribute :currency
       attribute :quantity
       attribute :item_details
+      attribute :catalog_effective_date
       attribute :child_items
       attribute :audit_logs
     end

data/lib/killbill_client/models/gen/overdue_state_attributes.rb

@@ -30,7 +30,6 @@ module KillBillClient
     class OverdueStateAttributes < Resource
       attribute :name
       attribute :external_message
-      attribute :days_between_payment_retries
       attribute :is_disable_entitlement_and_changes_blocked
       attribute :is_block_changes
       attribute :is_clear_state

data/lib/killbill_client/models/gen/require_gen.rb

@@ -25,39 +25,26 @@
 #
 
 
-require 'killbill_client/models/gen/tenant_attributes'
-require 'killbill_client/models/gen/subject_attributes'
-require 'killbill_client/models/gen/account_email_attributes'
-require 'killbill_client/models/gen/tag_attributes'
-require 'killbill_client/models/gen/invoice_attributes'
-require 'killbill_client/models/gen/plugin_property_attributes'
-require 'killbill_client/models/gen/account_timeline_attributes'
-require 'killbill_client/models/gen/overdue_state_attributes'
-require 'killbill_client/models/gen/user_roles_attributes'
-require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
-require 'killbill_client/models/gen/payment_method_attributes'
-require 'killbill_client/models/gen/plugin_service_info_attributes'
-require 'killbill_client/models/gen/plugin_info_attributes'
-require 'killbill_client/models/gen/tier_price_attributes'
-require 'killbill_client/models/gen/tag_definition_attributes'
-require 'killbill_client/models/gen/block_price_attributes'
-require 'killbill_client/models/gen/account_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
-require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
-require 'killbill_client/models/gen/blocking_state_attributes'
 require 'killbill_client/models/gen/invoice_item_attributes'
+require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
+require 'killbill_client/models/gen/simple_plan_attributes'
+require 'killbill_client/models/gen/bundle_timeline_attributes'
+require 'killbill_client/models/gen/payment_transaction_attributes'
+require 'killbill_client/models/gen/unit_usage_record_attributes'
+require 'killbill_client/models/gen/usage_record_attributes'
+require 'killbill_client/models/gen/subscription_usage_record_attributes'
+require 'killbill_client/models/gen/rolled_up_unit_attributes'
+require 'killbill_client/models/gen/rolled_up_usage_attributes'
 require 'killbill_client/models/gen/role_definition_attributes'
-require 'killbill_client/models/gen/node_command_property_attributes'
+require 'killbill_client/models/gen/usage_price_attributes'
+require 'killbill_client/models/gen/combo_payment_transaction_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
+require 'killbill_client/models/gen/plan_detail_attributes'
 require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
+require 'killbill_client/models/gen/overdue_attributes'
+require 'killbill_client/models/gen/tier_price_attributes'
+require 'killbill_client/models/gen/tag_definition_attributes'
 require 'killbill_client/models/gen/hosted_payment_page_billing_address_attributes'
-require 'killbill_client/models/gen/plan_detail_attributes'
-require 'killbill_client/models/gen/custom_field_attributes'
-require 'killbill_client/models/gen/rolled_up_unit_attributes'
-require 'killbill_client/models/gen/rolled_up_usage_attributes'
-require 'killbill_client/models/gen/gateway_notification_attributes'
-require 'killbill_client/models/gen/event_subscription_attributes'
-require 'killbill_client/models/gen/subscription_attributes'
-require 'killbill_client/models/gen/notification_attributes'
 require 'killbill_client/models/gen/unit_attributes'
 require 'killbill_client/models/gen/product_attributes'
 require 'killbill_client/models/gen/plan_attributes'
@@ -70,34 +57,46 @@ require 'killbill_client/models/gen/price_attributes'
 require 'killbill_client/models/gen/price_list_attributes'
 require 'killbill_client/models/gen/duration_attributes'
 require 'killbill_client/models/gen/catalog_attributes'
-require 'killbill_client/models/gen/combo_payment_transaction_attributes'
-require 'killbill_client/models/gen/usage_price_attributes'
+require 'killbill_client/models/gen/custom_field_attributes'
+require 'killbill_client/models/gen/overdue_state_attributes'
+require 'killbill_client/models/gen/overdue_condition_attributes'
 require 'killbill_client/models/gen/bundle_attributes'
-require 'killbill_client/models/gen/payment_transaction_attributes'
+require 'killbill_client/models/gen/invoice_attributes'
 require 'killbill_client/models/gen/payment_attributes'
-require 'killbill_client/models/gen/unit_usage_record_attributes'
-require 'killbill_client/models/gen/usage_record_attributes'
-require 'killbill_client/models/gen/subscription_usage_record_attributes'
-require 'killbill_client/models/gen/overdue_attributes'
-require 'killbill_client/models/gen/stack_trace_element_attributes'
-require 'killbill_client/models/gen/billing_exception_attributes'
-require 'killbill_client/models/gen/audit_log_attributes'
+require 'killbill_client/models/gen/node_command_attributes'
+require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
+require 'killbill_client/models/gen/payment_method_attributes'
+require 'killbill_client/models/gen/node_command_property_attributes'
+require 'killbill_client/models/gen/tenant_key_value_attributes'
 require 'killbill_client/models/gen/phase_price_attributes'
+require 'killbill_client/models/gen/overdue_state_config_attributes'
+require 'killbill_client/models/gen/invoice_payment_attributes'
+require 'killbill_client/models/gen/blocking_state_attributes'
+require 'killbill_client/models/gen/audit_log_attributes'
+require 'killbill_client/models/gen/payment_attempt_attributes'
+require 'killbill_client/models/gen/node_info_attributes'
+require 'killbill_client/models/gen/notification_attributes'
+require 'killbill_client/models/gen/event_subscription_attributes'
+require 'killbill_client/models/gen/subscription_attributes'
+require 'killbill_client/models/gen/account_timeline_attributes'
+require 'killbill_client/models/gen/plugin_service_info_attributes'
+require 'killbill_client/models/gen/plugin_info_attributes'
+require 'killbill_client/models/gen/tenant_attributes'
+require 'killbill_client/models/gen/plugin_property_attributes'
+require 'killbill_client/models/gen/user_roles_attributes'
 require 'killbill_client/models/gen/profiling_data_attributes_item'
 require 'killbill_client/models/gen/profiling_data_attributes'
-require 'killbill_client/models/gen/node_command_attributes'
-require 'killbill_client/models/gen/session_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
-require 'killbill_client/models/gen/tenant_key_value_attributes'
 require 'killbill_client/models/gen/admin_payment_attributes'
-require 'killbill_client/models/gen/bundle_timeline_attributes'
+require 'killbill_client/models/gen/account_email_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
+require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
+require 'killbill_client/models/gen/subject_attributes'
+require 'killbill_client/models/gen/stack_trace_element_attributes'
+require 'killbill_client/models/gen/billing_exception_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
+require 'killbill_client/models/gen/gateway_notification_attributes'
+require 'killbill_client/models/gen/account_attributes'
 require 'killbill_client/models/gen/invoice_dry_run_attributes'
-require 'killbill_client/models/gen/payment_attempt_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
-require 'killbill_client/models/gen/invoice_payment_attributes'
-require 'killbill_client/models/gen/overdue_state_config_attributes'
-require 'killbill_client/models/gen/simple_plan_attributes'
-require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
-require 'killbill_client/models/gen/credit_attributes'
-require 'killbill_client/models/gen/overdue_condition_attributes'
-require 'killbill_client/models/gen/node_info_attributes'
+require 'killbill_client/models/gen/session_attributes'
+require 'killbill_client/models/gen/block_price_attributes'
+require 'killbill_client/models/gen/tag_attributes'

data/lib/killbill_client/models/gen/subscription_attributes.rb

@@ -30,6 +30,7 @@ module KillBillClient
     class SubscriptionAttributes < Resource
       attribute :account_id
       attribute :bundle_id
+      attribute :bundle_external_key
       attribute :subscription_id
       attribute :external_key
       attribute :start_date

data/lib/killbill_client/models/helpers/custom_field_helper.rb

@@ -71,7 +71,7 @@ module KillBillClient
             self.class.delete "#{url_prefix}/#{send(id_alias)}/customFields",
                               {},
                               {
-                                  :customFieldList => custom_fields_param
+                                  :customField => custom_fields_param
                               },
                               {
                                   :user    => user,

data/lib/killbill_client/models/invoice.rb

@@ -11,7 +11,7 @@ module KillBillClient
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
       has_many :items, KillBillClient::Model::InvoiceItem
-      has_many :credits, KillBillClient::Model::Credit
+      has_many :credits, KillBillClient::Model::InvoiceItem
 
       has_custom_fields KILLBILL_API_INVOICES_PREFIX, :invoice_id
       has_tags KILLBILL_API_INVOICES_PREFIX, :invoice_id
@@ -19,29 +19,26 @@ module KillBillClient
 
 
       class << self
-        def find_by_id(invoice_id, with_items = true, audit = "NONE", options = {})
+        def find_by_id(invoice_id, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/#{invoice_id}",
               {
-                  :withItems => with_items,
                   :audit     => audit
               },
               options
         end
 
-        def find_by_number(number, with_items = true, audit = "NONE", options = {})
+        def find_by_number(number, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/byNumber/#{number}",
               {
-                  :withItems => with_items,
                   :audit     => audit
               },
               options
         end
 
-        def find_by_invoice_item_id(invoice_item_id, with_items = true, with_children_items = false, audit = "NONE", options = {})
+        def find_by_invoice_item_id(invoice_item_id, with_children_items = false, audit = "NONE", options = {})
           get "#{KILLBILL_API_INVOICES_PREFIX}/byItemId/#{invoice_item_id}",
               {
                   :withChildrenItems => with_children_items,
-                  :withItems => with_items,
                   :audit     => audit
               },
               options

data/lib/killbill_client/models/subscription.rb

@@ -23,6 +23,16 @@ module KillBillClient
               options
         end
 
+        def find_by_external_key(external_key, options = {})
+          params = {}
+          params[:externalKey] = external_key
+
+          get "#{KILLBILL_API_ENTITLEMENT_PREFIX}",
+              params,
+              options
+        end
+
+
         def event_audit_logs_with_history(event_id, options = {})
           get "#{KILLBILL_API_ENTITLEMENT_PREFIX}/events/#{event_id}/auditLogsWithHistory",
               {},