gitlab-license 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f525ce304f2d85f5f03f545039dccf52dea44383c11d714f1ca3c0ed78e30905
-  data.tar.gz: 7f34872e6678f0c3d9970cae4077122f96864bf9f1bec0219bae35709e538082
+  metadata.gz: 8e2099828f195390b3feec3baff3129202e17b50d2ef98e9db12a5627e149f9c
+  data.tar.gz: 50d9e48ca255e0b4cf1e6155fc8eeffaaa25c8b1682c8c04f9910135bb16fa68
 SHA512:
-  metadata.gz: ca9c47b79cfb8d3b6bbb780e565eccaf3005bb0b6f44c03fc9d5836bc18ae57a4a694958a8e7e74a71d83d7ec2c83384283aa6ba34f859b6df34142fafb4318f
-  data.tar.gz: 1c4ed9a4bb95a8094d11f3caec70aa94fae5651931546a3ef984500e8da7dd22f6c711b8ffe646f00f93283a557317ee3f415f44fe7c0fb660dffb0e16acc9d8
+  metadata.gz: 27d52f399c1640c873c34158daf4fc07a60c63df0bc1937e7559ffab7b1ebd3e2f590c98c47bde5e5855dc736d2b51efa35c1a4172a5dcde58fc7f50c8681b00
+  data.tar.gz: c583ecccdbb22b0849e2101e4ddba8974ba078bf4f7ecda243d2ef529f5903ddce0e3a6c78376f77bf1b2933a6e5894b0da82bee5a05dcd00cad84f7cfb36304

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, :activated_at, :restrictions
+                  :notify_users_at, :block_changes_at, :last_synced_at, :next_sync_at,
+                  :activated_at, :restrictions, :cloud_licensing_enabled, :auto_renew_enabled,
+                  :seat_reconciliation_enabled, :usage_ping_required_metrics_enabled,
+                  :generated_from_customers_dot
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -80,8 +82,6 @@ module Gitlab
         false
       elsif activated_at && !activated_at.is_a?(DateTime)
         false
-      elsif type && type != 'cloud'
-        false
       elsif restrictions && !restrictions.is_a?(Hash)
         false
       else
@@ -133,6 +133,26 @@ module Gitlab
       will_block_changes? && Date.today >= block_changes_at
     end
 
+    def cloud_licensing?
+      cloud_licensing_enabled == true
+    end
+
+    def auto_renew?
+      auto_renew_enabled == true
+    end
+
+    def seat_reconciliation?
+      seat_reconciliation_enabled == true
+    end
+
+    def usage_ping_required_metrics?
+      usage_ping_required_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)
@@ -159,7 +179,13 @@ module Gitlab
       hash['next_sync_at'] = next_sync_at if will_sync?
       hash['last_synced_at'] = last_synced_at if will_sync?
       hash['activated_at'] = activated_at if activated?
-      hash['type'] = type
+
+      hash['cloud_licensing_enabled'] = cloud_licensing?
+      hash['auto_renew_enabled'] = auto_renew?
+      hash['seat_reconciliation_enabled'] = seat_reconciliation?
+      hash['usage_ping_required_metrics_enabled'] = usage_ping_required_metrics?
+
+      hash['generated_from_customers_dot'] = generated_from_customers_dot?
 
       hash['restrictions'] = restrictions if restricted?
 
@@ -191,7 +217,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.
@@ -203,6 +228,16 @@ module Gitlab
         set_datetime_attribute(attr_name, attributes[attr_name])
       end
 
+      %w[
+        cloud_licensing_enabled
+        auto_renew_enabled
+        seat_reconciliation_enabled
+        usage_ping_required_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] }]
@@ -215,7 +250,7 @@ module Gitlab
 
       return unless value
 
-      send("#{attr_name}=", value)
+      public_send("#{attr_name}=", value)
     end
 
     def set_datetime_attribute(attr_name, value)

data/lib/gitlab/license/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler