foreman_rh_cloud 13.2.8 → 14.0.1

data/app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js

@@ -3,10 +3,10 @@
   "locale_data": {
     "foreman_rh_cloud": {
       "": {
-        "Project-Id-Version": "foreman_rh_cloud 14.0.2",
+        "Project-Id-Version": "foreman_rh_cloud 13.2.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2023-01-20 13:26+0000",
-        "Last-Translator": "Ondřej Gajdušek, 2026",
+        "Last-Translator": "Ondřej Gajdušek, 2025",
         "Language-Team": "Chinese (China) (https://app.transifex.com/foreman/teams/114/zh_CN/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -24,7 +24,7 @@
         "%s 机构"
       ],
       "A specific organization must be selected from the organization context.": [
-        "必须从机构上下文中选择一个特定的机构。"
+        ""
       ],
       "About subscription watch": [
         "订阅查看"
@@ -39,7 +39,7 @@
         "现在选择了所有建议。"
       ],
       "Analysis disabled": [
-        "禁用分析"
+        ""
       ],
       "Analytics data collection": [
         "数据收集分析"
@@ -51,7 +51,7 @@
         "应用 Insights 建议"
       ],
       "Attempted to destroy HBI host %s, but host does not exist in HBI": [
-        "尝试销毁 HBI 主机 %s，但主机在 HBI 中不存在"
+        ""
       ],
       "Automatic inventory upload": [
         "自动清单上传"
@@ -93,7 +93,7 @@
         "完成"
       ],
       "Completed with warnings": [
-        "完成，带有警告"
+        ""
       ],
       "Configure": [
         "配置"
@@ -114,13 +114,13 @@
         "当前页"
       ],
       "Details": [
-        "详情"
+        ""
       ],
       "Disable": [
-        "禁用"
+        ""
       ],
       "Disable vulnerability analysis": [
-        "禁用漏洞分析"
+        ""
       ],
       "Disconnected hosts: ": [
         "断开连接的主机："
@@ -138,28 +138,28 @@
         "下载最新的报告"
       ],
       "Download report": [
-        "下载报告"
+        ""
       ],
       "Duration": [
-        "持续时间"
+        ""
       ],
       "Enable": [
-        "启用"
+        ""
       ],
       "Enable automatic deletion of mismatched host records from the Red Hat cloud": [
         "启用自动删除来自红帽云的主机记录"
       ],
       "Enable automatic deletion of mismatched host records from the Red Hat cloud. Ignored when using local Insights.": [
-        "启用自动删除来自红帽云的主机记录。在使用本地 Insights 时忽略。"
+        ""
       ],
       "Enable automatic synchronization of Insights recommendations from the Red Hat cloud": [
         "启用来自红帽云的 Insights 建议自动同步"
       ],
       "Enable automatic synchronization of Insights recommendations from the Red Hat cloud. Ignored when using local Insights.": [
-        "启用自动同步来自 Red Hat cloud 的 Insights 建议。在使用本地 Insights 时忽略。"
+        ""
       ],
       "Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights.": [
-        "启用自动将主机清单上传到红帽云。在使用本地 Insights 时会忽略。"
+        ""
       ],
       "Enable automatic upload of your hosts inventory to the Red Hat cloud": [
         "启用自动将主机清单上传到红帽云"
@@ -171,7 +171,7 @@
         "启用清单上传"
       ],
       "Enable vulnerability analysis": [
-        "启用漏洞分析"
+        ""
       ],
       "Encountered an error while trying to access the server:": [
         "在尝试访问服务器时遇到错误："
@@ -183,22 +183,22 @@
         "将安装的软件包上传到红帽云"
       ],
       "Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.) Ignored when using local Insights.": [
-        "在上传到红帽云时排除安装的软件包。（如果 insights_minimal_data_collection 设置为 true，则忽略此设置，且安装的软件包始终被排除。）在使用本地 Insights 时忽略。"
+        ""
       ],
       "Exit Code: %s": [
         "退出代码：%s"
       ],
       "Failed": [
-        "失败"
+        ""
       ],
       "Failed to destroy HBI host %s: %s": [
-        "销毁 HBI 主机 %s 失败：%s"
+        ""
       ],
       "Failed to fetch hosts": [
-        "获取主机失败"
+        ""
       ],
       "Failed to update vulnerability analysis status": [
-        "更新漏洞分析状态失败"
+        ""
       ],
       "Fetch Insights-related host details": [
         "获取与 Insights 相关的主机详情"
@@ -237,7 +237,7 @@
         "生成报告，但不上传"
       ],
       "Generated": [
-        "生成"
+        ""
       ],
       "Generating": [
         "生成中"
@@ -264,7 +264,7 @@
         "主机 Insights 建议"
       ],
       "Host inventory report job": [
-        "主机清单报告作业"
+        ""
       ],
       "Host was not uploaded to your RH cloud inventory": [
         "主机没有上传到您的 RH 云清单"
@@ -288,7 +288,7 @@
         "Insights"
       ],
       "Invalid response from server": [
-        "来自服务器的无效响应"
+        ""
       ],
       "Inventory": [
         "清单"
@@ -327,7 +327,7 @@
         "低"
       ],
       "Manage vulnerability analysis": [
-        "管理漏洞分析"
+        ""
       ],
       "Manual": [
         "手册"
@@ -336,7 +336,7 @@
         "最小数据收集"
       ],
       "Missing Insights facets created: %s": [
-        "缺失创建的 Insights 情况：%s"
+        ""
       ],
       "Moderate": [
         "中等"
@@ -345,7 +345,7 @@
         "如需更多详细信息，请参阅"
       ],
       "N/A": [
-        "不适用"
+        ""
       ],
       "Next run: ": [
         "下一次运行 ："
@@ -354,31 +354,31 @@
         "否"
       ],
       "No account data available.": [
-        "没有可用的帐户数据。"
+        ""
       ],
       "No recent tasks": [
-        "没有最近的任务"
+        ""
       ],
       "No recommendations were found for this host!": [
         "没有找到此主机的建议！"
       ],
       "No report generation tasks have been run yet.": [
-        "还没有运行报告生成任务。"
+        ""
       ],
       "No results found": [
         "没有找到结果"
       ],
       "No task history": [
-        "没有任务历史记录"
+        ""
       ],
       "No task was found": [
         "没有找到任务"
       ],
       "No tasks have been run yet.": [
-        "还没有运行任何任务。"
+        ""
       ],
       "None of the selected hosts are registered": [
-        "所选主机都没有注册"
+        ""
       ],
       "Not reporting": [
         "未报告"
@@ -402,16 +402,16 @@
         "发送到红帽云的模糊主机名"
       ],
       "Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.) Ignored when using local Insights.": [
-        "将发送到红帽云的主机名进行模糊化处理。（如果 insights_minimal_data_collection 设置为 true，则忽略此设置，因为报告中不包含主机名。）在使用本地 Insights 时忽略。"
+        ""
       ],
       "Obfuscate ipv4 addresses sent to the Red Hat cloud": [
         "发送到红帽云的模糊 ipv4 地址"
       ],
       "Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.) Ignored when using local Insights.": [
-        "将发送到红帽云的 ipv4 地址进行模糊化处理。（如果 insights_minimal_data_collection 设置为 true，则忽略此设置，因为报告中不包含 ipv4 地址。）在使用本地 Insights 时忽略。"
+        ""
       ],
       "Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings. Ignored when using local Insights.": [
-        "在将数据上传到红帽云时在清单报告中包括最少需要的数据。当这是 true 时，无论 exclude_installed_packages 设置是什么，安装的软件包都排除在报告中，无论模糊化设置是什么，主机名和 IPv4 地址都不包括在报告中。在使用本地 Insights 时忽略。"
+        ""
       ],
       "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled": [
         "仅将最低所需的数据发送到红帽云，禁用模糊设置"
@@ -426,19 +426,19 @@
         "分页"
       ],
       "Paused": [
-        "暂停"
+        ""
       ],
       "Playbook": [
         "运行 playbook"
       ],
       "Previous tasks will appear here.": [
-        "此处将显示前面的任务。"
+        ""
       ],
       "RH Cloud": [
         "RH Cloud"
       ],
       "RHC daemon id. Ignored when using local Insights.": [
-        "RHC 守护进程 ID。在使用本地 Insights 时忽略。"
+        ""
       ],
       "Read more about it in RH cloud insights": [
         "在 RH Cloud insights 中了解更多有关它的信息"
@@ -489,16 +489,16 @@
         "补救概述"
       ],
       "Report Generation": [
-        "报告生成"
+        ""
       ],
       "Report generation and upload started": [
-        "报告生成和上传已开始"
+        ""
       ],
       "Report generation started": [
-        "报告生成开始"
+        ""
       ],
       "Report saved to": [
-        "报告保持到"
+        ""
       ],
       "Reporting": [
         "报告"
@@ -516,7 +516,7 @@
         "运行 Insights 生成的补救 playbook"
       ],
       "Running": [
-        "執行中"
+        ""
       ],
       "Satellite server has %{hits_count} recommendations by Red Hat": [
         "Satellite 服务器有 %{hits_count} 个红帽提供的建议"
@@ -537,7 +537,7 @@
         "设置"
       ],
       "Should import include parameter tags from Foreman? Ignored when using local Insights.": [
-        "是否应该导入 Foreman 中的 include 参数标签？在使用本地 Insights 时忽略。"
+        ""
       ],
       "Show Advanced Settings": [
         "显示高级设置"
@@ -546,10 +546,10 @@
         "显示系统是否被配置为使用本地 iop-advisor-engine。"
       ],
       "Single-host report job": [
-        "单主机报告作业"
+        ""
       ],
       "Single-host report job for host %s": [
-        "主机 %s 的单主机报告作业"
+        ""
       ],
       "Start inventory synchronization": [
         "启动清单同步"
@@ -558,13 +558,13 @@
         "开始报告生成"
       ],
       "Started": [
-        "已启动"
+        ""
       ],
       "Stopped": [
-        "停止"
+        ""
       ],
       "Success": [
-        "成功"
+        ""
       ],
       "Successfully synced hosts: ": [
         "成功同步的主机："
@@ -603,7 +603,7 @@
         "没有适用于您的主机的建议"
       ],
       "There were no missing Insights facets": [
-        "没有缺失的 Insights 情况"
+        ""
       ],
       "This action will also enable automatic reports upload": [
         "此操作还会启用自动报告上传"
@@ -624,7 +624,7 @@
         "总风险"
       ],
       "Unknown": [
-        "未知"
+        ""
       ],
       "Upload hits from iop-advisor-engine": [
         "从 iop-advisor-engine 上传 hits"
@@ -633,13 +633,13 @@
         "上传 hits 信息"
       ],
       "Upload is disabled because subscription connection is not enabled. Enable it in Administer > Settings > Content.": [
-        "上传被禁用，因为订阅连接没有启用。通过 Administer > Settings > Content 启用。"
+        ""
       ],
       "Upload rules related to the hits": [
         "上传与 hits 相关的 rule"
       ],
       "Uploaded": [
-        "已上传"
+        ""
       ],
       "Uploading": [
         "上载中"
@@ -654,10 +654,10 @@
         "禁用 Red Hat Insights"
       ],
       "View task": [
-        "查看任务"
+        ""
       ],
       "View task details": [
-        "查看任务详情"
+        ""
       ],
       "Vulnerabilities": [
         "安全漏洞"
@@ -666,22 +666,22 @@
         "安全漏洞"
       ],
       "Vulnerability analysis disabled": [
-        "禁用漏洞分析"
+        ""
       ],
       "Vulnerability analysis enabled": [
-        "启用漏洞分析"
+        ""
       ],
       "Wait and %s": [
         "等待和 %s"
       ],
       "Warning": [
-        "警告"
+        ""
       ],
       "Whether the resolution requires reboot": [
         "resolution 是否需要重启"
       ],
       "You do not have permission to perform this action": [
-        "您没有执行此操作的权限"
+        ""
       ],
       "category name": [
         "类别名称"

data/app/models/concerns/rh_cloud_host.rb

@@ -21,8 +21,7 @@ module RhCloudHost
     scoped_search :relation => :inventory_sync_status_object, :on => :status, :rename => :insights_inventory_sync_status,
       :complete_value => { :disconnect => ::InventorySync::InventoryStatus::DISCONNECT,
                            :sync => ::InventorySync::InventoryStatus::SYNC }
-    scoped_search :on => :id, :rename => :insights_uuid, :only_explicit => true,
-      :ext_method => :search_by_insights_uuid, :complete_value => false
+    scoped_search :relation => :insights, :on => :uuid, :only_explicit => true, :rename => :insights_uuid
 
     def insights_facet
       insights
@@ -42,33 +41,4 @@ module RhCloudHost
       insights_facet.update!(uuid: subscription_facet.uuid)
     end
   end
-
-  module ClassMethods
-    def search_by_insights_uuid(_key, operator, value)
-      # Determine which facet table to search based on IoP mode
-      facet_table = ForemanRhCloud.with_iop_smart_proxy? ? Katello::Host::SubscriptionFacet.table_name : InsightsFacet.table_name
-
-      # Build SQL condition
-      if ['IN', 'NOT IN'].include?(operator)
-        # For IN/NOT IN, value may be an array or comma-separated string
-        # Convert to array and build placeholders for each value
-        values = value.is_a?(Array) ? value : value.to_s.split(',').map(&:strip)
-        placeholders = (['?'] * values.size).join(',')
-        condition = sanitize_sql_for_conditions(
-          ["#{facet_table}.uuid #{operator} (#{placeholders})", *values]
-        )
-      else
-        # For other operators (=, !=, LIKE, etc.), use value_to_sql for proper SQL formatting
-        condition = sanitize_sql_for_conditions(
-          ["#{facet_table}.uuid #{operator} ?", value_to_sql(operator, value)]
-        )
-      end
-
-      # Return search parameters with LEFT JOIN to include hosts without facets
-      {
-        joins: "LEFT JOIN #{facet_table} ON #{facet_table}.host_id = #{Host::Managed.table_name}.id",
-        conditions: condition,
-      }
-    end
-  end
 end

data/app/services/foreman_rh_cloud/insights_api_forwarder.rb

@@ -224,21 +224,14 @@ module ForemanRhCloud
     def scope_request?(original_request, path)
       return nil unless original_request.get?
 
-      # Find patterns that match this path AND are relevant for GET requests.
-      # A pattern is relevant if it either:
-      # - Has tag_name defined (supports scoping)
-      # - Has GET permissions defined (explicitly handles GET, even without tags)
-      # This ensures patterns like api/vulnerability/v1/cves/[^/]+$ (GET without tags)
-      # take precedence over general patterns, while POST-only patterns are ignored.
-      matching_patterns = SCOPED_REQUESTS.select do |pattern|
-        pattern[:test].match?(path) && (pattern[:tag_name] || pattern.dig(:permissions, 'GET'))
-      end
+      # Only consider patterns that define tag_name - this ensures patterns without
+      # tag_name (permission-only entries) cannot override tag-supporting patterns
+      matching_patterns = SCOPED_REQUESTS.select { |pattern| pattern[:tag_name] && pattern[:test].match?(path) }
       return nil if matching_patterns.empty?
 
-      # Choose the most specific pattern by regex source length
+      # Choose the most specific pattern by regex source length for consistency
+      # with required_permission_for behavior
       request_pattern = matching_patterns.max_by { |pattern| pattern[:test].source.length }
-
-      # Return the tag_name (may be nil if the most specific pattern doesn't support tags)
       request_pattern[:tag_name]
     end
 

data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -7,15 +7,9 @@ module ForemanInventoryUpload
 
       def run
         organization = ::Organization.find(input[:organization_id])
-        # Find hosts with subscription facets but without insights facets
-        # Note: We can't use scoped_search 'null? insights_uuid' because the null? operator
-        # doesn't work with ext_methods - it would check hosts.id IS NULL instead of the facet
-        hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, use_batches: false)
-                                                                            .left_outer_joins(:insights)
-                                                                            .where(insights_facets: { id: nil })
-
+        hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
         facet_count = 0
-        hosts_without_facets.in_batches(of: ForemanInventoryUpload.slice_size) do |batch|
+        hosts_without_facets.each do |batch|
           facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
             {
               host_id: host_id,

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -28,14 +28,6 @@ module ForemanInventoryUpload
         @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
       end
 
-      def golden_ticket?(organization)
-        result = organization.try(:golden_ticket?)
-        result = organization.content_access_mode == 'org_environment' if result.nil?
-
-        @organization_golden_tickets ||= {}
-        @organization_golden_tickets[organization.id] ||= result
-      end
-
       def cloud_provider(host)
         bios_version = fact_value(host, 'dmi::bios::version')
 

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -62,7 +62,7 @@ module ForemanInventoryUpload
             :content_facet,
             :host_statuses,
             :inventory_upload_facts,
-            subscription_facet: [:pools, :installed_products, :hypervisor_host]
+            subscription_facet: [:installed_products, :hypervisor_host]
           )
       end
 

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -230,7 +230,7 @@ module ForemanInventoryUpload
         @stream.simple_field('system_purpose_sla', host.subscription_facet.service_level)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
         @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
-        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('is_simple_content_access', true)
         @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.8'.freeze
+  VERSION = '14.0.1'.freeze
 end

data/lib/insights_cloud/async/vmaas_reposcan_sync.rb

@@ -6,8 +6,6 @@ module InsightsCloud
     class VmaasReposcanSync < ::Actions::EntryAction
       include ::ForemanRhCloud::CertAuth
 
-      HTTP_TOO_MANY_REQUESTS = 429
-
       # Subscribe to Katello repository sync hook action, if available
       def self.subscribe
         'Actions::Katello::Repository::SyncHook'.constantize
@@ -51,9 +49,15 @@ module InsightsCloud
 
         response
       rescue RestClient::ExceptionWithResponse => e
-        handle_rest_client_error(e)
+        message = "VMaaS reposcan sync failed: #{e.response&.code} - #{e.response&.body}"
+        logger.error(message)
+        output[:message] = message
+        raise
       rescue StandardError => e
-        handle_standard_error(e)
+        message = "Error triggering VMaaS reposcan sync: #{e.message}, response: #{e.respond_to?(:response) ? e.response : nil}"
+        logger.error(message)
+        output[:message] = message
+        raise
       end
 
       def rescue_strategy_for_self
@@ -66,25 +70,6 @@ module InsightsCloud
 
       private
 
-      def handle_rest_client_error(exception)
-        if exception.response&.code == HTTP_TOO_MANY_REQUESTS
-          message = "VMaaS reposcan sync skipped: another sync already in progress (#{HTTP_TOO_MANY_REQUESTS})"
-          logger.warn(message)
-        else
-          message = "VMaaS reposcan sync failed: #{exception.response&.code} - #{exception.response&.body}"
-          logger.error(message)
-        end
-        output[:message] = message
-        # Do NOT raise - let rescue_strategy_for_self Skip handle this
-      end
-
-      def handle_standard_error(exception)
-        message = "Error triggering VMaaS reposcan sync: #{exception.message}"
-        logger.error(message)
-        output[:message] = message
-        # Do NOT raise - let rescue_strategy_for_self Skip handle this
-      end
-
       def logger
         action_logger
       end