foreman_inventory_upload 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f43a159c1ad0640b4bae1e5c5e6d7e4a9343c8d58f4a337aa90ec5e56baaba
-  data.tar.gz: 20d976de7de8c35a49723b2523ad5046125e8a8ceaba1e29a573e23dee63f373
+  metadata.gz: 68e0c65af49cef0bc0aa141fce0d49a8e4fbc2c1bfdbeac3ccbfc973b33b01e1
+  data.tar.gz: e95a89e5a43a33840ca7b49444eb9afbeb40bc760de54ce1ee5c0c808560ce43
 SHA512:
-  metadata.gz: ff9a5f943072f3adb866925846fbd47b1cf60649e93da8773e91cc9a6281905b527c2dd6f2bb6c0eb06b775cd00fb30df20efb48a2d9875e7ee37209e77b979a
-  data.tar.gz: 53682d497ca12ce13cbdfdd2f217a62f4dddef25d0819b3d93c9e083979b8c0beff16682c0cc473d6d17eab61ab075dca3aa6856d2838b70a4a60e8818bf1102
+  metadata.gz: aabc1930b694964e5954e83edef39074094cfbd343309f258b6e4a3753e835932efc9257c79d8bf36ef4c72bb077efc9c6de7eff93f33d568c3347b1516988bc
+  data.tar.gz: 557af5d00132b9883aff276e34d0a5c58f7ad5f9371185a1ebe7b050e5f5174aeb404906530b504cab639160aa408d70db3ee3078db5778f7b9790d9d38a7c84

data/app/views/scripts/uploader.sh.erb

@@ -30,13 +30,15 @@ fi
 # /tmp/a b/x.pem
 # curl --cert /tmp/a\ b/x.pem
 
-mkdir -p done
+SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE:-0}")")
+DONE_DIR="$SCRIPT_DIR/done/"
+mkdir -p $DONE_DIR
 
 for f in $FILES
 do
   curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL"
   if [ $? -eq 0 ]; then
-    mv $f done/
+    mv $f $DONE_DIR
     echo "Done: $f"
   fi
 done

data/lib/foreman_inventory_upload.rb

@@ -43,7 +43,7 @@ module ForemanInventoryUpload
 
   def self.upload_url
     # for testing set ENV to 'https://ci.cloud.redhat.com/api/ingress/v1/upload'
-    @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cloud.redhat.com/api/ingress/v1/upload'
+    @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cert.cloud.redhat.com/api/ingress/v1/upload'
   end
 
   def self.ensure_folder(folder)

data/lib/foreman_inventory_upload/version.rb

@@ -1,3 +1,3 @@
 module ForemanInventoryUpload
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_inventory_upload
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Inventory upload team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello