azure-loganalytics-datacollector-api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cec423d59632c9e791ddcc953fc3cfc9b6a22886d1a0fa32ff24611b7ee107
-  data.tar.gz: c8dcf1beb62710c24ef30d0b52f44b316c218efd1668999d0eb077707a2f9f6d
+  metadata.gz: 8452aaabdb1e4cadea593892598d3618d72d4dc268b73612a8072b98bb144a29
+  data.tar.gz: c095ecb8502f5afcc742e1cfa7da6c5b4d4f59522dab871323761a45ba6f4af3
 SHA512:
-  metadata.gz: 2a4343fa994ff46da725a6c03ef00c4973cddd5275d1afe93a8152e92026284e649b553002968d9c9e6d690ccbe06016a165eb42aeb7701d102aaa97e3ac00e8
-  data.tar.gz: 2adfe7e4cebe468be3c6bb548fec657ef6ed292a068376ca46a3b2cc27fa504ae3fd62d4a7c1acd64be801dc8da12ea107f4c394ad232246378fcca7b682c786
+  metadata.gz: 710358fb3591f079e96ba0c4e26ba020ee5573dc3c27553883efa80dd62943a3dcde86c7e0dbb1d0ee5d1a20bdf28ea554be8fd2a7df64423088189492f07501
+  data.tar.gz: 523e5be5872c7450e8518835cf18e674043e5578e1b95588ea74070af40dce53418aaa455badeb2b156af9223e97228172bbb3af4e3ec8f4ea9ee2bef411eafd

data/ChangeLog.md

@@ -1,3 +1,6 @@
+## 0.3.0
+* Enhance log type validation: check not only alpha but also numeric, underscore, and character length (may not exceed 100) - [issue #11](https://github.com/yokawasa/azure-log-analytics-data-collector/issues/11)
+
 ## 0.2.0
 * Support setting the x-ms-AzureResourceId Header - [issue #8](https://github.com/yokawasa/azure-log-analytics-data-collector/issues/8)
 

data/azure-loganalytics-datacollector-api.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "azure-loganalytics-datacollector-api"
   spec.version       = Azure::Loganalytics::Datacollectorapi::VERSION
   spec.authors       = ["Yoichi Kawasaki"]
-  spec.email         = ["yoichi.kawasaki@outlook.com"]
+  spec.email         = ["yokawasa@gmail.com"]
   spec.summary       = %q{Azure Log Analytics Data Collector API Ruby Client}
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/yokawasa/azure-log-analytics-data-collector"

data/lib/azure/loganalytics/datacollectorapi/client.rb

@@ -23,7 +23,7 @@ module Azure
 
         def post_data(log_type, json_records, record_timestamp ='', azure_resource_id ='' )
           raise ConfigError, 'no log_type' if log_type.empty?
-          raise ConfigError, 'log_type must be only alpha characters' if not is_alpha(log_type)
+          raise ConfigError, 'log_type must only contain alpha numeric and _, and not exceed 100 chars' if not is_valid_log_type(log_type)
           raise ConfigError, 'no json_records' if json_records.empty?
           body =  json_records.to_json
           uri = sprintf("https://%s.%s/api/logs?api-version=%s",
@@ -58,8 +58,8 @@ module Azure
 
         private
 
-        def is_alpha(s)
-          return (s.match(/^[[:alpha:]]+$/)) ? true : false
+        def is_valid_log_type(s)
+          return ( s.match(/^[a-zA-Z0-9_]+$/) && s.length <= 100 ) ? true : false
         end
 
         def rfc1123date()

data/lib/azure/loganalytics/datacollectorapi/version.rb

@@ -1,7 +1,7 @@
 module Azure
   module Loganalytics
     module Datacollectorapi
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

data/spec/azure/loganalytics/datacollectorapi/client_spec.rb

@@ -5,14 +5,35 @@ describe Azure::Loganalytics::Datacollectorapi::Client do
     expect(Azure::Loganalytics::Datacollectorapi::VERSION).not_to be nil
   end
 
-  #it "does something useful" do
-  #  expect(false).to eq(true)
-  #end
-
   customer_id = '<Customer ID aka WorkspaceID String>'
   shared_key =  '<Primary Key String>'
   log_type = "MyCustomLog"
 
+  it "log type validation" do
+    json_records = []
+    dummy= {
+      :string => "dummy title",
+      :number => 10
+    }
+    valid_log_type = "abcedefghijklmnopqrstuvwxyz1234567890_"
+    invalid_log_type1 = "*-|[]//"
+    invalid_log_type2 = "abcde__xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    json_records.push(dummy)
+    client=Azure::Loganalytics::Datacollectorapi::Client::new( customer_id, shared_key)
+
+    res = client.post_data(valid_log_type, json_records)
+    expect(Azure::Loganalytics::Datacollectorapi::Client.is_success(res)).to eq(true)
+
+    expect{
+      client.post_data(invalid_log_type1, json_records)
+    }.to raise_error(Exception)
+
+    expect{
+      client.post_data(invalid_log_type2, json_records)
+    }.to raise_error(Exception)
+
+  end
+
   it "posting data to datacollector api" do
     json_records = []
     record1= {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure-loganalytics-datacollector-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yoichi Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
 description: Azure Log Analytics Data Collector API Ruby Client
 email:
-- yoichi.kawasaki@outlook.com
+- yokawasa@gmail.com
 executables:
 - console
 - setup