chef-licensing 0.4.44 → 1.0.0

data/lib/chef-licensing/tui_engine/tui_actions.rb

@@ -1,8 +1,5 @@
 require_relative "../license_key_validator"
-require_relative "../license_key_generator"
 require_relative "../exceptions/invalid_license"
-require_relative "../exceptions/license_generation_failed"
-require_relative "../exceptions/license_generation_rejected"
 require_relative "../license_key_fetcher/base"
 require_relative "../config"
 require_relative "../context"
@@ -46,9 +43,12 @@ module ChefLicensing
       def is_license_allowed?(input)
         client_api_call(license_id)
         self.license_type = get_license_type
+        # When user enters the license via TUI, we need to check if the license type is commercial to display warnings.
+        input[:is_commercial] = license_type == :commercial ? true : false
+        input[:license_type] = license_type
         if license_restricted?(license_type)
           # Existing license keys needs to be fetcher to show details of existing license of license type which is restricted.
-          # However, if user is trying to add free license, and user has active trial license, we fetch the trial license key
+          # However, if user is trying to add Free Tier License, and user has active trial license, we fetch the trial license key
           if license_type == :free && LicenseKeyFetcher::File.user_has_active_trial_license?(@opts)
             existing_license_keys_in_file = LicenseKeyFetcher::File.fetch_license_keys_based_on_type(:trial, @opts)
           else
@@ -69,65 +69,24 @@ module ChefLicensing
           input[:license_expiration_date] = Date.parse(license.expiration_date).strftime("%a, %d %b %Y")
           input[:number_of_days_in_expiration] = license.number_of_days_in_expiration
           "about_to_expire"
+        elsif license.exhausted? && (license.license_type.downcase == "commercial" || license.license_type.downcase == "free")
+          input[:license_type] = license.license_type
+          "exhausted_license"
         else
           "active"
         end
       end
 
-      def is_user_name_valid?(input)
-        user_name = input[:gather_user_last_name_for_license_generation] || input[:gather_user_first_name_for_license_generation]
-        (user_name =~ /\A[a-zA-Z]{1,16}\Z/) == 0
-      end
-
-      def is_email_valid?(input)
-        (input[:gather_user_email_for_license_generation] =~ URI::MailTo::EMAIL_REGEXP) == 0
-      end
-
-      def is_company_name_valid?(input)
-        (input[:gather_user_company_for_license_generation] =~ /\A[a-zA-Z0-9][a-zA-Z0-9\W_]{2,15}\z/) == 0
-      end
-
-      def is_phone_no_valid?(input)
-        # No validation
-        # Optional field
-        true
-      end
-
-      def generate_trial_license(input)
-        generate_license(input, :trial)
-      end
-
-      def generate_free_license(input)
-        generate_license(input, :free)
+      def is_run_allowed_on_license_exhausted?(input)
+        input[:license_type].downcase == "commercial"
       end
 
       def fetch_license_id(input)
         license_id
       end
 
-      def fetch_license_failure_error_msg(input)
-        error_msg
-      end
-
-      def fetch_license_failure_rejection_msg(input)
-        rejection_msg
-      end
-
-      def select_license_generation_based_on_type(inputs)
-        if inputs.key? :free_license_selection
-          inputs[:license_type] = :free
-          "free"
-        elsif inputs.key? :trial_license_selection
-          inputs[:license_type] = :trial
-          "trial"
-        else
-          inputs[:license_type] = :commercial
-          "commercial"
-        end
-      end
-
-      def license_generation_rejected?(inputs)
-        !!rejection_msg
+      def is_commercial_license?(input)
+        input[:is_commercial]
       end
 
       def fetch_invalid_license_msg(input)
@@ -138,20 +97,6 @@ module ChefLicensing
         ChefLicensing::ListLicenseKeys.display_overview({ license_keys: [license_id] })
       end
 
-      def clear_license_type_selection(inputs)
-        inputs.delete(:free_license_selection)
-        inputs.delete(:trial_license_selection)
-        inputs.delete(:commercial_license_selection)
-      end
-
-      def are_user_details_present?(inputs)
-        inputs.key?(:gather_user_first_name_for_license_generation) &&
-          inputs.key?(:gather_user_last_name_for_license_generation) &&
-          inputs.key?(:gather_user_email_for_license_generation) &&
-          inputs.key?(:gather_user_company_for_license_generation) &&
-          inputs.key?(:gather_user_phone_no_for_license_generation)
-      end
-
       def set_license_info(input)
         self.license_id = input[:license_id]
         self.license_type = input[:license_type]
@@ -191,28 +136,6 @@ module ChefLicensing
 
       attr_accessor :opts
 
-      def generate_license(inputs, license_type)
-        spinner = TTY::Spinner.new(":spinner [Running] License generation in progress...", format: :dots, clear: true, output: output)
-        spinner.auto_spin # Start the spinner
-        self.license_id = ChefLicensing::LicenseKeyGenerator.send("generate_#{license_type}_license!",
-          first_name: inputs[:gather_user_first_name_for_license_generation],
-          last_name: inputs[:gather_user_last_name_for_license_generation],
-          email_id: inputs[:gather_user_email_for_license_generation],
-          product: ChefLicensing::Config.chef_product_name&.capitalize,
-          company: inputs[:gather_user_company_for_license_generation],
-          phone: inputs[:gather_user_phone_no_for_license_generation])
-        spinner.success # Stop the spinner
-        true
-      rescue ChefLicensing::LicenseGenerationFailed => e
-        spinner.error # Stop the spinner
-        self.error_msg = e.message
-        false
-      rescue ChefLicensing::LicenseGenerationRejected => e
-        spinner.error # Stop the spinner
-        self.rejection_msg = e.message
-        false
-      end
-
       def get_license(license_key)
         spinner = TTY::Spinner.new(":spinner [Running] License validation in progress...", format: :dots, clear: true, output: output)
         spinner.auto_spin # Start the spinner

data/lib/chef-licensing/version.rb

@@ -1,3 +1,3 @@
 module ChefLicensing
-  VERSION = "0.4.44".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/chef-licensing.rb

@@ -8,6 +8,7 @@ require "chef-licensing/exceptions/software_not_entitled"
 require "chef-licensing/exceptions/client_error"
 require "chef-licensing/api/client"
 require "chef-licensing/license_key_fetcher/prompt"
+require "chef-licensing/context"
 
 module ChefLicensing
   class << self
@@ -66,5 +67,9 @@ module ChefLicensing
     def add_license
       ChefLicensing::LicenseKeyFetcher.add_license
     end
+
+    def license_context
+      ChefLicensing::Context.license
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-licensing
 version: !ruby/object:Gem::Version
-  version: 0.4.44
+  version: 1.0.0
 platform: ruby
 authors:
 - Inspec Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -79,9 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.4.2
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,9 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.4.2
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - chef-licensing.gemspec
 - lib/chef-licensing.rb
 - lib/chef-licensing/api/client.rb
@@ -134,25 +133,29 @@ files:
 - lib/chef-licensing/exceptions/describe_error.rb
 - lib/chef-licensing/exceptions/error.rb
 - lib/chef-licensing/exceptions/feature_not_entitled.rb
+- lib/chef-licensing/exceptions/invalid_file_format_version.rb
 - lib/chef-licensing/exceptions/invalid_license.rb
-- lib/chef-licensing/exceptions/license_generation_failed.rb
-- lib/chef-licensing/exceptions/license_generation_rejected.rb
+- lib/chef-licensing/exceptions/license_file_corrupted.rb
 - lib/chef-licensing/exceptions/list_licenses_error.rb
 - lib/chef-licensing/exceptions/missing_api_credentials_error.rb
 - lib/chef-licensing/exceptions/restful_client_connection_error.rb
 - lib/chef-licensing/exceptions/restful_client_error.rb
 - lib/chef-licensing/exceptions/software_not_entitled.rb
