hawkular-client 2.6.0 → 2.7.0

data/spec/spec_helper.rb

@@ -30,43 +30,41 @@ end
 
 module Hawkular::Metrics::RSpec
   def setup_client_without_tenant(options = {})
+    options = options.dup
     options[:tenant] = nil
     mocked_version = options[:mocked_version]
     ::RSpec::Mocks.with_temporary_scope do
       mocked_version.nil? ? mock_metrics_version : mock_metrics_version(mocked_version)
-      @client = Hawkular::Metrics::Client.new(config['url'],
+      @client = Hawkular::Metrics::Client.new(entrypoint(options[:type], 'metrics'),
                                               credentials(options), options)
       return @client
     end
   end
 
   def setup_client(options = {})
+    options = options.dup
     options[:tenant] ||= 'hawkular'
     mocked_version = options[:mocked_version]
     ::RSpec::Mocks.with_temporary_scope do
       mocked_version.nil? ? mock_metrics_version : mock_metrics_version(mocked_version)
-      @client = Hawkular::Metrics::Client.new(config['url'],
+      @client = Hawkular::Metrics::Client.new(entrypoint(options[:type], 'metrics'),
                                               credentials(options), options)
     end
     @client
   end
 
   def setup_v8_client(options = {})
+    options = options.dup
     options[:tenant] ||= 'hawkular'
     options[:verify_ssl] ||= OpenSSL::SSL::VERIFY_NONE
     ::RSpec::Mocks.with_temporary_scope do
       mock_metrics_version '0.8.0'
-      @client = Hawkular::Metrics::Client.new(config['url_v8'],
+      @client = Hawkular::Metrics::Client.new(entrypoint('v8', 'metrics'),
                                               credentials_v8(options), options)
     end
     @client
   end
 
-  def setup_client_new_tenant(options = {})
-    @tenant = 'vcr-test-tenant-123'
-    setup_client(tenant: @tenant, mocked_version: options[:mocked_version])
-  end
-
   def credentials_v8(options = {})
     {
       token: options[:token].nil? ? config['token_v8'] : options[:token]
@@ -80,12 +78,6 @@ module Hawkular::Metrics::RSpec
     }
   end
 
-  def config
-    @config ||= YAML.load(
-      File.read(File.expand_path('endpoint.yml', File.dirname(__FILE__)))
-    )
-  end
-
   def mock_metrics_version(version = '0.9.0.Final')
     allow_any_instance_of(Hawkular::Metrics::Client).to receive(:fetch_version_and_status).and_return(
       'Implementation-Version' => version
@@ -94,7 +86,7 @@ module Hawkular::Metrics::RSpec
 
   # more or less generic method common for all metric types (counters, gauges, availabilities)
   def create_metric_using_hash(endpoint, id, tenant_id)
-    endpoint.create(id: id, dataRetention: 123, tags: { some: 'value' }, tenantId: tenant_id)
+    endpoint.create(id: id, dataRetention: 123, tags: { some: 'value' })
     metric = endpoint.get(id)
 
     expect(metric).to be_a(Hawkular::Metrics::MetricDefinition)
@@ -160,10 +152,31 @@ module Hawkular::Operations::RSpec
       object[:data]
     end
   end
+
+  def host_with_scheme(host, use_secure_connection)
+    "#{use_secure_connection ? 'https' : 'http'}://#{host}"
+  end
 end
 
 # globally used helper functions
 module Helpers
+  def config
+    @config ||= YAML.load(
+      File.read(File.expand_path('endpoint.yml', File.dirname(__FILE__)))
+    )
+  end
+
+  def entrypoint(type, component = nil)
+    base = config[type.to_s.downcase]
+    entrypoint = "#{base['is_secure'] ? 'https' : 'http'}://#{base['host']}:#{base['port']}/"
+    entrypoint << config[component] unless component.nil?
+  end
+
+  def host(type)
+    base = config[type.to_s.downcase]
+    "#{base['host']}:#{base['port']}"
+  end
+
   def make_template(base_directory, cassette_name, bindings)
     cassette = cassette_name.gsub(/\s+/, '_')
     input_file_path = "#{VCR.configuration.cassette_library_dir}/#{base_directory}/tmp/#{cassette}.yml"
@@ -194,23 +207,64 @@ module Helpers
       end
       yield if block_given?
     end
+    record_cassette(prefix, bindings, explicit_cassette_name, run)
+  end
 
-    if ENV['VCR_UPDATE'] == '1'
+  def record_cleanup(prefix)
+    FileUtils.rm_rf "#{VCR.configuration.cassette_library_dir}/#{prefix}/tmp"
+  end
+
+  def record_websocket(prefix, bindings, explicit_cassette_name, example = nil)
+    prefix.gsub!(/\s/, '_')
+    explicit_cassette_name.gsub!(/\s/, '_')
+    run = lambda do
+      unless example.nil?
+        if example.respond_to?(:run)
+          example.run
+        elsif example.respond_to?(:call)
+          example.call
+        end
+      end
+      yield if block_given?
+    end
+
+    record_websocket_cassette(prefix, bindings, explicit_cassette_name, run)
+  end
+
+  private
+
+  def record_cassette(prefix, bindings, explicit_cassette_name, run_lambda)
+    if ENV['VCR_UPDATE'] == '1' && bindings
       VCR.use_cassette(prefix + '/tmp/' + explicit_cassette_name,
                        decode_compressed_response: true,
                        record: :all) do
-        run.call
+        run_lambda.call
       end
       make_template prefix, explicit_cassette_name, bindings
     else
       VCR.use_cassette(prefix + '/Templates/' + explicit_cassette_name,
                        decode_compressed_response: true,
                        erb: bindings,
-                       record: :none) do
-        run.call
+                       record: ENV['VCR_UPDATE'] == '1' ? :all : :none) do
+        run_lambda.call
       end
     end
   end
+
+  def record_websocket_cassette(prefix, bindings, explicit_cassette_name, run_lambda)
+    options = {
+      record: :none,
+      decode_compressed_response: true
+    }
+    options[:erb] = bindings if bindings
+    if ENV['VCR_UPDATE'] == '1'
+      options[:record] = :all
+      options[:reverse_substitution] = true if bindings
+    end
+    WebSocketVCR.use_cassette(prefix + '/' + explicit_cassette_name, options) do
+      run_lambda.call
+    end
+  end
 end
 
 RSpec.configure do |config|

data/spec/vcr_cassettes/Inventory/{Connection → NonSecure/Connection/Templates}/Should_err_on_bad_credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://-XX-X-jdoe-X:password@localhost:8080/hawkular/inventory/status
+    uri: http://<%= username %>:<%= password %>@localhost:8080/hawkular/inventory/status
     body:
       encoding: US-ASCII
       string: ''
@@ -15,6 +15,8 @@ http_interactions:
       - hawkular-client-ruby
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 401
@@ -33,10 +35,10 @@ http_interactions:
       Content-Length:
       - '71'
       Date:
-      - Thu, 14 Jul 2016 16:23:36 GMT
+      - Wed, 10 Aug 2016 22:35:34 GMT
     body:
       encoding: UTF-8
       string: "<html><head><title>Error</title></head><body>Unauthorized</body></html>"
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:36 GMT
-recorded_with: VCR 3.0.1
+  recorded_at: Wed, 10 Aug 2016 22:35:34 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr_cassettes/Inventory/{Tenants → NonSecure/Tenants/Templates}/Should_Get_Tenant_For_Explicit_Credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://jdoe:password@localhost:8080/hawkular/inventory/status
+    uri: http://<%= username %>:<%= password %>@localhost:8080/hawkular/inventory/status
     body:
       encoding: US-ASCII
       string: ''
@@ -17,6 +17,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -33,21 +35,21 @@ http_interactions:
       Content-Length:
       - '234'
       Date:
-      - Thu, 14 Jul 2016 16:23:36 GMT
+      - Wed, 10 Aug 2016 22:35:34 GMT
     body:
       encoding: UTF-8
       string: |-
         {
-          "Implementation-Version" : "0.17.2.Final",
-          "Built-From-Git-SHA1" : "3c8ac6648aa0ec33643ae1b98faadc475d2c6f02",
+          "Implementation-Version" : "0.17.3.Final",
+          "Built-From-Git-SHA1" : "144a571ea8f3a819737c2937ccc0492d8a116bb4",
           "Inventory-Implementation" : "org.hawkular.inventory.impl.tinkerpop.TinkerpopInventory",
           "Initialized" : "true"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:36 GMT
+  recorded_at: Wed, 10 Aug 2016 22:35:34 GMT
 - request:
     method: get
-    uri: http://jdoe:password@localhost:8080/hawkular/inventory/tenant
+    uri: http://<%= username %>:<%= password %>@localhost:8080/hawkular/inventory/tenant
     body:
       encoding: US-ASCII
       string: ''
@@ -62,6 +64,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -78,7 +82,7 @@ http_interactions:
       Pragma:
       - no-cache
       Date:
-      - Thu, 14 Jul 2016 16:23:36 GMT
+      - Wed, 10 Aug 2016 22:35:34 GMT
       Connection:
       - keep-alive
       Content-Type:
@@ -93,5 +97,5 @@ http_interactions:
           "id" : "hawkular"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:36 GMT
-recorded_with: VCR 3.0.1
+  recorded_at: Wed, 10 Aug 2016 22:35:34 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr_cassettes/Inventory/{Tenants → NonSecure/Tenants/Templates}/Should_Get_Tenant_For_Implicit_Credentials.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://jdoe:password@localhost:8080/hawkular/inventory/status
+    uri: http://<%= username %>:<%= password %>@localhost:8080/hawkular/inventory/status
     body:
       encoding: US-ASCII
       string: ''
@@ -17,6 +17,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -33,21 +35,21 @@ http_interactions:
       Content-Length:
       - '234'
       Date:
-      - Thu, 14 Jul 2016 16:23:36 GMT
+      - Wed, 10 Aug 2016 22:35:34 GMT
     body:
       encoding: UTF-8
       string: |-
         {
-          "Implementation-Version" : "0.17.2.Final",
-          "Built-From-Git-SHA1" : "3c8ac6648aa0ec33643ae1b98faadc475d2c6f02",
+          "Implementation-Version" : "0.17.3.Final",
+          "Built-From-Git-SHA1" : "144a571ea8f3a819737c2937ccc0492d8a116bb4",
           "Inventory-Implementation" : "org.hawkular.inventory.impl.tinkerpop.TinkerpopInventory",
           "Initialized" : "true"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:36 GMT
+  recorded_at: Wed, 10 Aug 2016 22:35:34 GMT
 - request:
     method: get
-    uri: http://jdoe:password@localhost:8080/hawkular/inventory/tenant
+    uri: http://<%= username %>:<%= password %>@localhost:8080/hawkular/inventory/tenant
     body:
       encoding: US-ASCII
       string: ''
@@ -62,6 +64,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -78,7 +82,7 @@ http_interactions:
       Pragma:
       - no-cache
       Date:
-      - Thu, 14 Jul 2016 16:23:36 GMT
+      - Wed, 10 Aug 2016 22:35:34 GMT
       Connection:
       - keep-alive
       Content-Type:
@@ -93,5 +97,5 @@ http_interactions:
           "id" : "hawkular"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:36 GMT
-recorded_with: VCR 3.0.1
+  recorded_at: Wed, 10 Aug 2016 22:35:34 GMT
+recorded_with: VCR 3.0.3

data/spec/vcr_cassettes/Inventory/{inventory_0_17/Templates → NonSecure/inventory_0_17}/Client_should_listen_on_various_inventory_events.json

@@ -3,12 +3,12 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/r;<%= uuid_prefix %>-r126\",\n  \"properties\" : {\n    \"version\" : 1.0\n  },\n  \"name\" : \"My Resource 1\",\n  \"identityHash\" : \"97b5e40adef778ab8346c6f94fe54fa76033\",\n  \"type\" : {\n    \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/rt;<%= uuid_prefix %>-rt-123\",\n    \"name\" : \"ResourceType\",\n    \"identityHash\" : \"e9c230bbc9d7c8403fe2cac5da66a8ff5b829\",\n    \"id\" : \"<%= uuid_prefix %>-rt-123\"\n  },\n  \"id\" : \"<%= uuid_prefix %>-r126\"\n}"
+      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/r;<%= uuid_prefix %>-r126\",\n  \"properties\" : {\n    \"version\" : 1.0\n  },\n  \"name\" : \"My Resource 1\",\n  \"identityHash\" : \"d27f513cfc856e3ba491eb7a392424456e03e\",\n  \"type\" : {\n    \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/rt;<%= uuid_prefix %>-rt-123\",\n    \"name\" : \"ResourceType\",\n    \"identityHash\" : \"d2ad2056fbf7673bfc3462aad80803e4b7749d\",\n    \"id\" : \"<%= uuid_prefix %>-rt-123\"\n  },\n  \"id\" : \"<%= uuid_prefix %>-r126\"\n}"
     },
     {
       "operation": "read",
       "type": "text",
-      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/r;<%= uuid_prefix %>-r127\",\n  \"properties\" : {\n    \"version\" : 1.1\n  },\n  \"name\" : \"My Resource 2\",\n  \"identityHash\" : \"ea33ef47915a14e7d645d639d6f8bc38c7172\",\n  \"type\" : {\n    \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/rt;<%= uuid_prefix %>-rt-123\",\n    \"name\" : \"ResourceType\",\n    \"identityHash\" : \"e9c230bbc9d7c8403fe2cac5da66a8ff5b829\",\n    \"id\" : \"<%= uuid_prefix %>-rt-123\"\n  },\n  \"id\" : \"<%= uuid_prefix %>-r127\"\n}"
+      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/r;<%= uuid_prefix %>-r127\",\n  \"properties\" : {\n    \"version\" : 1.1\n  },\n  \"name\" : \"My Resource 2\",\n  \"identityHash\" : \"9a5a95c450a2656e1e139ee1f3d1bd7485265a7\",\n  \"type\" : {\n    \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/rt;<%= uuid_prefix %>-rt-123\",\n    \"name\" : \"ResourceType\",\n    \"identityHash\" : \"d2ad2056fbf7673bfc3462aad80803e4b7749d\",\n    \"id\" : \"<%= uuid_prefix %>-rt-123\"\n  },\n  \"id\" : \"<%= uuid_prefix %>-r127\"\n}"
     },
     {
       "operation": "close"
@@ -18,7 +18,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed\",\n  \"properties\" : {\n    \"__identityHash\" : \"1597c0dbd421b7267a3751a4b7871cb19646d4f\"\n  },\n  \"identityHash\" : \"1597c0dbd421b7267a3751a4b7871cb19646d4f\",\n  \"id\" : \"<%= uuid_prefix %>-feed\"\n}"
+      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed\",\n  \"properties\" : {\n    \"__identityHash\" : \"e6b84ac397bb188d813c8d46d28da691732af3ae\"\n  },\n  \"identityHash\" : \"e6b84ac397bb188d813c8d46d28da691732af3ae\",\n  \"id\" : \"<%= uuid_prefix %>-feed\"\n}"
     },
     {
       "operation": "close"
@@ -28,7 +28,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/rt;<%= uuid_prefix %>-rt-123\",\n  \"name\" : \"ResourceType\",\n  \"identityHash\" : \"e9c230bbc9d7c8403fe2cac5da66a8ff5b829\",\n  \"id\" : \"<%= uuid_prefix %>-rt-123\"\n}"
+      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed/rt;<%= uuid_prefix %>-rt-123\",\n  \"name\" : \"ResourceType\",\n  \"identityHash\" : \"d2ad2056fbf7673bfc3462aad80803e4b7749d\",\n  \"id\" : \"<%= uuid_prefix %>-rt-123\"\n}"
     },
     {
       "operation": "close"
@@ -38,7 +38,7 @@
     {
       "operation": "read",
       "type": "text",
-      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed\",\n  \"identityHash\" : \"23c0965c645ea9a9ff8a68c9332d3b64058a52\",\n  \"id\" : \"<%= uuid_prefix %>-feed\"\n}"
+      "data": "{\n  \"path\" : \"/t;hawkular/f;<%= uuid_prefix %>-feed\",\n  \"identityHash\" : \"b23fc38f96172cf290deca88f193d41b57502490\",\n  \"id\" : \"<%= uuid_prefix %>-feed\"\n}"
     },
     {
       "operation": "close"

data/spec/vcr_cassettes/Inventory/{inventory_0_17 → NonSecure/inventory_0_17}/Templates/Client_should_listen_on_various_inventory_events.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://jdoe:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
+    uri: http://<%= super_secret_username %>:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
     body:
       encoding: US-ASCII
       string: ''
@@ -17,6 +17,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -33,7 +35,7 @@ http_interactions:
       Pragma:
       - no-cache
       Date:
-      - Thu, 14 Jul 2016 16:23:47 GMT
+      - Wed, 10 Aug 2016 22:35:40 GMT
       Connection:
       - keep-alive
       Content-Type:
@@ -48,10 +50,10 @@ http_interactions:
           "id" : "hawkular"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:47 GMT
+  recorded_at: Wed, 10 Aug 2016 22:35:40 GMT
 - request:
     method: get
-    uri: http://jdoe:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
+    uri: http://<%= super_secret_username %>:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
     body:
       encoding: US-ASCII
       string: ''
@@ -66,6 +68,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -82,7 +86,7 @@ http_interactions:
       Pragma:
       - no-cache
       Date:
-      - Thu, 14 Jul 2016 16:23:47 GMT
+      - Wed, 10 Aug 2016 22:35:40 GMT
       Connection:
       - keep-alive
       Content-Type:
@@ -97,10 +101,10 @@ http_interactions:
           "id" : "hawkular"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:47 GMT
+  recorded_at: Wed, 10 Aug 2016 22:35:40 GMT
 - request:
     method: get
-    uri: http://jdoe:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
+    uri: http://<%= super_secret_username %>:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
     body:
       encoding: US-ASCII
       string: ''
@@ -115,6 +119,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -131,7 +137,7 @@ http_interactions:
       Pragma:
       - no-cache
       Date:
-      - Thu, 14 Jul 2016 16:23:47 GMT
+      - Wed, 10 Aug 2016 22:35:40 GMT
       Connection:
       - keep-alive
       Content-Type:
@@ -146,10 +152,10 @@ http_interactions:
           "id" : "hawkular"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:47 GMT
+  recorded_at: Wed, 10 Aug 2016 22:35:40 GMT
 - request:
     method: get
-    uri: http://jdoe:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
+    uri: http://<%= super_secret_username %>:<%= super_secret_password %>@localhost:8080/hawkular/inventory/tenant
     body:
       encoding: US-ASCII
       string: ''
@@ -164,6 +170,8 @@ http_interactions:
       - hawkular
       Content-Type:
       - application/json
+      Host:
+      - localhost:8080
   response:
     status:
       code: 200
@@ -180,7 +188,7 @@ http_interactions:
       Pragma:
       - no-cache
       Date:
-      - Thu, 14 Jul 2016 16:23:47 GMT
+      - Wed, 10 Aug 2016 22:35:40 GMT
       Connection:
       - keep-alive
       Content-Type:
@@ -195,5 +203,5 @@ http_interactions:
           "id" : "hawkular"
         }
     http_version: 
-  recorded_at: Thu, 14 Jul 2016 16:23:47 GMT
-recorded_with: VCR 3.0.1
+  recorded_at: Wed, 10 Aug 2016 22:35:40 GMT
+recorded_with: VCR 3.0.3