foreman_omaha 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421a748a9a01373e725254764e8ec0eec455da8db499a948d46de2215b9378bf
-  data.tar.gz: 893fd2401152eba58c412e5e87900d9d246fc6f0849f091e94172ea740f32dc8
+  metadata.gz: 2d18486e7d9ec48f38e24dc3230ac7952154b6368bb03b6200b530d40dfccb56
+  data.tar.gz: a35576ff4b8182f2d12364c3440d8fea31e194f1c39e4b8ed9787a5f487fdb69
 SHA512:
-  metadata.gz: '09028f73bcf73132903dfe8318befca2428178f01b9b83138fed7d431a7b51eda6b4268ca3d6cc3851871587391fabd45c7b54c35ee802c2532c970867c25cda'
-  data.tar.gz: 5e5cc0bb9cda50abe5bb9cec5d04ac46711403465928a9fda8e6e8b32fe0d9ab05d6bec380d9077fbf3ee16567ae3fffa3c08186f2ead2ca3e1c2d5c4d0ec2a2
+  metadata.gz: ea1a506216f9a64abe54920027716bfe31557db3d32b7cd867ad10c7bf6617f76413264be1b560bee338d6ece41c04b4752631cb773b27d53f664431b848fc5b
+  data.tar.gz: 9209885e3ca0b369d6acca9de2b59fbca45ce5d97ab163aa9d922bf6091f81453609c4fe0764f3b57b02cb162d7a5a093ed814d533f7b6d786743e47e83f8447

data/README.md

@@ -1,6 +1,6 @@
 # ForemanOmaha
 
-This plug-in enables CoreOS updates using [The Foreman](https://theforeman.org/) without using the public update infrastructure.
+This plug-in enables CoreOS and Flatcar updates using [The Foreman](https://theforeman.org/) without using the public update infrastructure.
 To follow along with common Foreman architecture, you need this Foreman plug-in installed and a [Smart-Proxy plugin](https://github.com/theforeman/smart_proxy_omaha). The smart-proxy plug-in does all the heavy lifting. The Foreman plug-in shows facts and reports for your hosts.
 Foreman core already supports deploying CoreOS hosts and is great for on-premise setups. This plug-in enables you to better manage your servers.
 
@@ -12,6 +12,7 @@ Foreman core already supports deploying CoreOS hosts and is great for on-premise
 | >= 1.17         | ~> 1.0         |
 | >= 1.18         | ~> 2.0         |
 | >= 1.20         | ~> 3.0         |
+| >= 1.24         | ~> 4.0         |
 
 ## Installation
 

data/app/controllers/api/v2/omaha_groups_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V2
     class OmahaGroupsController < V2::BaseController

data/app/controllers/api/v2/omaha_reports_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V2
     class OmahaReportsController < V2::BaseController

data/app/controllers/omaha_groups_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class OmahaGroupsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
 

data/app/controllers/omaha_hosts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class OmahaHostsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include ScopesPerAction

data/app/controllers/omaha_reports_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class OmahaReportsController < ApplicationController
   include Foreman::Controller::AutoCompleteSearch
 

data/app/graphql/types/omaha_group.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  class OmahaGroup < BaseObject
+    model_class ::ForemanOmaha::OmahaGroup
+    description 'An Omaha Group'
+
+    global_id_field :id
+    timestamps
+    field :name, String
+    field :uuid, String
+
+    has_many :hosts, Types::Host
+  end
+end

data/app/graphql/types/omaha_report.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  class OmahaReport < BaseObject
+    model_class ::ForemanOmaha::OmahaReport
+    description 'An Omaha Report'
+
+    global_id_field :id
+    timestamps
+    field :status, Types::OmahaReportStatusEnum
+    field :omaha_version, String
+
+    belongs_to :host, Types::Host
+  end
+end

data/app/graphql/types/omaha_report_status_enum.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Types
+  class OmahaReportStatusEnum < BaseEnum
+    ForemanOmaha::OmahaFacet::VALID_OMAHA_STATUSES.each do |status|
+      value status
+    end
+  end
+end

data/app/helpers/concerns/foreman_omaha/hosts_helper_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module HostsHelperExtensions
     extend ActiveSupport::Concern

data/app/helpers/foreman_omaha/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module ApplicationHelper
     def facets_count(association, resource_name = controller.resource_name)

data/app/helpers/foreman_omaha/omaha_groups_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module OmahaGroupsHelper
     def omaha_version_breakdown_bar(omaha_group)

data/app/helpers/omaha_hosts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OmahaHostsHelper
   def last_omaha_report_column(record)
     time = record.omaha_facet.last_report? ? _('%s ago') % time_ago_in_words(record.omaha_facet.last_report) : ''

data/app/helpers/omaha_reports_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OmahaReportsHelper
   def iconclass_for_omaha_status(status)
     case status.to_sym

data/app/lib/foreman_omaha/renderer/scope/macros/omaha.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module Renderer
     module Scope

data/app/models/concerns/foreman_omaha/host_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module HostExtensions
     extend ActiveSupport::Concern
@@ -14,7 +16,7 @@ module ForemanOmaha
     end
 
     def clear_omaha_facet
-      omaha_facet.destroy if omaha_facet
+      omaha_facet&.destroy
     end
 
     def clear_omaha_facet_on_build

data/app/models/concerns/foreman_omaha/omaha_facet_host_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module OmahaFacetHostExtensions
     extend ActiveSupport::Concern

data/app/models/foreman_omaha/fact_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class FactName < ::FactName
     def origin

data/app/models/foreman_omaha/omaha_facet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class OmahaFacet < ApplicationRecord
     include Facets::Base

data/app/models/foreman_omaha/omaha_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class OmahaGroup < ApplicationRecord
     include Authorizable
@@ -6,6 +8,8 @@ module ForemanOmaha
       N_('Omaha Channel')
     end
 
+    graphql_type '::Types::OmahaGroup'
+
     has_many :omaha_facets, :class_name => 'ForemanOmaha::OmahaFacet', :foreign_key => :omaha_group_id,
                             :inverse_of => :omaha_group, :dependent => :restrict_with_exception
     has_many :hosts, :class_name => '::Host::Managed', :through => :omaha_facets,

data/app/models/foreman_omaha/omaha_report.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class OmahaReport < ::Report
     enum :status => OmahaFacet::VALID_OMAHA_STATUSES
 
+    graphql_type '::Types::OmahaReport'
+
     scoped_search :on => :omaha_version, :rename => :version, :complete_value => true
     scoped_search :on => :status, :complete_value => statuses
 

data/app/models/host_status/omaha_status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HostStatus
   class OmahaStatus < HostStatus::Status
     def self.status_name

data/app/services/foreman_omaha/charts/oem_distribution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module Charts
     class OemDistribution

data/app/services/foreman_omaha/charts/status_distribution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module Charts
     class StatusDistribution

data/app/services/foreman_omaha/charts/version_distribution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   module Charts
     class VersionDistribution

data/app/services/foreman_omaha/container_linux_config_transpiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 module ForemanOmaha

data/app/services/foreman_omaha/fact_importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class FactImporter < ::FactImporter
     def self.authorized_smart_proxy_features

data/app/services/foreman_omaha/fact_parser.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class FactParser < ::FactParser
     def operatingsystem
-      args = { :name => facts['platform'], :major => facts['osmajor'], :minor => facts['osminor'] }
-      description = "#{facts['platform']} #{facts['version']}"
+      args = { :name => os_name, :major => facts['osmajor'], :minor => facts['osminor'] }
+      description = "#{os_name} #{facts['version']}"
       Coreos.where(args).first ||
         create_coreos_version(args.merge(:description => description,
                                          :release_name => facts['track']))
@@ -31,6 +33,12 @@ module ForemanOmaha
 
     private
 
+    def os_name
+      return 'Flatcar' if facts['distribution']&.downcase == 'flatcar'
+
+      facts['platform']
+    end
+
     def create_coreos_version(attrs)
       previous_version = previous_coreos_version
       return Coreos.create!(attrs) unless previous_coreos_version
@@ -43,7 +51,7 @@ module ForemanOmaha
     end
 
     def previous_coreos_version
-      Coreos.all.max_by { |os| Gem::Version.new(os.release) }
+      Coreos.where(name: os_name).max_by { |os| Gem::Version.new(os.release) }
     end
   end
 end

data/app/services/foreman_omaha/group_version_breakdown.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class GroupVersionBreakdown
     attr_accessor :omaha_group

data/app/services/foreman_omaha/omaha_report_importer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class OmahaReportImporter < ::ReportImporter
     def report_name_class

data/app/services/foreman_omaha/status_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanOmaha
   class StatusMapper
     attr_accessor :status
@@ -25,7 +27,6 @@ module ForemanOmaha
       end
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def to_description(version = nil)
       case status.to_sym
       when :complete
@@ -48,6 +49,5 @@ module ForemanOmaha
         _('The status of this host is unknown.')
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
   end
 end

data/app/views/api/v2/omaha_groups/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_group
 
 attributes :id, :name, :uuid

data/app/views/api/v2/omaha_groups/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @omaha_groups
 
 extends 'api/v2/omaha_groups/main'

data/app/views/api/v2/omaha_groups/main.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_group
 
 extends 'api/v2/omaha_groups/base'

data/app/views/api/v2/omaha_groups/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_group
 
 extends 'api/v2/omaha_groups/main'

data/app/views/api/v2/omaha_reports/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_report
 
 attributes :id, :host_id, :host_name, :reported_at, :status

data/app/views/api/v2/omaha_reports/create.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_report
 
 extends 'api/v2/omaha_reports/show'

data/app/views/api/v2/omaha_reports/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @omaha_reports
 
 extends 'api/v2/omaha_reports/main'

data/app/views/api/v2/omaha_reports/main.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_report
 
 extends 'api/v2/omaha_reports/base'

data/app/views/api/v2/omaha_reports/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_report
 
 extends 'api/v2/omaha_reports/main'

data/app/views/api/v2/omaha_reports/update.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @omaha_report
 
 extends 'api/v2/omaha_reports/show'

data/app/views/foreman_omaha/api/v2/omaha_facets/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 attributes :id, :last_report, :version, :machineid, :status
 
 child :omaha_group => :omaha_group do

data/app/views/foreman_omaha/api/v2/omaha_facets/base_with_root.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 child :omaha_facet => :omaha_facet_attributes do |_omaha_facet|
   extends 'foreman_omaha/api/v2/omaha_facets/base'
 end

data/app/views/foreman_omaha/api/v2/omaha_facets/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 child :omaha_facet => :omaha_facet_attributes do
   extends 'foreman_omaha/api/v2/omaha_facets/base'
 end

data/app/views/omaha_reports/_list.html.erb

@@ -25,7 +25,7 @@
         <td title="<%= report.to_description(report.omaha_version) %>"><span class="<%= iconclass_for_omaha_status(report.status) %>"></span> <%= report.to_label %></td>
         <td>
           <%= action_buttons(display_delete_if_authorized hash_for_omaha_report_path(:id => report).merge(:auth_object => report, :authorizer => authorizer),
-                                           :confirm => _("Delete report for %s?") % report.host.try(:name)) %>
+                             :data => { :confirm => _("Delete report for %s?") % report.host.try(:name)}) %>
         </td>
       </tr>
     <% end %>

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   namespace :api, :defaults => { :format => 'json' } do
     scope '(:apiv)', :module => :v2,