WIP: Harden `usage_activity_by_stage.user_container_scanning_jobs`
What does this MR do?
period ={ created_at: 28.days.ago..Time.current }
Gitlab::UsageData.usage_activity_by_stage_secure(period)
With time period
SELECT MIN("users"."id") FROM "users" WHERE ("users"."state" IN ('active')) AND ("users"."user_type" IS NULL OR "users"."user_type" IN (NULL, 6, 4)) AND "users"."group_view" = 2 AND "users"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907'
SELECT MAX("users"."id") FROM "users" WHERE ("users"."state" IN ('active')) AND ("users"."user_type" IS NULL OR "users"."user_type" IN (NULL, 6, 4)) AND "users"."group_view" = 2 AND "users"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907'
SELECT COUNT("users"."id") FROM "users" WHERE ("users"."state" IN ('active')) AND ("users"."user_type" IS NULL OR "users"."user_type" IN (NULL, 6, 4)) AND "users"."group_view" = 2 AND "users"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "users"."id" BETWEEN 0 AND 99999
SELECT MIN("users"."id") FROM "users"
SELECT MAX("users"."id") FROM "users"
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'container_scanning' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'dast' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'dependency_scanning' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'license_management' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'license_scanning' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'sast' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
SELECT COUNT(DISTINCT "ci_builds"."user_id") FROM "ci_builds" WHERE "ci_builds"."type" = 'Ci::Build' AND "ci_builds"."name" = 'secret_detection' AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804' AND '2020-06-23 05:25:26.510907' AND "ci_builds"."user_id" BETWEEN 1 AND 10000
Query that needs optimization
SELECT
COUNT(DISTINCT "ci_builds"."user_id")
FROM
"ci_builds"
WHERE
"ci_builds"."type" = 'Ci::Build'
AND "ci_builds"."name" = 'container_scanning'
AND "ci_builds"."created_at" BETWEEN '2020-05-26 05:25:26.510804'
AND '2020-06-23 05:25:26.510907'
AND "ci_builds"."user_id" BETWEEN 1 AND 10000
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Closes #223711 (closed)
Edited by Alina Mihaila