+- lib/chef-licensing/exceptions/unsupported_content_type.rb
 - lib/chef-licensing/license.rb
 - lib/chef-licensing/license_key_fetcher.rb
 - lib/chef-licensing/license_key_fetcher/base.rb
 - lib/chef-licensing/license_key_fetcher/chef_licensing_interactions.yaml
 - lib/chef-licensing/license_key_fetcher/file.rb
+- lib/chef-licensing/license_key_fetcher/license_file/base.rb
+- lib/chef-licensing/license_key_fetcher/license_file/v3.rb
+- lib/chef-licensing/license_key_fetcher/license_file/v4.rb
 - lib/chef-licensing/license_key_fetcher/prompt.rb
-- lib/chef-licensing/license_key_generator.rb
 - lib/chef-licensing/license_key_validator.rb
 - lib/chef-licensing/licensing_service/local.rb
 - lib/chef-licensing/list_license_keys.rb
 - lib/chef-licensing/restful_client/base.rb
+- lib/chef-licensing/restful_client/middleware/content_type_validator.rb
 - lib/chef-licensing/restful_client/middleware/exceptions_handler.rb
 - lib/chef-licensing/restful_client/v1.rb
 - lib/chef-licensing/tui_engine.rb
@@ -165,7 +168,7 @@ files:
 - lib/chef-licensing/version.rb
 homepage: https://github.com/chef/chef-licensing
 licenses:
-- LicenseRef-LICENSE
+- Apache-2.0
 metadata:
   homepage_uri: https://github.com/chef/chef-licensing
   source_code_uri: https://github.com/chef/chef-licensing
@@ -177,14 +180,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Chef License storage, generation, and entitlement

data/LICENSE

@@ -1 +0,0 @@
-Proprietary code. All rights reserved.

data/lib/chef-licensing/exceptions/license_generation_failed.rb

@@ -1,9 +0,0 @@
-require_relative "error"
-
-module ChefLicensing
-  class LicenseGenerationFailed < Error
-    def message
-      super || "License Generation Failed"
-    end
-  end
-end

data/lib/chef-licensing/exceptions/license_generation_rejected.rb

@@ -1,7 +0,0 @@
-module ChefLicensing
-  class LicenseGenerationRejected < Error
-    def message
-      super || "License Generation Rejected"
-    end
-  end
-end

data/lib/chef-licensing/license_key_generator.rb

@@ -1,47 +0,0 @@
-require_relative "restful_client/v1"
-require_relative "exceptions/license_generation_failed"
-
-module ChefLicensing
-  class LicenseKeyGenerator
-    attr_reader :payload
-
-    class << self
-      # @param [Hash] KWARGS keys accepted are [first_name, last_name, email_id, product, company, phone]
-      def generate_trial_license!(kwargs)
-        new(kwargs).generate_trial_license!
-      end
-
-      def generate_free_license!(kwargs)
-        new(kwargs).generate_free_license!
-      end
-    end
-
-    def initialize(kwargs, restful_client: ChefLicensing::RestfulClient::V1)
-      # TODO: validate kwargs
-      @payload = build_payload_from(kwargs)
-      @restful_client = restful_client.new
-    end
-
-    def generate_trial_license!
-      response = @restful_client.generate_trial_license(payload)
-      # need some logic around delivery
-      # how the delivery is decided?
-      response.licenseId
-    rescue RestfulClientError => e
-      raise ChefLicensing::LicenseGenerationFailed, e.message
-    end
-
-    def generate_free_license!
-      response = @restful_client.generate_free_license(payload)
-      response.licenseId
-    rescue RestfulClientError => e
-      raise ChefLicensing::LicenseGenerationFailed, e.message
-    end
-
-    private
-
-    def build_payload_from(kwargs)
-      kwargs.slice(:first_name, :last_name, :email_id, :product, :company, :phone)
-    end
-  end
-end