Merge branch '220398-default-sizes-for-sca' into 'master'

Update size limits for SCA artifacts

See merge request gitlab-org/gitlab!37975

changelogs/unreleased/220398-default-sizes-for-sca.yml

+---
+title: Update size limits for SCA artifacts
+merge_request: 37975
+author:
+type: changed

db/migrate/20200727142337_update_defaults_for_sca_artifacts.rb

+# frozen_string_literal: true
+
+class UpdateDefaultsForScaArtifacts < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  DEPENDENCY_SCANNING_LIMIT_MB = 350
+  CONTAINER_SCANNING_LIMIT_MB = 150
+  LICENSE_SCANNING_LIMIT_MB = 100
+
+  def up
+    change_column_default :plan_limits, :ci_max_artifact_size_dependency_scanning, DEPENDENCY_SCANNING_LIMIT_MB
+    change_column_default :plan_limits, :ci_max_artifact_size_container_scanning, CONTAINER_SCANNING_LIMIT_MB
+    change_column_default :plan_limits, :ci_max_artifact_size_license_scanning, LICENSE_SCANNING_LIMIT_MB
+  end
+
+  def down
+    change_column_default :plan_limits, :ci_max_artifact_size_dependency_scanning, 0
+    change_column_default :plan_limits, :ci_max_artifact_size_container_scanning, 0
+    change_column_default :plan_limits, :ci_max_artifact_size_license_scanning, 0
+  end
+end

db/schema_migrations/20200727142337

+cc88f907caed6045ff2d8b0663a4b64e9d2633f213ffa85274b84c80eb32b94e
\ No newline at end of file

db/structure.sql

@@ -14008,12 +14008,12 @@ CREATE TABLE public.plan_limits (
     ci_max_artifact_size_trace integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_junit integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_sast integer DEFAULT 0 NOT NULL,
-    ci_max_artifact_size_dependency_scanning integer DEFAULT 0 NOT NULL,
-    ci_max_artifact_size_container_scanning integer DEFAULT 0 NOT NULL,
+    ci_max_artifact_size_dependency_scanning integer DEFAULT 350 NOT NULL,
+    ci_max_artifact_size_container_scanning integer DEFAULT 150 NOT NULL,
     ci_max_artifact_size_dast integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_codequality integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_license_management integer DEFAULT 0 NOT NULL,
-    ci_max_artifact_size_license_scanning integer DEFAULT 0 NOT NULL,
+    ci_max_artifact_size_license_scanning integer DEFAULT 100 NOT NULL,
     ci_max_artifact_size_performance integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_metrics integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_metrics_referee integer DEFAULT 0 NOT NULL,

spec/models/plan_limits_spec.rb

@@ -183,12 +183,9 @@ RSpec.describe PlanLimits do
         ci_max_artifact_size_trace
         ci_max_artifact_size_junit
         ci_max_artifact_size_sast
-        ci_max_artifact_size_dependency_scanning
-        ci_max_artifact_size_container_scanning
         ci_max_artifact_size_dast
         ci_max_artifact_size_codequality
         ci_max_artifact_size_license_management
-        ci_max_artifact_size_license_scanning
         ci_max_artifact_size_performance
         ci_max_artifact_size_browser_performance
         ci_max_artifact_size_load_performance