gitlab-license 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517b48dd59c73e6c06a3141dbbff736b6ac5aec0db0575e81e8eaa9efca214c3
-  data.tar.gz: a3ae2f4b90f8ab04f042e420e81b268bd0250ff76234d29424fa22badd127ff9
+  metadata.gz: 1f9153bcc9df80fb7bcc879d15ae1e21709cec7a352ffd5c0c4de2ae082473d6
+  data.tar.gz: a36810ea464918c2f25bb40ebfe877b8561131bebfbf1e0d9530f1270f5f2816
 SHA512:
-  metadata.gz: 7c0b2e7c189d8abad15856eea602aefa67eb772a44609278a7600365389c706aa7b0594a51fed2ea7ade3307162ecbe053d5b17ca3bc7ed0054a104988e1d88d
-  data.tar.gz: 4dbaf5ea37ae26de84edd087269b10676879164abc0bee0578c3a6b6af88c832fe0aba70f22ee489de46eeeea2023b33c997ae999b51deeffbb0b05939662d04
+  metadata.gz: b37464c9ce48c030aebf3ca982bc2d4831367e0169e09c76d58e152124d6ed63202dd284e63b13c86f6eb7651cc0692db8685cc29a9bf44409167a45ce3cf722
+  data.tar.gz: 935474c12b21840724ae4ed064f6db461777751dae4d7454917b9ada0b93eb80138f4d678ba3b48efb6ed946da38aa11422adf5a4eadef024d3981102ec5b2cf

data/lib/gitlab/license/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   class License
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

data/lib/gitlab/license.rb

@@ -52,9 +52,9 @@ module Gitlab
     attr_reader :version
     attr_accessor :licensee, :starts_at, :expires_at, :notify_admins_at,
                   :notify_users_at, :block_changes_at, :last_synced_at, :next_sync_at,
-                  :activated_at, :restrictions, :cloud_licensing_enabled, :auto_renew_enabled,
-                  :seat_reconciliation_enabled, :operational_metrics_enabled,
-                  :generated_from_customers_dot
+                  :activated_at, :restrictions, :cloud_licensing_enabled,
+                  :offline_cloud_licensing_enabled, :auto_renew_enabled, :seat_reconciliation_enabled,
+                  :operational_metrics_enabled, :generated_from_customers_dot
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -84,6 +84,8 @@ module Gitlab
         false
       elsif restrictions && !restrictions.is_a?(Hash)
         false
+      elsif !cloud_licensing? && offline_cloud_licensing?
+        false
       else
         true
       end
@@ -137,6 +139,10 @@ module Gitlab
       cloud_licensing_enabled == true
     end
 
+    def offline_cloud_licensing?
+      offline_cloud_licensing_enabled == true
+    end
+
     def auto_renew?
       auto_renew_enabled == true
     end
@@ -181,6 +187,7 @@ module Gitlab
       hash['activated_at'] = activated_at if activated?
 
       hash['cloud_licensing_enabled'] = cloud_licensing?
+      hash['offline_cloud_licensing_enabled'] = offline_cloud_licensing?
       hash['auto_renew_enabled'] = auto_renew?
       hash['seat_reconciliation_enabled'] = seat_reconciliation?
       hash['operational_metrics_enabled'] = operational_metrics?
@@ -209,7 +216,7 @@ module Gitlab
     private
 
     def load_attributes(attributes)
-      attributes = Hash[attributes.map { |k, v| [k.to_s, v] }]
+      attributes = attributes.transform_keys(&:to_s)
 
       version = attributes['version'] || 1
       raise ArgumentError, 'Version is too new' unless version && version == 1
@@ -230,6 +237,7 @@ module Gitlab
 
       %w[
         cloud_licensing_enabled
+        offline_cloud_licensing_enabled
         auto_renew_enabled
         seat_reconciliation_enabled
         operational_metrics_enabled
@@ -240,7 +248,7 @@ module Gitlab
 
       restrictions = attributes['restrictions']
       if restrictions&.is_a?(Hash)
-        restrictions = Hash[restrictions.map { |k, v| [k.to_sym, v] }]
+        restrictions = restrictions.transform_keys(&:to_sym)
         @restrictions = restrictions
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler