foreman_rh_cloud 7.0.45 → 8.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccb21d6d17487bea0ab663a295419706f007207d62c41fc7e0fce30071fdbd0
-  data.tar.gz: 7f45fd6cb0dfaca6ecd7d0a8a59488aebc91ef9a773056774c062da4623443d7
+  metadata.gz: 8db662f6cd6809ba5dd5b183ec76330b4a1d4eb6db931136c8e34dcdf53c796c
+  data.tar.gz: e410219ca7fcbd0555d157f05123cc7c7618b29531157de42a3e3413d9d96eb4
 SHA512:
-  metadata.gz: 9f4a974b345a78cfb4071f6648effb5715e7dcd44fe8e0a0dd2a634a03db788a8b7f819bd785974ad378c3b1a8cb01ee1c58a428753335d732da7b2e3192c9a6
-  data.tar.gz: e3319409f79b9de5eb04fe8bfd07b0efa99d4065bf2a41ef78cfb7db8d210bdbdb0a030c1b3feb406d9ba41627343c5afe2a8f301f22467bfb7eb15fba3c454d
+  metadata.gz: 601501b2ec41be00150bbc9797ad9fe7c93a92aea619ca1781ef3df88224e3f6fb04b2c16e2c2e974832ef67926794108d3c8f2c7654d52056e25a218887cd55
+  data.tar.gz: 6a7ca4b57eb655c5d4c3a880f0deac4af3f86c6a4b71ddd4ff02b7adc4aa9bf5c0cb2a70731f5472ce763b841a75f755835e0674d489c6b5d51759ee9d1c85f3

data/db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb

@@ -2,6 +2,6 @@
 
 class FixRhCloudSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -109,6 +109,18 @@ module ForemanInventoryUpload
         IPAddr.new(max_obfuscated + 1, Socket::AF_INET).to_s
       end
 
+      def hostname_match
+        bash_hostname = `uname -n`.chomp
+        foreman_hostname = ForemanRhCloud.foreman_host&.name
+        if bash_hostname == foreman_hostname
+          fqdn(foreman_hostname)
+        elsif Setting[:obfuscate_inventory_hostnames]
+          obfuscate_fqdn(bash_hostname)
+        else
+          bash_hostname
+        end
+      end
+
       def bios_uuid(host)
         value = fact_value(host, 'dmi::system::uuid') || ''
         uuid_value(value)

data/lib/foreman_inventory_upload/generators/metadata.rb

@@ -1,6 +1,7 @@
 module ForemanInventoryUpload
   module Generators
     class Metadata
+      include FactHelpers
       def initialize(output = [])
         @stream = JsonStream.new(output)
       end
@@ -28,6 +29,9 @@ module ForemanInventoryUpload
           @stream.simple_field('report_id', Foreman.uuid)
           @stream.simple_field('host_inventory_api_version', '1.0')
           @stream.simple_field('source', 'Satellite')
+          @stream.simple_field('reporting_host_name', hostname_match)
+          @stream.simple_field('reporting_host_ips', host_ips(ForemanRhCloud.foreman_host))
+          @stream.simple_field('reporting_host_bios_uuid', bios_uuid(ForemanRhCloud.foreman_host))
           @stream.simple_field('source_metadata', metadata)
           @stream.object_field('report_slices', :last) do
             yield(self)

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -45,11 +45,9 @@ module ForemanInventoryUpload
       end
 
       def content_data
-        [
-          ['lifecycle_environment', @host.lifecycle_environment&.name],
-          ['content_view', @host.content_view&.name],
-        ] +
-        (@host.activation_keys || []).map { |item| ['activation_key', item.name] }
+        (@host.lifecycle_environments.uniq || []).map { |item| ['lifecycle_environment', item.name] } +
+        (@host.activation_keys || []).map { |item| ['activation_key', item.name] } +
+        (@host.content_views || []).map { |item| ['content_view', item.name] }
       end
 
       def satellite_server_data

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '7.0.45'.freeze
+  VERSION = '8.0.46'.freeze
 end

data/lib/tasks/hybrid_cloud.rake

@@ -0,0 +1,63 @@
+require 'io/console'
+
+namespace :rh_cloud do |args|
+  desc 'Register Satellite Organization with Hybrid Cloud API. \
+        Specify org_id=x replace your organization ID with x. \
+        Specify SATELLITE_RH_CLOUD_URL=https://x with the Hybrid Cloud endpoint you are connecting to.'
+  task hybridcloud_register: [:environment] do
+    include ::ForemanRhCloud::CertAuth
+    include ::InsightsCloud::CandlepinCache
+    
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def registrations_url
+      logger.warn("Custom url is not set, using the default one: #{ForemanRhCloud.base_url}") if ENV['SATELLITE_RH_CLOUD_URL'].empty?
+      ForemanRhCloud.base_url + '/api/identity/certificate/registrations'
+    end
+
+    if ENV['org_id'].nil?
+      logger.error('ERROR: org_id needs to be specified.')
+      exit(1)
+    end
+    
+    organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
+    
+    @uid = cp_owner_id(organization)
+    logger.error('Organization provided does not have a manifest imported.') + exit(1) if @uid.nil?
+
+    puts 'Paste your token, output will be hidden.'
+    @token = STDIN.noecho(&:gets).chomp
+    logger.error('Token was not entered.') + exit(1) if @token.empty?
+
+    def headers
+      {
+        Authorization: "Bearer #{@token}"
+      }
+    end
+
+    def payload
+      {
+        "uid": @uid
+      }
+    end
+
+    def method
+      :post
+    end
+
+    begin
+      response = execute_cloud_request(
+        organization: organization,
+        method: method,
+        url: registrations_url,
+        headers: headers,
+        payload: payload.to_json
+      )
+      logger.debug(response)
+    rescue Exception => ex
+      logger.error(ex)
+    end
+  end
+end