From 2de231fb2ce30b0548161a9db48cfdf4fc52f562 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre Meyer Date: Thu, 12 May 2022 07:27:20 +0100 Subject: [PATCH 1/5] Remove CircleCI config Signed-off-by: Pierre-Alexandre Meyer --- .circleci/config.yml | 277 ------------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4a889e3..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,277 +0,0 @@ -defaults: &defaults - working_directory: ~/repo - environment: - JRUBY_OPTS: --2.0 -J-Xmx1024M - -version: 2 -jobs: - build-ruby-2.2.2: - <<: *defaults - docker: - - image: killbill/kbbuild:0.6.0 - steps: - - checkout - - restore_cache: - key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - run: - name: Install gem dependencies - command: | - source /usr/share/rvm/scripts/rvm - rvm use ruby-2.2.2 - bundle install --jobs=4 --retry=3 --path=vendor/bundle - - save_cache: - paths: - - Gemfile.lock - - .bundle - - vendor/bundle - key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - test-mysql-ruby-2.2.2: - <<: *defaults - docker: - - image: killbill/kbbuild:0.6.0 - - image: killbill/killbill:0.21.9 - - image: killbill/mariadb:0.21 - environment: - - MYSQL_ROOT_PASSWORD=root - steps: - - checkout - - restore_cache: - key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - run: - name: Setup DDL - command: | - set +e - count=0 - until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do - if [[ "$count" == "25" ]]; then - exit 1 - fi - (( count++ )) - printf '.' - sleep 5 - done - set -e - - run: - name: Setup Kill Bill - command: | - set +e - count=0 - until $(curl --output /dev/null --silent --fail http://127.0.0.1:8080/1.0/healthcheck); do - if [[ "$count" == "25" ]]; then - exit 1 - fi - (( count++ )) - - printf '.' - sleep 5 - done - set -e - curl -v \ - -X POST \ - -u admin:password \ - -H 'Content-Type: application/json' \ - -H 'X-Killbill-CreatedBy: CircleCI' \ - -d '{"apiKey": "bob", "apiSecret": "lazar"}' \ - "http://127.0.0.1:8080/1.0/kb/tenants?useGlobalDefault=true" - - run: - name: Run tests - command: | - mkdir /tmp/test-results - source /usr/share/rvm/scripts/rvm - rvm use ruby-2.2.2 - bundle exec rspec --format documentation \ - --out /tmp/test-results/rspec.txt \ - $(circleci tests glob "spec/**/*_spec.rb") - - store_test_results: - path: /tmp/test-results - - store_artifacts: - path: /tmp/test-results - destination: test-results - - build-ruby-2.4.2: - <<: *defaults - docker: - - image: killbill/kbbuild:0.6.0 - steps: - - checkout - - restore_cache: - key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - run: - name: Install gem dependencies - command: | - source /usr/share/rvm/scripts/rvm - rvm use ruby-2.4.2 - bundle install --jobs=4 --retry=3 --path=vendor/bundle - - save_cache: - paths: - - Gemfile.lock - - .bundle - - vendor/bundle - key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - test-mysql-ruby-2.4.2: - <<: *defaults - docker: - - image: killbill/kbbuild:0.6.0 - - image: killbill/killbill:0.21.9 - - image: killbill/mariadb:0.21 - environment: - - MYSQL_ROOT_PASSWORD=root - steps: - - checkout - - restore_cache: - key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - run: - name: Setup DDL - command: | - set +e - count=0 - until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do - if [[ "$count" == "25" ]]; then - exit 1 - fi - (( count++ )) - printf '.' - sleep 5 - done - set -e - - run: - name: Setup Kill Bill - command: | - set +e - count=0 - until $(curl --output /dev/null --silent --fail http://127.0.0.1:8080/1.0/healthcheck); do - if [[ "$count" == "25" ]]; then - exit 1 - fi - (( count++ )) - - printf '.' - sleep 5 - done - set -e - curl -v \ - -X POST \ - -u admin:password \ - -H 'Content-Type: application/json' \ - -H 'X-Killbill-CreatedBy: CircleCI' \ - -d '{"apiKey": "bob", "apiSecret": "lazar"}' \ - "http://127.0.0.1:8080/1.0/kb/tenants?useGlobalDefault=true" - - run: - name: Run tests - command: | - mkdir /tmp/test-results - source /usr/share/rvm/scripts/rvm - rvm use ruby-2.4.2 - bundle exec rspec --format documentation \ - --out /tmp/test-results/rspec.txt \ - $(circleci tests glob "spec/**/*_spec.rb") - - store_test_results: - path: /tmp/test-results - - store_artifacts: - path: /tmp/test-results - destination: test-results - - build-jruby-9.1.14.0: - <<: *defaults - docker: - - image: killbill/kbbuild:0.6.0 - steps: - - checkout - - restore_cache: - key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - run: - name: Install gem dependencies - command: | - source /usr/share/rvm/scripts/rvm - rvm use jruby-9.1.14.0 - bundle install --jobs=4 --retry=3 --path=vendor/bundle - - save_cache: - paths: - - Gemfile.lock - - .bundle - - vendor/bundle - key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - test-mysql-jruby-9.1.14.0: - <<: *defaults - docker: - - image: killbill/kbbuild:0.6.0 - - image: killbill/killbill:0.21.9 - - image: killbill/mariadb:0.21 - environment: - - MYSQL_ROOT_PASSWORD=root - steps: - - checkout - - restore_cache: - key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }} - - run: - name: Setup DDL - command: | - set +e - count=0 - until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do - if [[ "$count" == "25" ]]; then - exit 1 - fi - (( count++ )) - printf '.' - sleep 5 - done - set -e - - run: - name: Setup Kill Bill - command: | - set +e - count=0 - until $(curl --output /dev/null --silent --fail http://127.0.0.1:8080/1.0/healthcheck); do - if [[ "$count" == "25" ]]; then - exit 1 - fi - (( count++ )) - - printf '.' - sleep 5 - done - set -e - curl -v \ - -X POST \ - -u admin:password \ - -H 'Content-Type: application/json' \ - -H 'X-Killbill-CreatedBy: CircleCI' \ - -d '{"apiKey": "bob", "apiSecret": "lazar"}' \ - "http://127.0.0.1:8080/1.0/kb/tenants?useGlobalDefault=true" - - run: - name: Run tests - command: | - mkdir /tmp/test-results - source /usr/share/rvm/scripts/rvm - rvm use jruby-9.1.14.0 - bundle exec rspec --format documentation \ - --out /tmp/test-results/rspec.txt \ - $(circleci tests glob "spec/**/*_spec.rb") - - store_test_results: - path: /tmp/test-results - - store_artifacts: - path: /tmp/test-results - destination: test-results -workflows: - version: 2 - build-and-test: - jobs: - # Self-contained KPM - - build-ruby-2.2.2 - # Kaui and other gems - - build-ruby-2.4.2 - # Self-contained Kaui - - build-jruby-9.1.14.0 - - test-mysql-ruby-2.2.2: - requires: - - build-ruby-2.2.2 - - test-mysql-ruby-2.4.2: - requires: - - build-ruby-2.4.2 - - test-mysql-jruby-9.1.14.0: - requires: - - build-jruby-9.1.14.0 From 99052bb9bab1b1052e0d3722e99e87328625ada7 Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre Meyer Date: Thu, 9 Jun 2022 14:36:27 +0100 Subject: [PATCH 2/5] gemspec: update dependencies Signed-off-by: Pierre-Alexandre Meyer --- killbill_client.gemspec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/killbill_client.gemspec b/killbill_client.gemspec index f764fa4..016e689 100644 --- a/killbill_client.gemspec +++ b/killbill_client.gemspec @@ -39,11 +39,7 @@ Gem::Specification.new do |s| s.rdoc_options << '--exclude' << '.' - if RUBY_VERSION < '2.0.0' - 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 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.4' end From 155008813a32089b1dbdc48d14c19cb6e4e891a0 Mon Sep 17 00:00:00 2001 From: Reshma Bidikar <85998496+reshmabidikar@users.noreply.github.com> Date: Mon, 10 Oct 2022 13:39:31 +0530 Subject: [PATCH 3/5] 1272 - Change to return invoice items by default --- lib/killbill_client/models/account.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/killbill_client/models/account.rb b/lib/killbill_client/models/account.rb index b980d0b..7bfee16 100644 --- a/lib/killbill_client/models/account.rb +++ b/lib/killbill_client/models/account.rb @@ -146,6 +146,7 @@ def bundles(options = {}) def invoices(options = {}) self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoices", { + :withInvoiceItems => true }, options, Invoice From a8baee9528824459feae7f548c5b04702e45d843 Mon Sep 17 00:00:00 2001 From: Reshma Bidikar <85998496+reshmabidikar@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:11:04 +0530 Subject: [PATCH 4/5] 1272 - Renamed flag to withInvoiceComponents --- lib/killbill_client/models/account.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/killbill_client/models/account.rb b/lib/killbill_client/models/account.rb index 7bfee16..b7fc20d 100644 --- a/lib/killbill_client/models/account.rb +++ b/lib/killbill_client/models/account.rb @@ -146,7 +146,7 @@ def bundles(options = {}) def invoices(options = {}) self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoices", { - :withInvoiceItems => true + :withInvoiceComponents => true }, options, Invoice From 4501b5d4b66e7ffa8c2b7a01eb71643efbf432f0 Mon Sep 17 00:00:00 2001 From: Reshma Bidikar <85998496+reshmabidikar@users.noreply.github.com> Date: Sun, 16 Oct 2022 17:04:11 +0530 Subject: [PATCH 5/5] 1272 - Renamed flag to withInvoiceComponents --- lib/killbill_client/models/account.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/killbill_client/models/account.rb b/lib/killbill_client/models/account.rb index b7fc20d..55de927 100644 --- a/lib/killbill_client/models/account.rb +++ b/lib/killbill_client/models/account.rb @@ -146,7 +146,7 @@ def bundles(options = {}) def invoices(options = {}) self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoices", { - :withInvoiceComponents => true + :includeInvoiceComponents => true }, options, Invoice