config_server_agent 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc879021defba75dd0f80bdf720a6aed93bfc7087c1dde865b298acbe5ffc0c0
-  data.tar.gz: 21e44879624e3bb30cc30d1c8f7fac444893c50d353f3a51c1ad32e93d4190d0
+  metadata.gz: 2761ff07482cc6eef122709934af77aad62c83e2a4dba6ffc555b0f5ad0f030e
+  data.tar.gz: 65fb0a5494fbb54936043bc81195cde6c349632b20f0984ed43a89442279a8c6
 SHA512:
-  metadata.gz: a7582e8caa5d37f8f437bd931eb39748bc5f0841f2132e69f1840b1fc4d541ac27e467e5be19e6ba4db71c44ae7fb0118e415420004ce022e80a944dae6cc751
-  data.tar.gz: 6f2e0ea7c91554480778d2cf59c6c776b17e53530f89f82d333353452b739786e841adf54aa5763f098e03f86cf652028e149e710e4411c1eaf1b8f03965562d
+  metadata.gz: 78c89dda50b1a1f3f9ce452097357625cf3a5f8ee2c309195789b5c27efffb30fdf8d500bdc245d2532d4bd41f9dfae3c768b1ceb156fdcad79fc2e9e8cd201c
+  data.tar.gz: a01f1794f088ad44359d042139ea2476ab56415c50b78c679ba6f120c58f5f4bbef2977e9ce6ce49857b3ad6d34cb3e9ecdfb3d53ad111a096995c19ce20971e

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.2.0 - 2019-02-11
+### Changed
+- Changed the the get_config method from POST to GET
+- Implemented the notify_missing method
+- Added auth token caching with TTL
+
 ## 0.1.1 - 2019-02-06
 ### Added
 - Changed the default User-Agent string from 'Ruby' to 'ConfigServerAgent/0.1.x'

data/lib/config_server_agent/version.rb

@@ -1,3 +1,3 @@
 class ConfigServerAgent
-	VERSION = "0.1.1"
+	VERSION = "0.2.0"
 end

data/lib/config_server_agent.rb

@@ -15,7 +15,8 @@ class ConfigServerAgent
 		config_server_api_key:  ENV['CONFIG_SERVER_API_KEY'],
 		config_server_host:     ENV['CONFIG_SERVER_HOST'],
 		user_agent:             "ConfigServerAgent/#{ConfigServerAgent::VERSION}",
-		user_agent_comment:     nil
+		user_agent_comment:     nil,
+		token_ttl:              60 * 60 * 24
 	)
 		@auth0_client_id        = auth0_client_id        or raise ArgumentError, "Missing auth0_client_id parameter"
 		@auth0_client_secret    = auth0_client_secret    or raise ArgumentError, "Missing auth0_client_secret parameter"
@@ -23,16 +24,21 @@ class ConfigServerAgent
 		@config_server_audience = config_server_audience or raise ArgumentError, "Missing config_server_audience parameter"
 		@config_server_api_key  = config_server_api_key  or raise ArgumentError, "Missing config_server_api_key parameter"
 		@config_server_host     = config_server_host     or raise ArgumentError, "Missing config_server_host parameter"
-		@config = nil
-		@mutex = Mutex.new
+
+		@config     = nil
+		@mutex      = Mutex.new
 		@user_agent = user_agent
 		@user_agent += " (#{user_agent_comment})" if user_agent_comment
+
+		@token_birthday = nil
+		@token          = nil
+		@token_ttl      = token_ttl
 	end
 
 	def get_config
 		return @config if @config
 		@mutex.synchronize do
-			@config ||= _get_config
+			@config ||= get_request 'config_pack'
 		end
 	end
 
@@ -40,44 +46,66 @@ class ConfigServerAgent
 		@config = nil
 	end
 
+	def notify_missing(area, missing)
+		post_request 'notify_missing', area: area, name: missing
+	end
+
 	private
 
-	def _get_config
+	def post_request(endpoint, data={})
+		url          = URI "#{@config_server_host}/api/#{endpoint}"
+		http         = Net::HTTP.new url.host, url.port
+		http.use_ssl = url.scheme == 'https'
+
+		request = Net::HTTP::Post.new url
+		configure_request request
+		request.body = data.to_json
 
-		token = get_token
+		JSON.parse http.request(request).read_body
+	end
 
-		url  = URI "#{@config_server_host}/api/config_pack"
-		http = Net::HTTP.new url.host, url.port
+	def get_request(endpoint, data={})
+		url          = URI "#{@config_server_host}/api/#{endpoint}"
+		url.query    = URI.encode_www_form data
+		http         = Net::HTTP.new url.host, url.port
 		http.use_ssl = url.scheme == 'https'
 
-		request = Net::HTTP::Post.new url
+		request = Net::HTTP::Get.new url
+		configure_request request
+
+		JSON.parse http.request(request).read_body
+	end
+
+	def configure_request(request)
 		request['user-agent']    = @user_agent
+		request['authorization'] = "Bearer #{get_token}"
 		request['content-type']  = 'application/json'
-		request['authorization'] = "Bearer #{token}"
 		request['accept']        = 'application/json'
-		request.body = { api_key: @config_server_api_key }.to_json
-
-		response = http.request request
-		JSON.parse response.read_body
+		request['api-key']       = @config_server_api_key
 	end
 
 	def get_token
-		url  = URI "https://#{@auth0_host}/oauth/token"
-		http = Net::HTTP.new url.host, url.port
-		http.use_ssl = url.scheme == 'https'
+		if @token.nil? or @token_timestamp.nil? or @token_timestamp <= Time.now.to_i
+			url  = URI "https://#{@auth0_host}/oauth/token"
+			http = Net::HTTP.new url.host, url.port
+			http.use_ssl = url.scheme == 'https'
+
+			request = Net::HTTP::Post.new url
+			request['user-agent'] = @user_agent
+			request['content-type'] = 'application/json'
+			request.body = {
+				client_id:     @auth0_client_id,
+				client_secret: @auth0_client_secret,
+				audience:      @config_server_audience,
+				grant_type:    'client_credentials',
+			}.to_json
+
+			response = http.request request
+			@token = JSON.parse(response.read_body)["access_token"] or raise Error, "No token from #{@auth0_host}"
+			@token_timestamp = Time.now.to_i + @token_ttl
+		end
 
-		request = Net::HTTP::Post.new url
-		request['user-agent'] = @user_agent
-		request['content-type'] = 'application/json'
-		request.body = {
-			client_id:     @auth0_client_id,
-			client_secret: @auth0_client_secret,
-			audience:      @config_server_audience,
-			grant_type:    'client_credentials',
-		}.to_json
-
-		response = http.request request
-		JSON.parse(response.read_body)["access_token"] or raise Error, "No token from #{@auth0_host}"
+		@token
 
 	rescue JSON::ParserError
 		raise Error, "Invalid response from #{@auth0_host}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_server_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Aidan Samuel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler