Merge branch '216527-fix-time-usage-lib' into 'master'

Time.now => Time.current usage in /lib [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!36908

.rubocop.yml

@@ -470,8 +470,10 @@ Rails/TimeZone:
   Include:
     - 'app/controllers/**/*'
     - 'app/services/**/*'
+    - 'lib/**/*'
     - 'spec/controllers/**/*'
     - 'spec/services/**/*'
+    - 'spec/lib/**/*'
     - 'ee/app/controllers/**/*'
     - 'ee/app/services/**/*'
     - 'ee/spec/controllers/**/*'
@@ -484,7 +486,8 @@ Rails/TimeZone:
     - 'spec/workers/**/*'
     - 'ee/app/workers/**/*'
     - 'ee/spec/workers/**/*'
-
+    - 'ee/lib/**/*'
+    - 'ee/spec/lib/**/*'
 
 # WIP: See https://gitlab.com/gitlab-org/gitlab/-/issues/220040
 Rails/SaveBang:

.rubocop_todo.yml

 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-05-20 16:32:14 -0400 using RuboCop version 0.82.0.
+# `rubocop --auto-gen-config --exclude-limit 10000`
+# on 2020-08-17 21:05:54 +1200 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -448,6 +448,166 @@ Rails/RakeEnvironment:
 Rails/SkipsModelValidations:
   Enabled: false
 
+# Offense count: 308
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Enabled: true
+  Exclude:
+    - 'lib/gitlab/popen.rb'
+    - 'ee/lib/delay.rb'
+    - 'ee/lib/gitlab/elastic/helper.rb'
+    - 'ee/lib/gitlab/elastic/indexer.rb'
+    - 'ee/lib/gitlab/geo/base_request.rb'
+    - 'ee/lib/gitlab/geo/event_gap_tracking.rb'
+    - 'ee/lib/gitlab/geo/log_cursor/events/design_repository_updated_event.rb'
+    - 'ee/lib/gitlab/geo/log_cursor/events/repository_updated_event.rb'
+    - 'ee/lib/gitlab/geo/log_cursor/logger.rb'
+    - 'ee/lib/gitlab/geo/oauth/login_state.rb'
+    - 'ee/lib/gitlab/prometheus/queries/cluster_query.rb'
+    - 'ee/lib/gitlab/prometheus/queries/packet_flow_query.rb'
+    - 'ee/spec/lib/ee/gitlab/checks/push_rules/commit_check_spec.rb'
+    - 'ee/spec/lib/ee/gitlab/ci/pipeline/quota/job_activity_spec.rb'
+    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb'
+    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/group/stage_summary_spec.rb'
+    - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/group/stage_time_summary_spec.rb'
+    - 'ee/spec/lib/gitlab/auth/ldap/access_spec.rb'
+    - 'ee/spec/lib/gitlab/auth/smartcard/san_extension_spec.rb'
+    - 'ee/spec/lib/gitlab/auth/smartcard/session_spec.rb'
+    - 'ee/spec/lib/gitlab/background_migration/fix_orphan_promoted_issues_spec.rb'
+    - 'ee/spec/lib/gitlab/ci/pipeline/chain/limit/job_activity_spec.rb'
+    - 'ee/spec/lib/gitlab/elastic/client_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/base_request_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/cache_invalidation_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/container_repository_updated_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/design_repository_updated_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/hashed_storage_attachments_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/hashed_storage_migrated_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/job_artifact_deleted_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/lfs_object_deleted_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repositories_changed_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_created_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_deleted_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_renamed_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_updated_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/reset_checksum_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/events/upload_deleted_event_spec.rb'
+    - 'ee/spec/lib/gitlab/geo/log_cursor/logger_spec.rb'
+    - 'ee/spec/lib/gitlab/git_access_spec.rb'
+    - 'ee/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb'
+    - 'ee/spec/lib/gitlab/prometheus/queries/cluster_query_spec.rb'
+    - 'ee/spec/lib/gitlab/prometheus/queries/packet_flow_query_spec.rb'
+    - 'lib/api/helpers.rb'
+    - 'lib/api/sidekiq_metrics.rb'
+    - 'lib/backup/manager.rb'
+    - 'lib/bitbucket_server/representation/base.rb'
+    - 'lib/gitlab/auth/current_user_mode.rb'
+    - 'lib/gitlab/auth/ldap/access.rb'
+    - 'lib/gitlab/chaos.rb'
+    - 'lib/gitlab/checks/timed_logger.rb'
+    - 'lib/gitlab/ci/ansi2json/line.rb'
+    - 'lib/gitlab/ci/pipeline/chain/sequence.rb'
+    - 'lib/gitlab/ci/pipeline/duration.rb'
+    - 'lib/gitlab/cycle_analytics/summary/deployment_frequency.rb'
+    - 'lib/gitlab/database.rb'
+    - 'lib/gitlab/external_authorization/access.rb'
+    - 'lib/gitlab/external_authorization/cache.rb'
+    - 'lib/gitlab/gitaly_client.rb'
+    - 'lib/gitlab/gitaly_client/ref_service.rb'
+    - 'lib/gitlab/github_import/representation.rb'
+    - 'lib/gitlab/grape_logging/loggers/queue_duration_logger.rb'
+    - 'lib/gitlab/health_checks/base_abstract_check.rb'
+    - 'lib/gitlab/import_export.rb'
+    - 'lib/gitlab/instrumentation/elasticsearch_transport.rb'
+    - 'lib/gitlab/instrumentation/redis_interceptor.rb'
+    - 'lib/gitlab/instrumentation_helper.rb'
+    - 'lib/gitlab/kubernetes/helm/certificate.rb'
+    - 'lib/gitlab/lfs_token.rb'
+    - 'lib/gitlab/loop_helpers.rb'
+    - 'lib/gitlab/phabricator_import/representation/task.rb'
+    - 'lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb'
+    - 'lib/gitlab/prometheus/queries/matched_metric_query.rb'
+    - 'lib/gitlab/prometheus_client.rb'
+    - 'lib/gitlab/sherlock/transaction.rb'
+    - 'lib/gitlab/task_helpers.rb'
+    - 'lib/gitlab/x509/tag.rb'
+    - 'lib/grafana/time_window.rb'
+    - 'lib/json_web_token/token.rb'
+    - 'lib/object_storage/direct_upload.rb'
+    - 'lib/quality/seeders/issues.rb'
+    - 'lib/rspec_flaky/flaky_example.rb'
+    - 'lib/rspec_flaky/report.rb'
+    - 'lib/tasks/gitlab/assets.rake'
+    - 'lib/tasks/gitlab/backup.rake'
+    - 'lib/tasks/gitlab/cleanup.rake'
+    - 'lib/tasks/gitlab/list_repos.rake'
+    - 'spec/lib/api/helpers_spec.rb'
+    - 'spec/lib/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb'
+    - 'spec/lib/gitlab/app_json_logger_spec.rb'
+    - 'spec/lib/gitlab/app_text_logger_spec.rb'
+    - 'spec/lib/gitlab/auth/current_user_mode_spec.rb'
+    - 'spec/lib/gitlab/background_migration/recalculate_project_authorizations_spec.rb'
+    - 'spec/lib/gitlab/background_migration/wrongfully_confirmed_email_unconfirmer_spec.rb'
+    - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb'
+    - 'spec/lib/gitlab/bitbucket_server_import/importer_spec.rb'
+    - 'spec/lib/gitlab/checks/timed_logger_spec.rb'
+    - 'spec/lib/gitlab/ci/cron_parser_spec.rb'
+    - 'spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb'
+    - 'spec/lib/gitlab/cycle_analytics/usage_data_spec.rb'
+    - 'spec/lib/gitlab/data_builder/note_spec.rb'
+    - 'spec/lib/gitlab/database/background_migration_job_spec.rb'
+    - 'spec/lib/gitlab/database_spec.rb'
+    - 'spec/lib/gitlab/discussions_diff/file_collection_spec.rb'
+    - 'spec/lib/gitlab/external_authorization/access_spec.rb'
+    - 'spec/lib/gitlab/external_authorization/cache_spec.rb'
+    - 'spec/lib/gitlab/external_authorization/logger_spec.rb'
+    - 'spec/lib/gitlab/fogbugz_import/importer_spec.rb'
+    - 'spec/lib/gitlab/git/branch_spec.rb'
+    - 'spec/lib/gitlab/git/commit_spec.rb'
+    - 'spec/lib/gitlab/git/repository_spec.rb'
+    - 'spec/lib/gitlab/git_access_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/issue_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/issues_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/milestones_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/note_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/importer/releases_importer_spec.rb'
+    - 'spec/lib/gitlab/github_import/representation/diff_note_spec.rb'
+    - 'spec/lib/gitlab/github_import/representation/issue_spec.rb'
+    - 'spec/lib/gitlab/github_import/representation/note_spec.rb'
+    - 'spec/lib/gitlab/github_import/representation/pull_request_spec.rb'
+    - 'spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb'
+    - 'spec/lib/gitlab/grape_logging/loggers/cloudflare_logger_spec.rb'
+    - 'spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb'
+    - 'spec/lib/gitlab/graphql_logger_spec.rb'
+    - 'spec/lib/gitlab/graphs/commits_spec.rb'
+    - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb'
+    - 'spec/lib/gitlab/instrumentation_helper_spec.rb'
+    - 'spec/lib/gitlab/json_logger_spec.rb'
+    - 'spec/lib/gitlab/lfs_token_spec.rb'
+    - 'spec/lib/gitlab/log_timestamp_formatter_spec.rb'
+    - 'spec/lib/gitlab/middleware/rails_queue_duration_spec.rb'
+    - 'spec/lib/gitlab/omniauth_logging/json_formatter_spec.rb'
+    - 'spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb'
+    - 'spec/lib/gitlab/phabricator_import/representation/task_spec.rb'
+    - 'spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb'
+    - 'spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb'
+    - 'spec/lib/gitlab/prometheus/queries/validate_query_spec.rb'
+    - 'spec/lib/gitlab/sherlock/transaction_spec.rb'
+    - 'spec/lib/gitlab/sidekiq_logging/json_formatter_spec.rb'
+    - 'spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executing_spec.rb'
+    - 'spec/lib/gitlab/updated_notes_paginator_spec.rb'
+    - 'spec/lib/gitlab/utils/json_size_estimator_spec.rb'
+    - 'spec/lib/gitlab/x509/signature_spec.rb'
+    - 'spec/lib/grafana/time_window_spec.rb'
+    - 'spec/lib/json_web_token/hmac_token_spec.rb'
+    - 'spec/lib/rspec_flaky/flaky_example_spec.rb'
+    - 'spec/lib/rspec_flaky/listener_spec.rb'
+    - 'spec/lib/rspec_flaky/report_spec.rb'
+
 # Offense count: 8
 # Cop supports --auto-correct.
 Security/YAMLLoad:

ee/lib/gitlab/analytics/cycle_analytics/request_params.rb

@@ -48,7 +48,7 @@ module Gitlab
         def initialize(params = {})
           super(params)
 
-          self.created_before = (self.created_before || Time.now).at_end_of_day
+          self.created_before = (self.created_before || Time.current).at_end_of_day
           self.created_after  = (created_after || default_created_after).at_beginning_of_day
         end
 

ee/lib/gitlab/analytics/cycle_analytics/summary/group/deployment_frequency.rb

@@ -21,7 +21,7 @@ module Gitlab
 
             def value
               @value ||=
-                frequency(@deployments, options[:from], options[:to] || Time.now)
+                frequency(@deployments, options[:from], options[:to] || Time.current)
             end
 
             def unit

lib/api/users.rb

@@ -218,7 +218,7 @@ module API
 
         user_params = declared_params(include_missing: false)
 
-        user_params[:password_expires_at] = Time.now if user_params[:password].present?
+        user_params[:password_expires_at] = Time.current if user_params[:password].present?
         result = ::Users::UpdateService.new(current_user, user_params.merge(user: user)).execute
 
         if result[:status] == :success

lib/gitlab/incident_management/pager_duty/incident_issue_description.rb

@@ -32,7 +32,7 @@ module Gitlab
         end
 
         def incident_created_at
-          Time.parse(incident_payload['created_at'])
+          Time.zone.parse(incident_payload['created_at'])
         rescue
           Time.current.utc # PagerDuty provides time in UTC
         end

lib/gitlab/usage_data.rb

@@ -58,7 +58,7 @@ module Gitlab
       end
 
       def recorded_at
-        Time.now
+        Time.current
       end
 
       # rubocop: disable Metrics/AbcSize

lib/gitlab/utils/usage_data.rb

@@ -93,7 +93,7 @@ module Gitlab
       end
 
       def with_finished_at(key, &block)
-        yield.merge(key => Time.now)
+        yield.merge(key => Time.current)
       end
 
       private

spec/lib/gitlab/alerting/alert_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe Gitlab::Alerting::Alert do
     end
 
     context 'with payload' do
-      let(:time) { Time.now.change(usec: 0) }
+      let(:time) { Time.current.change(usec: 0) }
 
       before do
         payload['startsAt'] = time.rfc3339
@@ -274,7 +274,7 @@ RSpec.describe Gitlab::Alerting::Alert do
     before do
       payload.update(
         'annotations' => { 'title' => 'some title' },
-        'startsAt' => Time.now.rfc3339
+        'startsAt' => Time.current.rfc3339
       )
     end
 

spec/lib/gitlab/utils/usage_data_spec.rb

@@ -122,7 +122,7 @@ RSpec.describe Gitlab::Utils::UsageData do
       freeze_time do
         result = described_class.with_finished_at(:current_time) { { a: 1 } }
 
-        expect(result).to eq(a: 1, current_time: Time.now)
+        expect(result).to eq(a: 1, current_time: Time.current)
       end
     end
   end