Skip to content

fix exceptions #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashmichandrashekar merged 1 commit into from
Nov 26, 2019
Merged

fix exceptions #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions source/code/plugin/KubernetesApiClient.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ def getKubeResourceInfo(resource, api_group: nil)
rescue => error
@Log.warn("kubernetes api request failed: #{error} for #{resource} @ #{Time.now.utc.iso8601}")
end
if (!response.nil? && !response.body.nil? && response.body.empty?)
@Log.warn("KubernetesAPIClient::getKubeResourceInfo : Got empty response from Kube API for #{resource} @ #{Time.now.utc.iso8601}")
if (!response.nil?)
if (!response.body.nil? && response.body.empty?)
@Log.warn("KubernetesAPIClient::getKubeResourceInfo : Got empty response from Kube API for #{resource} @ #{Time.now.utc.iso8601}")
end
end
return response
end
Expand Down
10 changes: 8 additions & 2 deletions source/code/plugin/in_kube_podinventory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,16 @@ def enumerate(podList = nil)
end

begin
if (!podInventory.empty? && podInventory.key?("items") && !podInventory["items"].empty?)
if (!podInventory.nil? && !podInventory.empty? && podInventory.key?("items") && !podInventory["items"].empty?)
#get pod inventory & services
$log.info("in_kube_podinventory::enumerate : Getting services from Kube API @ #{Time.now.utc.iso8601}")
serviceList = JSON.parse(KubernetesApiClient.getKubeResourceInfo("services").body)
serviceList = nil
serviceInfo = KubernetesApiClient.getKubeResourceInfo("services")

if !serviceInfo.nil?
serviceList = JSON.parse(serviceInfo.body)
end

$log.info("in_kube_podinventory::enumerate : Done getting services from Kube API @ #{Time.now.utc.iso8601}")
parse_and_emit_records(podInventory, serviceList)
else
Expand Down