release 0.3.0

Author: yokawasa

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)
 

lib/azure/loganalytics/datacollectorapi/client.rb

@@ -23,7 +23,7 @@ def initialize (customer_id, shared_key, endpoint ='ods.opinsights.azure.com')
 
         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 @@ def self.is_success(res)
 
         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()

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

spec/azure/loganalytics/datacollectorapi/client_spec.rb

@@ -5,14 +5,35 @@
     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= {