From 77a51ed35ed68248f53694ecc86ad5aefcffcd5b Mon Sep 17 00:00:00 2001 From: Mikker Gimenez-Peterson Date: Mon, 4 Nov 2019 13:30:58 -0800 Subject: [PATCH] Echo to user the service being used --- lib/vmfloaty/abs.rb | 6 ++---- lib/vmfloaty/utils.rb | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/vmfloaty/abs.rb b/lib/vmfloaty/abs.rb index 381d95b..c166e54 100644 --- a/lib/vmfloaty/abs.rb +++ b/lib/vmfloaty/abs.rb @@ -155,8 +155,7 @@ def self.retrieve(verbose, os_types, token, url, user) # "job": { # "id": "12345", # "tags": { - # "user": "jenkins", - # "jenkins_build_url": "https://jenkins/job/platform_puppet_intn-van-sys_master" + # "user": "username", # } # } # } @@ -164,7 +163,7 @@ def self.retrieve(verbose, os_types, token, url, user) conn = Http.get_conn(verbose, url) conn.headers['X-AUTH-TOKEN'] = token if token - saved_job_id = Time.now.to_i + saved_job_id = DateTime.now.strftime('%Q') reqObj = { :resources => os_types, @@ -172,7 +171,6 @@ def self.retrieve(verbose, os_types, token, url, user) :id => saved_job_id, :tags => { :user => user, - :url_string => "floaty://#{user}/#{saved_job_id}", }, }, } diff --git a/lib/vmfloaty/utils.rb b/lib/vmfloaty/utils.rb index eb3464a..33ce8ac 100644 --- a/lib/vmfloaty/utils.rb +++ b/lib/vmfloaty/utils.rb @@ -209,6 +209,7 @@ def self.get_service_config(config, options) service_config['token'] = options.token unless options.token.nil? service_config['user'] = options.user unless options.user.nil? + puts "Connecting to service #{service_config['type']} at #{service_config['url']} as #{service_config['user']}...\n\n" service_config end end