From cee8c54219a9e0457681f3e4132d0d47c1f3adaf Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Tue, 19 Nov 2024 13:32:43 +0530 Subject: [PATCH 1/2] currency: read net-http from 3.3 and rails 8.0 Signed-off-by: Arjun Rajappa --- .tekton/.currency/scripts/generate_report.py | 4 ++-- test/frameworks/sinatra_test.rb | 10 +++------- test/support/apps/sinatra/config.ru | 6 +++++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.tekton/.currency/scripts/generate_report.py b/.tekton/.currency/scripts/generate_report.py index 7582f045..479c6ec7 100644 --- a/.tekton/.currency/scripts/generate_report.py +++ b/.tekton/.currency/scripts/generate_report.py @@ -23,8 +23,8 @@ def get_bundle_install_output(): "rest-client": "rest_client_20_ruby_3.3.", "roda": "roda_30_ruby_3.3.", "sinatra": "sinatra_40_ruby_3.3.", - "net-http": "net_http_01_ruby_3.1.", - "rails": "rails_71_sqlite3_ruby_3.3.", + "net-http": "net_http_01_ruby_3.3.", + "rails": "rails_80_sqlite3_ruby_3.3.", "dalli": "dalli_32_ruby_3.3.", "resque": "resque_20_ruby_3.3.", "sidekiq": "sidekiq_70_ruby_3.3.", diff --git a/test/frameworks/sinatra_test.rb b/test/frameworks/sinatra_test.rb index 81e7aeca..43e56462 100644 --- a/test/frameworks/sinatra_test.rb +++ b/test/frameworks/sinatra_test.rb @@ -3,11 +3,11 @@ require 'test_helper' require 'rack/test' -require 'byebug' + class SinatraTest < Minitest::Test include Rack::Test::Methods APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru') - byebug + sinatra_version = Gem::Specification.find_by_name('sinatra').version if sinatra_version < Gem::Version.new('4.0.0') APP = APP.first @@ -19,12 +19,8 @@ def app def test_basic_get clear_all! - byebug r = get '/' - # , nil, { - # "HTTP_FORWARDED" => "localhost", - # "action_dispatch.show_detailed_exceptions" => true - # } + assert last_response.ok? diff --git a/test/support/apps/sinatra/config.ru b/test/support/apps/sinatra/config.ru index 5ddd78c1..210a0f82 100644 --- a/test/support/apps/sinatra/config.ru +++ b/test/support/apps/sinatra/config.ru @@ -5,10 +5,14 @@ class InstanaSinatraApp < ::Sinatra::Base get '/' do "Hello Sinatra!" end - + get '/greet/:name' do "Hello, #{params[:name]}!" end + + configure do + set :host_authorization, {permitted_hosts: "example.org"} + end end run InstanaSinatraApp From 387564a468aa0ae39c2a5f8f7bad25b43d844449 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Wed, 20 Nov 2024 12:26:09 +0530 Subject: [PATCH 2/2] currency: add a new pipeline for currency reports Signed-off-by: Arjun Rajappa --- .tekton/.currency/currency-pipeline.yaml | 132 +++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 .tekton/.currency/currency-pipeline.yaml diff --git a/.tekton/.currency/currency-pipeline.yaml b/.tekton/.currency/currency-pipeline.yaml new file mode 100644 index 00000000..09d7dc5f --- /dev/null +++ b/.tekton/.currency/currency-pipeline.yaml @@ -0,0 +1,132 @@ +apiVersion: tekton.dev/v1 +kind: Pipeline +metadata: + name: ruby-tracer-currency-pipeline +spec: + params: + - name: revision + type: string + - name: ruby_3_3_image_digest + type: string + description: Ruby 3.3 image digest + default: "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d" + workspaces: + - name: ruby-tracer-currency-pipeline-pvc + tasks: + - name: clone + params: + - name: revision + value: $(params.revision) + taskRef: + name: ruby-tracer-clone-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: ruby-tracer-default-libraries-currency-required + runAfter: + - clone + matrix: + params: + - name: imageDigest + value: + - $(params.ruby_3_3_image_digest) + - name: gemfile + value: + - "./gemfiles/cuba_40.gemfile" + - "./gemfiles/excon_100.gemfile" + - "./gemfiles/graphql_20.gemfile" + - "./gemfiles/grpc_10.gemfile" + - "./gemfiles/net_http_01.gemfile" + - "./gemfiles/rack_30.gemfile" + - "./gemfiles/rest_client_20.gemfile" + - "./gemfiles/roda_30.gemfile" + - "./gemfiles/sinatra_40.gemfile" + - name: configuration + value: + - "libraries" + taskRef: + name: ruby-tracer-unittest-default-libraries-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: unittest-rails-sqlite3-currency-required + runAfter: + - ruby-tracer-default-libraries-currency-required + matrix: + params: + - name: imageDigest + value: + - $(params.ruby_3_3_image_digest) + - name: gemfile + value: + - "./gemfiles/rails_80.gemfile" + taskRef: + name: ruby-tracer-unittest-rails-sqlite3-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: unittest-sequel-sqlite3-currency-required + runAfter: + - unittest-rails-sqlite3-currency-required + matrix: + params: + - name: imageDigest + value: + - $(params.ruby_3_3_image_digest) + - name: gemfile + value: + - "./gemfiles/sequel_58.gemfile" + taskRef: + name: ruby-tracer-unittest-sequel-sqlite3-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: unittest-redis-currency-required + runAfter: + - unittest-sequel-sqlite3-currency-required + matrix: + params: + - name: imageDigest + value: + - $(params.ruby_3_3_image_digest) + - name: gemfile + value: + - "./gemfiles/sidekiq_70.gemfile" + - "./gemfiles/resque_20.gemfile" + taskRef: + name: ruby-tracer-unittest-redis-libraries-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: unittest-memcached-currency-required + runAfter: + - unittest-redis-currency-required + matrix: + params: + - name: imageDigest + value: + - $(params.ruby_3_3_image_digest) + - name: gemfile + value: + - "./gemfiles/dalli_32.gemfile" + taskRef: + name: ruby-tracer-unittest-memcached-libraries-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: generate-currency-report + runAfter: + - unittest-memcached-currency-required + taskRef: + name: ruby-generate-currency-report-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc + - name: upload-currency-report + runAfter: + - generate-currency-report + taskRef: + name: ruby-upload-currency-report-task + workspaces: + - name: task-pvc + workspace: ruby-tracer-currency-pipeline-pvc \ No newline at end of file