Allow bypassing OT Chromium checks in non-prod environments (#4705)

* Allow bypassing OT Chromium checks on staging

* revert package.json change

* fix bypass logic in use counter value function

* fix test

---------

Co-authored-by: DanielRyanSmith <[email protected]>

Author: DanielRyanSmith

api/origin_trials_api.py

@@ -29,6 +29,7 @@
 from internals.core_enums import OT_READY_FOR_CREATION
 from internals.core_models import FeatureEntry, Stage
 from internals.review_models import Gate, Vote
+import settings
 
 WEBFEATURE_FILE_URL = 'https://chromium.googlesource.com/chromium/src/+/main/third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom?format=TEXT'
 WEBDXFEATURE_FILE_URL = 'https://chromium.googlesource.com/chromium/src/+/main/third_party/blink/public/mojom/use_counter/metrics/webdx_feature.mojom?format=TEXT'
@@ -66,6 +67,10 @@ def get_chromium_files_for_validation() -> dict:
 def find_use_counter_value(
     body: dict, chromium_files_dict: dict) -> int | None:
   """Find where the use counter is defined and return its value."""
+  # Chromium file checks can be bypassed, but only in non-prod environments.
+  if (not settings.PROD and body['ot_creation__bypass_file_checks'] and
+      body['ot_creation__bypass_file_checks']['value']):
+    return 0
   use_counter_name = body.get(
       'ot_webfeature_use_counter', {}).get('value')
   webfeature_use_counter = body.get(
@@ -225,12 +230,15 @@ def do_post(self, **kwargs):
     except Exception as exc:
       self.abort(
           500, f'Error obtaining Chromium file for validation: {str(exc)}')
-    validation_errors = self._validate_creation_args(body, chromium_files_dict)
-    if validation_errors:
-      return {
-          'message': 'Errors found when validating arguments',
-          'errors': validation_errors
-          }
+    # Chromium file checks can be bypassed, but only in non-prod environments.
+    if (settings.PROD or not body['ot_creation__bypass_file_checks'] or
+        not body['ot_creation__bypass_file_checks']['value']):
+      validation_errors = self._validate_creation_args(body, chromium_files_dict)
+      if validation_errors:
+        return {
+            'message': 'Errors found when validating arguments',
+            'errors': validation_errors
+            }
     self.update_stage(ot_stage, body, [])
     ot_stage.ot_use_counter_bucket_number = find_use_counter_value(body, chromium_files_dict)
 

client-src/elements/chromedash-ot-creation-page.ts

@@ -199,15 +199,29 @@ export class ChromedashOTCreationPage extends LitElement {
     );
   }
 
-  addHiddenFields() {
-    // Add a field for updating that an OT creation request has been submitted.
+  addAdditionalFields() {
+    // Add a hidden field for updating that an OT creation request has been submitted.
     this.fieldValues.push({
       name: 'ot_action_requested',
       touched: true,
       value: true,
       stageId: this.stage.id,
       alwaysHidden: true,
     });
+
+    // For non-prod environments, add a checkbox to bypass the checks ensuring
+    // that all values exist in Chromium files.
+    // TODO(DanielRyanSmith): Identify non-prod environments using a flag rather
+    // than the app's title.
+    if (this.appTitle !== 'Chrome Platform Status') {
+      this.fieldValues.push({
+        name: 'ot_creation__bypass_file_checks',
+        touched: true,
+        value: false,
+        stageId: this.stage.id,
+        alwaysHidden: false,
+      });
+    }
   }
 
   // Create the array that tracks the value of fields.
@@ -236,7 +250,7 @@ export class ChromedashOTCreationPage extends LitElement {
       };
     });
     this.addOptionalApprovalsFields();
