gitlab-license 1.3.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc45d84ba41ec6f999cd4569cdf27b7acaf2476cf87c35e4121369633e1d3251
-  data.tar.gz: 5076ad7c092c002fbf727b8c16fefc41aeb836e1a150f82d311dd3e5b43cac25
+  metadata.gz: 1f9153bcc9df80fb7bcc879d15ae1e21709cec7a352ffd5c0c4de2ae082473d6
+  data.tar.gz: a36810ea464918c2f25bb40ebfe877b8561131bebfbf1e0d9530f1270f5f2816
 SHA512:
-  metadata.gz: ab4289143609c6f7d9a225d626b8a8c939e734b8eb39105a1994898b63854416ce2ab5b74ee1cc0dcbaee75c6eec28d5fe2a09a3f638ce08fa4b45b29b9af642
-  data.tar.gz: 9b1e46528d6d2309d40dfba3408fbff1e1edc93b5437ea7b354b08573eb0331a3dcb039b0bf996103a713e3e1470abfadf265c0435b2d33e567af07aa52fc71d
+  metadata.gz: b37464c9ce48c030aebf3ca982bc2d4831367e0169e09c76d58e152124d6ed63202dd284e63b13c86f6eb7651cc0692db8685cc29a9bf44409167a45ce3cf722
+  data.tar.gz: 935474c12b21840724ae4ed064f6db461777751dae4d7454917b9ada0b93eb80138f4d678ba3b48efb6ed946da38aa11422adf5a4eadef024d3981102ec5b2cf

data/lib/gitlab/license/version.rb

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

data/lib/gitlab/license.rb

@@ -51,8 +51,10 @@ module Gitlab
 
     attr_reader :version
     attr_accessor :licensee, :starts_at, :expires_at, :notify_admins_at,
-                  :notify_users_at, :block_changes_at, :type, :last_synced_at,
-                  :next_sync_at, :restrictions
+                  :notify_users_at, :block_changes_at, :last_synced_at, :next_sync_at,
+                  :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=
@@ -78,10 +80,12 @@ module Gitlab
         false
       elsif next_sync_at && !next_sync_at.is_a?(DateTime)
         false
-      elsif type && type != 'cloud'
+      elsif activated_at && !activated_at.is_a?(DateTime)
         false
       elsif restrictions && !restrictions.is_a?(Hash)
         false
+      elsif !cloud_licensing? && offline_cloud_licensing?
+        false
       else
         true
       end
@@ -111,6 +115,10 @@ module Gitlab
       next_sync_at
     end
 
+    def activated?
+      activated_at
+    end
+
     def expired?
       will_expire? && Date.today >= expires_at
     end
@@ -127,6 +135,30 @@ module Gitlab
       will_block_changes? && Date.today >= block_changes_at
     end
 
+    def cloud_licensing?
+      cloud_licensing_enabled == true
+    end
+
+    def offline_cloud_licensing?
+      offline_cloud_licensing_enabled == true
+    end
+
+    def auto_renew?
+      auto_renew_enabled == true
+    end
+
+    def seat_reconciliation?
+      seat_reconciliation_enabled == true
+    end
+
+    def operational_metrics?
+      operational_metrics_enabled == true
+    end
+
+    def generated_from_customers_dot?
+      generated_from_customers_dot == true
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -152,7 +184,15 @@ module Gitlab
 
       hash['next_sync_at'] = next_sync_at if will_sync?
       hash['last_synced_at'] = last_synced_at if will_sync?
-      hash['type'] = type
+      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?
+
+      hash['generated_from_customers_dot'] = generated_from_customers_dot?
 
       hash['restrictions'] = restrictions if restricted?
 
@@ -176,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
@@ -184,7 +224,6 @@ module Gitlab
       @version = version
 
       @licensee = attributes['licensee']
-      @type = attributes['type']
 
       # `issued_at` is the legacy name for starts_at.
       # TODO: Move to starts_at in a next version.
@@ -192,13 +231,24 @@ module Gitlab
         set_date_attribute(attr_name, attributes[attr_name])
       end
 
-      %w[last_synced_at next_sync_at].each do |attr_name|
+      %w[last_synced_at next_sync_at activated_at].each do |attr_name|
         set_datetime_attribute(attr_name, attributes[attr_name])
       end
 
+      %w[
+        cloud_licensing_enabled
+        offline_cloud_licensing_enabled
+        auto_renew_enabled
+        seat_reconciliation_enabled
+        operational_metrics_enabled
+        generated_from_customers_dot
+      ].each do |attr_name|
+        public_send("#{attr_name}=", attributes[attr_name] == true)
+      end
+
       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
@@ -208,7 +258,7 @@ module Gitlab
 
       return unless value
 
-      send("#{attr_name}=", value)
+      public_send("#{attr_name}=", value)
     end
 
     def set_datetime_attribute(attr_name, value)

metadata

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