gitlab_support_readiness 1.0.95 → 1.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7535177c20ccf51d51d851d1de39ac41637dd84909df860ec3a9fc526ee55e00
-  data.tar.gz: f9a495ad819800df0f3d38216d8643f7d0f14d987f204e9b69dca531c39a0d8b
+  metadata.gz: 2a1ef97a0e31a1b469b1e012d856d5915d9b96c6ee85984b851854eb219fadf1
+  data.tar.gz: 5be4b830b795774ed4640a19afb8093ac29dd0636d4ea124309e9525762bb8a2
 SHA512:
-  metadata.gz: fccf094da0fa1e9e834243ff3dc1b3fc412f89b481210709328719e30e15ad7e88bdff0e7dea4f6e1cf5e80c4d1904d08c947c4d9c181eef178a769ee8ba06e8
-  data.tar.gz: 2ae62ba826f27b9cc9b2b529b1574df63c465ab219a53cfbef6a33972ac2245767a0f88657ff01ae47c972eba718ede743ff986d775777e80ca2158ee8b8fc84
+  metadata.gz: 78b62c7a8e266710bc424266234075691e376b120dccc10dbea12617c676c8b7d4eb788b5edfa9d19a517b892fd4ecdae2a623a3a065931474fd11977c956b11
+  data.tar.gz: dd20a3f36025cf1ed488a497ab97f2560b604f0512861798c79a854a59efa0a1189681c9d20546eba244084a072aa3a04a114a16d8e62e54532adaa017822a24

data/lib/support_readiness/repos/zendesk_salesforce_sync.rb

@@ -752,6 +752,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => org.organization_fields['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => org.organization_fields['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => org.organization_fields['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => org.organization_fields['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => org.organization_fields['sub_consumption_eap'],
           'sub_consumption_storage' => org.organization_fields['sub_consumption_storage'],
           'sub_proserv' => org.organization_fields['sub_proserv'],
@@ -806,6 +807,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => org.organization_fields['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => org.organization_fields['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => org.organization_fields['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => org.organization_fields['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => org.organization_fields['sub_consumption_eap'],
           'sub_consumption_storage' => org.organization_fields['sub_consumption_storage'],
           'sub_proserv' => org.organization_fields['sub_proserv'],
@@ -1001,6 +1003,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => account['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => account['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => account['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => account['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => account['sub_consumption_eap'],
           'sub_consumption_storage' => account['sub_consumption_storage'],
           'sub_dotcom_premium' => account['sub_dotcom_premium'],
@@ -1053,6 +1056,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => account['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => account['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => account['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => account['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => account['sub_consumption_eap'],
           'sub_consumption_storage' => account['sub_consumption_storage'],
           'sub_dotcom_premium' => account['sub_dotcom_premium'],

data/lib/support_readiness/salesforce/accounts.rb

@@ -149,6 +149,7 @@ module Readiness
           "sub_consumption_cicd_minutes" => subscriptions.include?('sub_consumption_cicd_minutes'),
           "sub_consumption_duo_enterprise" => subscriptions.include?('sub_consumption_duo_enterprise'),
           "sub_consumption_duo_premium" => subscriptions.include?('sub_consumption_duo_premium'),
+          "sub_consumption_duo_amazon_q" => subscriptions.include?('sub_consumption_duo_amazon_q'),
           "sub_consumption_eap" => subscriptions.include?('sub_consumption_eap'),
           "sub_consumption_storage" => subscriptions.include?('sub_consumption_storage'),
           "sub_proserv" => subscriptions.include?('sub_proserv'),
@@ -205,6 +206,7 @@ module Readiness
           "sub_consumption_cicd_minutes" => subscriptions.include?('sub_consumption_cicd_minutes'),
           "sub_consumption_duo_enterprise" => subscriptions.include?('sub_consumption_duo_enterprise'),
           "sub_consumption_duo_premium" => subscriptions.include?('sub_consumption_duo_premium'),
+          "sub_consumption_duo_amazon_q" => subscriptions.include?('sub_consumption_duo_amazon_q'),
           "sub_consumption_eap" => subscriptions.include?('sub_consumption_eap'),
           "sub_consumption_storage" => subscriptions.include?('sub_consumption_storage'),
           "sub_proserv" => subscriptions.include?('sub_proserv'),
@@ -244,6 +246,7 @@ module Readiness
           sub_types.push('sub_consumption_cicd_minutes') if SubscriptionDefinitions.consumption_cicd_minutes.include? sub.Name
           sub_types.push('sub_consumption_duo_premium') if SubscriptionDefinitions.consumption_duo_premium.include? sub.Name
           sub_types.push('sub_consumption_duo_enterprise') if SubscriptionDefinitions.consumption_duo_enterprise.include? sub.Name
+          sub_types.push('sub_consumption_duo_amazon_q') if SubscriptionDefinitions.consumption_duo_amazon_q.include? sub.Name
           sub_types.push('sub_consumption_eap') if SubscriptionDefinitions.consumption_eap.include? sub.Name
           sub_types.push('sub_consumption_storage') if SubscriptionDefinitions.consumption_storage.include? sub.Name
           sub_types.push('sub_proserv') if SubscriptionDefinitions.proserv.include? sub.Name

data/lib/support_readiness/salesforce/subscription_definitions.rb

@@ -78,6 +78,25 @@ module Readiness
         ]
       end
 
+      ##
+      # Defines Consumption => GitLab Duo with Amazon Q subscriptions
+      #
+      # @author Jason Colyer
+      # @since 1.0.40
+      # @return [Array]
+      def self.consumption_duo_amazon_q
+        [
+          'Dedicated - GitLab Duo with Amazon Q - 1 Year',
+          'Dedicated - GitLab Duo with Amazon Q - 2 Year',
+          'Dedicated - GitLab Duo with Amazon Q - 3 Year',
+          'Dedicated - GitLab Duo with Amazon Q - Monthly',
+          'Self-Managed - GitLab Duo with Amazon Q - 1 Year',
+          'Self-Managed - GitLab Duo with Amazon Q - 2 Year',
+          'Self-Managed - GitLab Duo with Amazon Q - 3 Year',
+          'Self-Managed - GitLab Duo with Amazon Q - Monthly'
+        ]
+      end
+
       ##
       # Defines Consumption => CI/CD Minutes subscriptions
       #

data/lib/support_readiness/support_super_form_processor/disable_us_government.rb

@@ -0,0 +1,178 @@
+# frozen_string_literal: true
+
+# Defines the module Readiness.
+module Readiness
+  # Defines the module SupportSuperFormProcessor
+  module SupportSuperFormProcessor
+    ##
+    # Defines the class DisableUSGov within the module {Readiness::Zendesk}.
+    #
+    # @author Jason Colyer
+    # @since 1.0.97
+    class DisableUSGov < Readiness::Client
+      ##
+      # Process a Disable US Government request
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.process!(gitlab_client, gitlab_admin_client, zendesk_client, sfdc_client)
+        @gitlab_client = gitlab_client
+        @gitlab_admin_client = gitlab_admin_client
+        @zendesk_client = zendesk_client
+        @sfdc_client = sfdc_client
+        requester
+        zd_user
+        checks
+        unless errors.count.zero?
+          Readiness::SupportSuperFormProcessor::Shared.invalid_enable_usgov(requester, errors)
+        end
+        issue = Readiness::GitLab::Issues.new
+        issue.title = 'Remove US Government Support exception'
+        issue.description = message
+        create = Readiness::GitLab::Issues.create!(@gitlab_client, project, issue)
+        puts "Issue created: #{create.web_url}"
+        exit 0
+      end
+
+      ##
+      # Peform validity checks for this request
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.checks
+        errors.push("Invalid SFDC account given: #{account_id}") if account.nil?
+        return unless errors.count.zero?
+
+        errors.push("SFDC account #{account_id} does not have an exception to remove") if account.Support_Instance__c != 'federal-support'
+      end
+
+      ##
+      # Sets the global variable errors
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.errors
+        @errors ||= []
+      end
+
+      ##
+      # Sets the global variable requester
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.requester
+        @requester ||= Readiness::SupportSuperFormProcessor::Shared.gitlab_user_check(@gitlab_admin_client, requester_email)
+      end
+
+      ##
+      # Sets the global variable zd_user
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.zd_user
+        @zd_user ||= Readiness::SupportSuperFormProcessor::Shared.zendesk_user_check(@zendesk_client, requester_email)
+      end
+
+      ##
+      # Sets the global variable requester_email
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.requester_email
+        @requester_email ||= ENV.fetch('REQUESTER_EMAIL')
+      end
+
+      ##
+      # Sets the global variable account
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.account
+        @account ||= fetch_account
+      end
+
+      ##
+      # Run a SQOL query to get account information
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.fetch_account
+        query = Readiness::Salesforce::Queries.new(account_query)
+        results = Readiness::Salesforce::Queries.run!(@sfdc_client, query)
+        results.first
+      end
+
+      ##
+      # Sets the global variable account_id
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.account_id
+        @account_id ||= ENV.fetch('DISABLE_US_GOV_SUPPORT_SFDC_ACCOUNT')
+      end
+
+      ##
+      # Returns a String to get account information
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.account_query
+        <<~STRING
+          SELECT
+            Account_ID_18__c,
+            Name,
+            Ultimate_Parent_Sales_Segment_Employees__c,
+            Account_Owner_Calc__c,
+            Technical_Account_Manager_Name__c,
+            GS_Health_Score_Color__c,
+            Restricted_Account__c,
+            Solutions_Architect_Lookup__r.Name,
+            Support_Hold__c,
+            Support_Instance__c,
+            (
+              SELECT
+                Id,
+                Name,
+                Zuora__ProductName__c,
+                Zuora__EffectiveEndDate__c,
+                Zuora__Quantity__c,
+                Zuora__TotalContractValue__c,
+                Subscription_Status__c
+              FROM Zuora__R00N40000001lGjTEAU__r
+            )
+          FROM Account
+          WHERE
+            Id = '#{account_id}'
+        STRING
+      end
+
+      ##
+      # Return the string for the issue body
+      #
+      # @author Jason Colyer
+      # @since 1.0.97
+      def self.message
+        <<~STRING
+          ## Remove US Government Support exception for #{account.Account_ID_18__c}
+
+          A request has been filed to remove the US Government Support exception for a SFDC account. The details are as follows:
+
+          - Requester: @#{requester.username}
+          - SFDC Account: [#{account.Account_ID_18__c}](https://gitlab.lightning.force.com/lightning/r/Account/#{account.Account_ID_18__c}/view)
+
+          #### Readiness TODO list
+
+          - [ ] Review above information for accuracy
+          - [ ] Confirm the corresponding organization does not currently have an ongoing tickets
+          - [ ] Follow the process detailed in [this handbook page](https://handbook.gitlab.com/handbook/support/readiness/operations/docs/policies/us_gov_support_exceptions)
+
+          /assign @#{requester.username} @jcolyer @secole @lyle
+
+          /label ~"Readiness::Triage" "Readiness::Current Quarter"
+
+          cc @leeeee-gtlb
+        STRING
+      end
+    end
+  end
+end

data/lib/support_readiness/support_super_form_processor/enable_us_government.rb

@@ -27,8 +27,8 @@ module Readiness
           Readiness::SupportSuperFormProcessor::Shared.invalid_enable_usgov(requester, errors)
         end
         issue = Readiness::GitLab::Issues.new
-        issue.title = 'Enable US Government Support'
-        issue.description = message(file_path)
+        issue.title = 'Add US Government Support exception'
+        issue.description = message
         create = Readiness::GitLab::Issues.create!(@gitlab_client, project, issue)
         puts "Issue created: #{create.web_url}"
         exit 0
@@ -44,7 +44,7 @@ module Readiness
         errors.push("Invalid SFDC opportunity given: #{opportunity_id}") if opportunity.nil?
         return unless errors.count.zero?
 
-        errors.push("SFDC account #{account_id} is already entitled") if Readiness::Salesforce::Client.us_gover_enabled?(@sfdc_client, account_id)
+        errors.push("SFDC account #{account_id} already has the exception") if account.Support_Instance__c == 'federal-support'
         errors.push("Missing US Government SKU on #{account_id}") unless correct_sku?
       end
 
@@ -54,6 +54,8 @@ module Readiness
       # @author Jason Colyer
       # @since 1.0.42
       def self.correct_sku?
+        return false if account.Zuora__R00N40000001lGjTEAU__r.nil?
+
         account.Zuora__R00N40000001lGjTEAU__r.map { |r| r.Name }.each do |name|
           return true if Readiness::Salesforce::SubscriptionDefinitions.usgov_12x5.include? name
           return true if Readiness::Salesforce::SubscriptionDefinitions.usgov_24x7.include? name
@@ -172,6 +174,7 @@ module Readiness
             Restricted_Account__c,
             Solutions_Architect_Lookup__r.Name,
             Support_Hold__c,
+            Support_Instance__c,
             (
               SELECT
                 Id,
@@ -211,9 +214,9 @@ module Readiness
       # @since 1.0.42
       def self.message
         <<~STRING
-          ## Enable US Government Support for #{account.Account_ID_18__c}
+          ## Add US Government Support exception for #{account.Account_ID_18__c}
 
-          A request has been filed to enable US Government Support for a SFDC account. The details are as follows:
+          A request has been filed to add the US Government Support exception for a SFDC account. The details are as follows:
 
           - Requester: @#{requester.username}
           - SFDC Account: [#{account.Account_ID_18__c}](https://gitlab.lightning.force.com/lightning/r/Account/#{account.Account_ID_18__c}/view)
@@ -224,11 +227,13 @@ module Readiness
           #### Readiness TODO list
 
           - [ ] Review above information
-          - [ ] Follow the process detailed in [this handbook page](https://handbook.gitlab.com/handbook/support/readiness/operations/docs/policies/enable_us_gov_support)
+          - [ ] Follow the process detailed in [this handbook page](https://handbook.gitlab.com/handbook/support/readiness/operations/docs/policies/us_gov_support_exceptions)
 
           /assign @#{requester.username} @jcolyer @secole @lyle
 
-          cc @jscarborough @JamesRLopes
+          /label ~"Readiness::Triage" "Readiness::Current Quarter"
+
+          cc @jscarborough @leeeee-gtlb
         STRING
       end
     end

data/lib/support_readiness/support_super_form_processor/shared.rb

@@ -215,7 +215,7 @@ module Readiness
         email.subject = 'Invalid Support Super Form submission'
         email.text = invalid_enable_usgov_message(requester, errors)
         Readiness::Mailgun::Emails.send!(mailgun_client, email)
-        puts "Invalid enable us gov submission by #{requester.email}"
+        puts "Invalid enable/disable us gov submission by #{requester.email}"
         exit 0
       end
 
@@ -485,7 +485,7 @@ module Readiness
         <<~STRING
           Greetings @#{requester.username} ,
 
-          Your recent request to enable US Goverment support was not able to be filed due to the following issues:
+          Your recent request to enable/disable US Goverment support was not able to be filed due to the following issues:
 
           #{errors.map { |e| "- #{e}" }.join("\n")}
 

data/lib/support_readiness/support_super_form_processor.rb

@@ -12,6 +12,7 @@ module Readiness
     
     require "#{__dir__}/support_super_form_processor/create_article"
     require "#{__dir__}/support_super_form_processor/create_macro"
+    require "#{__dir__}/support_super_form_processor/disable_us_government"
     require "#{__dir__}/support_super_form_processor/edit_macro"
     require "#{__dir__}/support_super_form_processor/enable_us_government"
     require "#{__dir__}/support_super_form_processor/global_ir_dotcom_subscriptions_billing_entity_change"

data/lib/support_readiness/ticket_processor/organization_notes.rb

@@ -359,6 +359,7 @@ module Readiness
         addons.push('AI') if @organization.organization_fields['sub_consumption_ai']
         addons.push('GitLab Duo Premium') if @organization.organization_fields['sub_consumption_duo_premium']
         addons.push('GitLab Duo Enterprise') if @organization.organization_fields['sub_consumption_duo_enterprise']
+        addons.push('GitLab Duo with Amazon Q') if @organization.organization_fields['sub_consumption_duo_amazon_q']
         addons.push('AI addon') if @organization.organization_fields['sub_consumption_ai']
         addons.push('Success Advanced') if @organization.organization_fields['sub_ss_success_growth']
         addons.push('Success Signature') if @organization.organization_fields['sub_ss_success_enterprise']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.95
+  version: 1.0.97
 platform: ruby
 authors:
 - Jason Colyer
@@ -319,6 +319,7 @@ files:
 - lib/support_readiness/support_super_form_processor.rb
 - lib/support_readiness/support_super_form_processor/create_article.rb
 - lib/support_readiness/support_super_form_processor/create_macro.rb
+- lib/support_readiness/support_super_form_processor/disable_us_government.rb
 - lib/support_readiness/support_super_form_processor/edit_macro.rb
 - lib/support_readiness/support_super_form_processor/enable_us_government.rb
 - lib/support_readiness/support_super_form_processor/global_ir_dotcom_subscriptions_billing_entity_change.rb