-    this.addHiddenFields();
+    this.addAdditionalFields();
   }
 
   disconnectedCallback() {

client-src/elements/form-field-enums.ts

@@ -404,6 +404,7 @@ export const STAGE_SPECIFIC_FIELDS = new Set<string>([
   'ot_request_note',
   'ot_webfeature_use_counter',
   'ot_documentation_url',
+  'ot_creation__bypass_file_checks',
   'ot_creation__ot_documentation_url',
   'ot_is_deprecation_trial',
   'ot_has_third_party_support',

client-src/elements/form-field-specs.ts

@@ -1653,6 +1653,15 @@ export const ALL_FIELDS: Record<string, Field> = {
       checkMilestoneRanges([OT_MILESTONE_DESKTOP_RANGE], getFieldValue),
   },
 
+  ot_creation__bypass_file_checks: {
+    type: 'checkbox',
+    initial: false,
+    label: 'Bypass Chromium file checks (staging testing)',
+    help_text: html`This option should only be visible in ChromeStatus staging
+    environments. Allow this form to be submitted without verifying Chromium
+    code has landed.`,
+  },
+
   anticipated_spec_changes: {
     type: 'textarea',
     attrs: {rows: 4},

gen/js/chromestatus-openapi/src/models/CreateOriginTrialRequest.ts

@@ -140,6 +140,12 @@ export interface CreateOriginTrialRequest {
      * @memberof CreateOriginTrialRequest
      */
     ot_action_requested?: FieldInfo;
+    /**
+     * 
+     * @type {FieldInfo}
+     * @memberof CreateOriginTrialRequest
+     */
+    ot_creation__bypass_file_checks?: FieldInfo;
     /**
      * 
      * @type {FieldInfo}
@@ -316,6 +322,7 @@ export function CreateOriginTrialRequestFromJSONTyped(json: any, ignoreDiscrimin
         'ot_chromium_trial_name': json['ot_chromium_trial_name'] == null ? undefined : FieldInfoFromJSON(json['ot_chromium_trial_name']),
         'ot_display_name': json['ot_display_name'] == null ? undefined : FieldInfoFromJSON(json['ot_display_name']),
         'ot_action_requested': json['ot_action_requested'] == null ? undefined : FieldInfoFromJSON(json['ot_action_requested']),
+        'ot_creation__bypass_file_checks': json['ot_creation__bypass_file_checks'] == null ? undefined : FieldInfoFromJSON(json['ot_creation__bypass_file_checks']),
         'ot_documentation_url': json['ot_documentation_url'] == null ? undefined : FieldInfoFromJSON(json['ot_documentation_url']),
         'ot_emails': json['ot_emails'] == null ? undefined : FieldInfoFromJSON(json['ot_emails']),
         'ot_feedback_submission_url': json['ot_feedback_submission_url'] == null ? undefined : FieldInfoFromJSON(json['ot_feedback_submission_url']),
@@ -367,6 +374,7 @@ export function CreateOriginTrialRequestToJSON(value?: CreateOriginTrialRequest
         'ot_chromium_trial_name': FieldInfoToJSON(value['ot_chromium_trial_name']),
         'ot_display_name': FieldInfoToJSON(value['ot_display_name']),
         'ot_action_requested': FieldInfoToJSON(value['ot_action_requested']),
+        'ot_creation__bypass_file_checks': FieldInfoToJSON(value['ot_creation__bypass_file_checks']),
         'ot_documentation_url': FieldInfoToJSON(value['ot_documentation_url']),
         'ot_emails': FieldInfoToJSON(value['ot_emails']),
         'ot_feedback_submission_url': FieldInfoToJSON(value['ot_feedback_submission_url']),

gen/js/chromestatus-openapi/src/models/StageField.ts

@@ -140,6 +140,12 @@ export interface StageField {
      * @memberof StageField
      */
     ot_action_requested?: FieldInfo;
+    /**
+     * 
+     * @type {FieldInfo}
+     * @memberof StageField
+     */
+    ot_creation__bypass_file_checks?: FieldInfo;
     /**
      * 
      * @type {FieldInfo}
@@ -268,6 +274,7 @@ export function StageFieldFromJSONTyped(json: any, ignoreDiscriminator: boolean)
         'ot_chromium_trial_name': json['ot_chromium_trial_name'] == null ? undefined : FieldInfoFromJSON(json['ot_chromium_trial_name']),
         'ot_display_name': json['ot_display_name'] == null ? undefined : FieldInfoFromJSON(json['ot_display_name']),
         'ot_action_requested': json['ot_action_requested'] == null ? undefined : FieldInfoFromJSON(json['ot_action_requested']),
+        'ot_creation__bypass_file_checks': json['ot_creation__bypass_file_checks'] == null ? undefined : FieldInfoFromJSON(json['ot_creation__bypass_file_checks']),
         'ot_documentation_url': json['ot_documentation_url'] == null ? undefined : FieldInfoFromJSON(json['ot_documentation_url']),
         'ot_emails': json['ot_emails'] == null ? undefined : FieldInfoFromJSON(json['ot_emails']),
         'ot_feedback_submission_url': json['ot_feedback_submission_url'] == null ? undefined : FieldInfoFromJSON(json['ot_feedback_submission_url']),
@@ -311,6 +318,7 @@ export function StageFieldToJSON(value?: StageField | null): any {
         'ot_chromium_trial_name': FieldInfoToJSON(value['ot_chromium_trial_name']),
         'ot_display_name': FieldInfoToJSON(value['ot_display_name']),
         'ot_action_requested': FieldInfoToJSON(value['ot_action_requested']),
+        'ot_creation__bypass_file_checks': FieldInfoToJSON(value['ot_creation__bypass_file_checks']),
         'ot_documentation_url': FieldInfoToJSON(value['ot_documentation_url']),
         'ot_emails': FieldInfoToJSON(value['ot_emails']),
         'ot_feedback_submission_url': FieldInfoToJSON(value['ot_feedback_submission_url']),

gen/py/chromestatus_openapi/chromestatus_openapi/models/create_origin_trial_request.py

@@ -14,7 +14,7 @@ class CreateOriginTrialRequest(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, announcement_url=None, browser=None, ot_description=None, display_name=None, enterprise_policies=None, finch_url=None, experiment_goals=None, experiment_risks=None, experiment_extension_reason=None, intent_thread_url=None, origin_trial_feedback_url=None, origin_trial_id=None, ot_approval_buganizer_component=None, ot_approval_buganizer_custom_field_id=None, ot_approval_criteria_url=None, ot_approval_group_email=None, ot_chromium_trial_name=None, ot_display_name=None, ot_action_requested=None, ot_documentation_url=None, ot_emails=None, ot_feedback_submission_url=None, ot_has_third_party_support=None, ot_is_critical_trial=None, ot_is_deprecation_trial=None, ot_owner_email=None, ot_request_note=None, ot_require_approvals=None, ot_stage_id=None, ot_webfeature_use_counter=None, rollout_impact=None, rollout_milestone=None, rollout_platforms=None, rollout_details=None, desktop_first=None, desktop_last=None, android_first=None, android_last=None, ios_first=None, ios_last=None, webview_first=None, webview_last=None):  # noqa: E501
+    def __init__(self, announcement_url=None, browser=None, ot_description=None, display_name=None, enterprise_policies=None, finch_url=None, experiment_goals=None, experiment_risks=None, experiment_extension_reason=None, intent_thread_url=None, origin_trial_feedback_url=None, origin_trial_id=None, ot_approval_buganizer_component=None, ot_approval_buganizer_custom_field_id=None, ot_approval_criteria_url=None, ot_approval_group_email=None, ot_chromium_trial_name=None, ot_display_name=None, ot_action_requested=None, ot_creation__bypass_file_checks=None, ot_documentation_url=None, ot_emails=None, ot_feedback_submission_url=None, ot_has_third_party_support=None, ot_is_critical_trial=None, ot_is_deprecation_trial=None, ot_owner_email=None, ot_request_note=None, ot_require_approvals=None, ot_stage_id=None, ot_webfeature_use_counter=None, rollout_impact=None, rollout_milestone=None, rollout_platforms=None, rollout_details=None, desktop_first=None, desktop_last=None, android_first=None, android_last=None, ios_first=None, ios_last=None, webview_first=None, webview_last=None):  # noqa: E501
         """CreateOriginTrialRequest - a model defined in OpenAPI
 
         :param announcement_url: The announcement_url of this CreateOriginTrialRequest.  # noqa: E501
@@ -55,6 +55,8 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
         :type ot_display_name: FieldInfo
         :param ot_action_requested: The ot_action_requested of this CreateOriginTrialRequest.  # noqa: E501
         :type ot_action_requested: FieldInfo
+        :param ot_creation__bypass_file_checks: The ot_creation__bypass_file_checks of this CreateOriginTrialRequest.  # noqa: E501
+        :type ot_creation__bypass_file_checks: FieldInfo
         :param ot_documentation_url: The ot_documentation_url of this CreateOriginTrialRequest.  # noqa: E501
         :type ot_documentation_url: FieldInfo
         :param ot_emails: The ot_emails of this CreateOriginTrialRequest.  # noqa: E501
@@ -122,6 +124,7 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
             'ot_chromium_trial_name': FieldInfo,
             'ot_display_name': FieldInfo,
             'ot_action_requested': FieldInfo,
+            'ot_creation__bypass_file_checks': FieldInfo,
             'ot_documentation_url': FieldInfo,
             'ot_emails': FieldInfo,
             'ot_feedback_submission_url': FieldInfo,
@@ -167,6 +170,7 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
             'ot_chromium_trial_name': 'ot_chromium_trial_name',
             'ot_display_name': 'ot_display_name',
             'ot_action_requested': 'ot_action_requested',
+            'ot_creation__bypass_file_checks': 'ot_creation__bypass_file_checks',
             'ot_documentation_url': 'ot_documentation_url',
             'ot_emails': 'ot_emails',
             'ot_feedback_submission_url': 'ot_feedback_submission_url',
@@ -211,6 +215,7 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
         self._ot_chromium_trial_name = ot_chromium_trial_name
         self._ot_display_name = ot_display_name
         self._ot_action_requested = ot_action_requested
+        self._ot_creation__bypass_file_checks = ot_creation__bypass_file_checks
         self._ot_documentation_url = ot_documentation_url
         self._ot_emails = ot_emails
         self._ot_feedback_submission_url = ot_feedback_submission_url
@@ -645,6 +650,27 @@ def ot_action_requested(self, ot_action_requested: FieldInfo):
 
         self._ot_action_requested = ot_action_requested
 
+    @property
+    def ot_creation__bypass_file_checks(self) -> FieldInfo:
+        """Gets the ot_creation__bypass_file_checks of this CreateOriginTrialRequest.
+
+
+        :return: The ot_creation__bypass_file_checks of this CreateOriginTrialRequest.
+        :rtype: FieldInfo
+        """
+        return self._ot_creation__bypass_file_checks
+
+    @ot_creation__bypass_file_checks.setter
+    def ot_creation__bypass_file_checks(self, ot_creation__bypass_file_checks: FieldInfo):
+        """Sets the ot_creation__bypass_file_checks of this CreateOriginTrialRequest.
+
+
+        :param ot_creation__bypass_file_checks: The ot_creation__bypass_file_checks of this CreateOriginTrialRequest.
+        :type ot_creation__bypass_file_checks: FieldInfo
+        """
+
+        self._ot_creation__bypass_file_checks = ot_creation__bypass_file_checks
+
     @property
     def ot_documentation_url(self) -> FieldInfo:
         """Gets the ot_documentation_url of this CreateOriginTrialRequest.

gen/py/chromestatus_openapi/chromestatus_openapi/models/stage_field.py

@@ -14,7 +14,7 @@ class StageField(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, announcement_url=None, browser=None, ot_description=None, display_name=None, enterprise_policies=None, finch_url=None, experiment_goals=None, experiment_risks=None, experiment_extension_reason=None, intent_thread_url=None, origin_trial_feedback_url=None, origin_trial_id=None, ot_approval_buganizer_component=None, ot_approval_buganizer_custom_field_id=None, ot_approval_criteria_url=None, ot_approval_group_email=None, ot_chromium_trial_name=None, ot_display_name=None, ot_action_requested=None, ot_documentation_url=None, ot_emails=None, ot_feedback_submission_url=None, ot_has_third_party_support=None, ot_is_critical_trial=None, ot_is_deprecation_trial=None, ot_owner_email=None, ot_request_note=None, ot_require_approvals=None, ot_stage_id=None, ot_webfeature_use_counter=None, rollout_impact=None, rollout_milestone=None, rollout_platforms=None, rollout_details=None):  # noqa: E501
+    def __init__(self, announcement_url=None, browser=None, ot_description=None, display_name=None, enterprise_policies=None, finch_url=None, experiment_goals=None, experiment_risks=None, experiment_extension_reason=None, intent_thread_url=None, origin_trial_feedback_url=None, origin_trial_id=None, ot_approval_buganizer_component=None, ot_approval_buganizer_custom_field_id=None, ot_approval_criteria_url=None, ot_approval_group_email=None, ot_chromium_trial_name=None, ot_display_name=None, ot_action_requested=None, ot_creation__bypass_file_checks=None, ot_documentation_url=None, ot_emails=None, ot_feedback_submission_url=None, ot_has_third_party_support=None, ot_is_critical_trial=None, ot_is_deprecation_trial=None, ot_owner_email=None, ot_request_note=None, ot_require_approvals=None, ot_stage_id=None, ot_webfeature_use_counter=None, rollout_impact=None, rollout_milestone=None, rollout_platforms=None, rollout_details=None):  # noqa: E501
         """StageField - a model defined in OpenAPI
 
         :param announcement_url: The announcement_url of this StageField.  # noqa: E501
@@ -55,6 +55,8 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
         :type ot_display_name: FieldInfo
         :param ot_action_requested: The ot_action_requested of this StageField.  # noqa: E501
         :type ot_action_requested: FieldInfo
+        :param ot_creation__bypass_file_checks: The ot_creation__bypass_file_checks of this StageField.  # noqa: E501
+        :type ot_creation__bypass_file_checks: FieldInfo
         :param ot_documentation_url: The ot_documentation_url of this StageField.  # noqa: E501
         :type ot_documentation_url: FieldInfo
         :param ot_emails: The ot_emails of this StageField.  # noqa: E501
@@ -106,6 +108,7 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
             'ot_chromium_trial_name': FieldInfo,
             'ot_display_name': FieldInfo,
             'ot_action_requested': FieldInfo,
+            'ot_creation__bypass_file_checks': FieldInfo,
             'ot_documentation_url': FieldInfo,
             'ot_emails': FieldInfo,
             'ot_feedback_submission_url': FieldInfo,
@@ -143,6 +146,7 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
             'ot_chromium_trial_name': 'ot_chromium_trial_name',
             'ot_display_name': 'ot_display_name',
             'ot_action_requested': 'ot_action_requested',
+            'ot_creation__bypass_file_checks': 'ot_creation__bypass_file_checks',
             'ot_documentation_url': 'ot_documentation_url',
             'ot_emails': 'ot_emails',
             'ot_feedback_submission_url': 'ot_feedback_submission_url',
@@ -179,6 +183,7 @@ def __init__(self, announcement_url=None, browser=None, ot_description=None, dis
         self._ot_chromium_trial_name = ot_chromium_trial_name
         self._ot_display_name = ot_display_name
         self._ot_action_requested = ot_action_requested
+        self._ot_creation__bypass_file_checks = ot_creation__bypass_file_checks
         self._ot_documentation_url = ot_documentation_url
         self._ot_emails = ot_emails
         self._ot_feedback_submission_url = ot_feedback_submission_url
@@ -605,6 +610,27 @@ def ot_action_requested(self, ot_action_requested: FieldInfo):
 
         self._ot_action_requested = ot_action_requested
 
+    @property
+    def ot_creation__bypass_file_checks(self) -> FieldInfo:
+        """Gets the ot_creation__bypass_file_checks of this StageField.
+
+
+        :return: The ot_creation__bypass_file_checks of this StageField.
+        :rtype: FieldInfo
+        """
+        return self._ot_creation__bypass_file_checks
+
+    @ot_creation__bypass_file_checks.setter
+    def ot_creation__bypass_file_checks(self, ot_creation__bypass_file_checks: FieldInfo):
+        """Sets the ot_creation__bypass_file_checks of this StageField.
+
+
+        :param ot_creation__bypass_file_checks: The ot_creation__bypass_file_checks of this StageField.
+        :type ot_creation__bypass_file_checks: FieldInfo
+        """
+
+        self._ot_creation__bypass_file_checks = ot_creation__bypass_file_checks
+
     @property
     def ot_documentation_url(self) -> FieldInfo:
         """Gets the ot_documentation_url of this StageField.

gen/py/chromestatus_openapi/chromestatus_openapi/openapi/openapi.yaml

@@ -2056,6 +2056,9 @@ components:
         ot_display_name:
           form_field_name: form_field_name
           value: "{}"
+        ot_creation__bypass_file_checks:
+          form_field_name: form_field_name
+          value: "{}"
         rollout_platforms:
           form_field_name: form_field_name
           value: "{}"
@@ -2218,6 +2221,8 @@ components:
           $ref: '#/components/schemas/FieldInfo'
         ot_action_requested:
           $ref: '#/components/schemas/FieldInfo'
+        ot_creation__bypass_file_checks:
+          $ref: '#/components/schemas/FieldInfo'
         ot_documentation_url:
           $ref: '#/components/schemas/FieldInfo'
         ot_emails: