crowbar-client 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96242929ff4f63474c38f48779c047d71c06674f51f73b6b48dd939f2de6c90
-  data.tar.gz: bea1ac00753c5d93e682299bc66c9e375faba6384e0d08db72d59ad6ee0a7c93
+  metadata.gz: dde7d7523db4411363365404f5e439b292b78723488ae6a732de79ecb08ae200
+  data.tar.gz: a692fb4b07d250b28e317077cffb0d40166a70c870d74b8e16e398a97f57d6f0
 SHA512:
-  metadata.gz: d279752db885d75556c6c4bb6d6c08793995fa67a07258da904bad1789769b47f223bd2074c0a18b20445eab7d3c9f80b37c39d14449e20d896745f77bbf266b
-  data.tar.gz: 41976f4fc7189ac6cf208f1958fddb3db0919a8e6d4628c6d10ecbb93d70fc651c2461389b049522b7b724f3d17d32edb614e173f0f447e84030a4d924948080
+  metadata.gz: ed7acd0f36016af684a11e9c4968f687d96f27385e407c348f5e4edde299403cfbce83ff8245f2f85f4d0b6058a9844b61bbc67749aba7d33d90a6c28bf1fab5
+  data.tar.gz: e07e211190cd10599af16e18e3504833648150eec3dff9510245bf816912143345f6a2af941907700ce1a3ab0b5c8130f911cf10ea8615882707d50a5adfa50d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [3.7.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.7.0) - 2018-12-14
+
+* ENHANCEMENT
+  * Better upgrade repocheck output
+
 ## [3.6.1](https://github.com/crowbar/crowbar-client/releases/tag/v3.6.1) - 2018-12-07
 
 * BUGFIX

data/lib/crowbar/client/app.rb

@@ -62,6 +62,9 @@ module Crowbar
       autoload :Role,
         File.expand_path("../app/role", __FILE__)
 
+      autoload :Ses,
+        File.expand_path("../app/ses", __FILE__)
+
       autoload :Server,
         File.expand_path("../app/server", __FILE__)
 

data/lib/crowbar/client/app/entry.rb

@@ -166,6 +166,13 @@ module Crowbar
         desc "services [COMMANDS]",
           "Services specific commands, call without params for help"
         subcommand "services", Crowbar::Client::App::Services
+
+        desc "ses [COMMANDS]",
+          "SES (Ceph) specific commands, call without params for help"
+        subcommand "ses", Crowbar::Client::App::Ses
+
+        # hide SES command in older versions
+        remove_command :ses unless Config.defaults[:cloud_version].to_i >= 9
       end
     end
   end

data/lib/crowbar/client/app/ses.rb

@@ -0,0 +1,54 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module App
+      #
+      # A Thor based CLI wrapper for SES commands
+      #
+      class Ses < Base
+        desc "upload FILE",
+          "Upload SES configuration file"
+
+        long_desc <<-LONGDESC
+          `upload FILE` will upload yaml file with SES configuration to the
+          server. Data inside this file could be used later for integrating
+          SES cluster with other services.
+        LONGDESC
+
+        #
+        # SES config upload command
+        #
+        # It will upload yaml file with SES configuration to the server.
+        # Data inside this file could be used later for integrating SES
+        # cluster with other services.
+        #
+        # @param file [String] the path to the file
+        #
+        def upload(file)
+          Command::Ses::Upload.new(
+            *command_params(
+              file: file
+            )
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/command.rb

@@ -56,6 +56,9 @@ module Crowbar
       autoload :Role,
         File.expand_path("../command/role", __FILE__)
 
+      autoload :Ses,
+        File.expand_path("../command/ses", __FILE__)
+
       autoload :Server,
         File.expand_path("../command/server", __FILE__)
 

data/lib/crowbar/client/command/ses.rb

@@ -0,0 +1,29 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Command
+      #
+      # Module for the SES command implementations
+      #
+      module Ses
+        autoload :Upload,
+          File.expand_path("../ses/upload", __FILE__)
+      end
+    end
+  end
+end

data/lib/crowbar/client/command/ses/upload.rb

@@ -0,0 +1,60 @@
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Command
+      module Ses
+        #
+        # Implementation for the SES config upload command
+        #
+        class Upload < Base
+          def request
+            args.file =
+              case args.file
+              when "-"
+                stdin.to_io
+              when File
+                args.file
+              else
+                unless File.exist?(args.file)
+                  err "File #{args.file} does not exist."
+                end
+                File.new(
+                  args.file,
+                  File::RDONLY
+                )
+              end
+
+            @request ||= Request::Ses::Upload.new(
+              args
+            )
+          end
+
+          def execute
+            request.process do |request|
+              case request.code
+              when 200
+                say "Successfully uploaded SES configuration"
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/command/upgrade/repocheck.rb

@@ -100,7 +100,7 @@ module Crowbar
                   )
                 else
                   err "No such component '#{args.component}'. " \
-                    "Only 'admin' and 'nodes' are valid components."
+                    "Only 'crowbar' and 'nodes' are valid components."
                 end
               end
             end

data/lib/crowbar/client/config.rb

@@ -61,6 +61,7 @@ module Crowbar
           apiversion: default_apiversion,
           experimental: default_experimental,
           upgrade_versions: default_upgrade_versions,
+          cloud_version: default_cloud_version,
           debug: default_debug
         )
       end
@@ -108,18 +109,33 @@ module Crowbar
         return "7-to-8" if File.exist?("/var/lib/crowbar/upgrade/7-to-8-upgrade-running")
 
         # if upgrade has not been started, check the system version
-        os_release_file = "/etc/os-release"
-
-        if File.exist?(os_release_file)
-          os_release = Hash[
-            File.open(os_release_file).read.scan(/(\S+)\s*=\s*"([^"]+)/)
-          ]
-          return "6-to-7" if os_release["VERSION_ID"] == "12.1"
-        end
+        return "6-to-7" if default_cloud_version == "6"
 
         "7-to-8"
       end
 
+      #
+      # Define a default cloud version value
+      # It is detected based on OS release for local machine or set by user via ENV variable.
+      #
+      # @return [String] the default cloud version value
+      #
+      def default_cloud_version
+        return ENV["CROWBAR_CLOUD_VERSION"] if ENV["CROWBAR_CLOUD_VERSION"].present?
+
+        os_release = Crowbar::Client::Util::OsRelease.fields
+        case os_release["VERSION_ID"]
+        when "12.1"
+          "6"
+        when "12.2"
+          "7"
+        when "12.3"
+          "8"
+        else
+          "9"
+        end
+      end
+
       #
       # Define a default alias value
       #

data/lib/crowbar/client/request.rb

@@ -62,6 +62,9 @@ module Crowbar
       autoload :Role,
         File.expand_path("../request/role", __FILE__)
 
+      autoload :Ses,
+        File.expand_path("../request/ses", __FILE__)
+
       autoload :Server,
         File.expand_path("../request/server", __FILE__)
 

data/lib/crowbar/client/request/ses.rb

@@ -0,0 +1,29 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Request
+      #
+      # Module for the SES request implementations
+      #
+      module Ses
+        autoload :Upload,
+          File.expand_path("../ses/upload", __FILE__)
+      end
+    end
+  end
+end

data/lib/crowbar/client/request/ses/upload.rb

@@ -0,0 +1,65 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "easy_diff"
+
+module Crowbar
+  module Client
+    module Request
+      module Ses
+        #
+        # Implementation for the SES config upload request
+        #
+        class Upload < Base
+          #
+          # Override the request content
+          #
+          # @return [Hash] the content for the request
+          #
+          def content
+            super.easy_merge!(
+              sesconfig: {
+                file: attrs.file
+              }
+            )
+          end
+
+          #
+          # HTTP method that gets used by the request
+          #
+          # @return [Symbol] the method for the request
+          #
+          def method
+            :post
+          end
+
+          #
+          # Path to the API endpoint for the request
+          #
+          # @return [String] path to the API endpoint
+          #
+          def url
+            [
+              "ses",
+              "settings",
+              "upload"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/util.rb

@@ -28,6 +28,9 @@ module Crowbar
 
       autoload :ApiVersion,
         File.expand_path("../util/apiversion", __FILE__)
+
+      autoload :OsRelease,
+        File.expand_path("../util/osrelease", __FILE__)
     end
   end
 end

data/lib/crowbar/client/util/apiversion.rb

@@ -40,15 +40,9 @@ module Crowbar
 
         class << self
           def default
-            os_release_file = "/etc/os-release"
+            os_release = OsRelease.fields
 
-            if File.exist?(os_release_file)
-              os_release = Hash[
-                File.open(os_release_file).read.scan(/(\S+)\s*=\s*"([^"]+)/)
-              ]
-
-              return 1.0 if os_release["VERSION_ID"] == "12.1" && os_release["ID"] == "sles"
-            end
+            return 1.0 if os_release["VERSION_ID"] == "12.1" && os_release["ID"] == "sles"
 
             2.0
           end

data/lib/crowbar/client/util/osrelease.rb

@@ -0,0 +1,37 @@
+#
+# Copyright 2019, SUSE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Util
+      class OsRelease
+        class << self
+          def fields
+            os_release_file = "/etc/os-release"
+
+            if File.exist?(os_release_file)
+              return Hash[
+                File.open(os_release_file).read.scan(/(\S+)\s*=\s*"([^"]+)/)
+              ]
+            end
+
+            {}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crowbar/client/version.rb

@@ -28,12 +28,12 @@ module Crowbar
       #
       # Minor version
       #
-      MINOR = 6
+      MINOR = 7
 
       #
       # Patch version
       #
-      PATCH = 1
+      PATCH = 0
 
       #
       # Optional suffix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -247,6 +247,7 @@ files:
 - lib/crowbar/client/app/role.rb
 - lib/crowbar/client/app/server.rb
 - lib/crowbar/client/app/services.rb
+- lib/crowbar/client/app/ses.rb
 - lib/crowbar/client/app/upgrade.rb
 - lib/crowbar/client/app/virtual_ip.rb
 - lib/crowbar/client/command.rb
@@ -320,6 +321,8 @@ files:
 - lib/crowbar/client/command/services/disable_restart.rb
 - lib/crowbar/client/command/services/list_restarts.rb
 - lib/crowbar/client/command/services/restart_flags.rb
+- lib/crowbar/client/command/ses.rb
+- lib/crowbar/client/command/ses/upload.rb
 - lib/crowbar/client/command/upgrade.rb
 - lib/crowbar/client/command/upgrade/admin.rb
 - lib/crowbar/client/command/upgrade/backup.rb
@@ -430,6 +433,8 @@ files:
 - lib/crowbar/client/request/services/disable_restart.rb
 - lib/crowbar/client/request/services/list_restarts.rb
 - lib/crowbar/client/request/services/restart_flags.rb
+- lib/crowbar/client/request/ses.rb
+- lib/crowbar/client/request/ses/upload.rb
 - lib/crowbar/client/request/upgrade.rb
 - lib/crowbar/client/request/upgrade/admin.rb
 - lib/crowbar/client/request/upgrade/backup.rb
@@ -448,6 +453,7 @@ files:
 - lib/crowbar/client/util.rb
 - lib/crowbar/client/util/apiversion.rb
 - lib/crowbar/client/util/editor.rb
+- lib/crowbar/client/util/osrelease.rb
 - lib/crowbar/client/util/runner.rb
 - lib/crowbar/client/version.rb
 - spec/crowbar/client/app_spec.rb
@@ -619,8 +625,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Crowbar commandline client