Remove most references to the perflab upload token, including secret names and const references for it. (#4873)

Remove most references to the perflab upload token, including secret names and const references for it. This does not include updates for secret munger/sychronization runs as they will be covered in a follow-up PR removing multiple secret references.

Author: LoopedBard3

eng/pipelines/templates/run-performance-job-script-step.yml

@@ -6,6 +6,4 @@ steps:
   - script: $(Python) ${{ parameters.performanceRepoDir }}/scripts/run_performance_job.py ${{ join(' ', parameters.runPerformanceJobArgs) }}
     displayName: Run performance job script
     env:
-      PerfCommandUploadToken: '$(PerfCommandUploadToken)'
-      PerfCommandUploadTokenLinux: '$(PerfCommandUploadTokenLinux)'
       HelixAccessToken: '$(HelixApiAccessToken)'

helix.yml

@@ -33,7 +33,7 @@ jobs:
     dockerImageName: helix_sender
     dockerCommand: python ./performance/scripts/run_performance_job.py --queue {{ queue }} --framework {{ framework }} --run-kind {{ kind }} --core-root-dir /performance/coreRoot --performance-repo-dir /performance/performance --architecture {{ architecture }} --os-group {{ osGroup }} --os-sub-group {{ osSubGroup }} {% if internal %}--internal{% endif %} --run-categories "{{ runCategories }}" {% if bdnArgs != blank and bdnArgs != empty %} --extra-bdn-args "{{ bdnArgs }}" {% endif %} --partition-count {{ partitionCount }} --project-file {{ projectFile }} {% if isScenario %} --is-scenario {% endif %} {% if isLocalBuild %} --local-build {% endif %}
     dockerContextDirectory: .
-    arguments: '--env HelixAccessToken --env SYSTEM_ACCESSTOKEN --env PerfCommandUploadToken --env PerfCommandUploadTokenLinux'
+    arguments: '--env HelixAccessToken --env SYSTEM_ACCESSTOKEN'
     environmentVariables:
       BUILD_BUILDNUMBER: '{{ buildNumber }}'
       BUILD_SOURCEVERSION: '{{ buildSourceVersion }}'

scripts/benchmarks_ci.py

@@ -33,7 +33,7 @@
 from performance.common import get_repo_root_path, validate_supported_runtime, get_artifacts_directory, helixuploadroot
 from performance.logger import setup_loggers
 from performance.tracer import setup_tracing, enable_trace_console_exporter, get_tracer
-from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_TOKEN_VAR, UPLOAD_QUEUE
+from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_QUEUE
 from channel_map import ChannelMap
 from subprocess import CalledProcessError
 from glob import glob
@@ -382,7 +382,7 @@ def main(argv: List[str]):
         if args.upload_to_perflab_container:
             reports_globpath = os.path.join(artifacts_dir, '**', '*perf-lab-report.json')
             import upload
-            upload_code = upload.upload(reports_globpath, upload_container, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
+            upload_code = upload.upload(reports_globpath, upload_container, UPLOAD_QUEUE, UPLOAD_STORAGE_URI)
             getLogger().info("Benchmarks Upload Code: " + str(upload_code))
             if upload_code != 0:
                 sys.exit(upload_code)

scripts/performance/constants.py

@@ -1,9 +1,8 @@
 'Constant strings for scripts in the repo'
 
 UPLOAD_CONTAINER = 'results'
-UPLOAD_TOKEN_VAR = 'PERFLAB_UPLOAD_TOKEN'
 UPLOAD_STORAGE_URI = 'https://pvscmdupload.{}.core.windows.net'
 UPLOAD_QUEUE = 'resultsqueue'
 TENANT_ID = '72f988bf-86f1-41af-91ab-2d7cd011db47'
 ARC_CLIENT_ID = 'a231f733-103b-46e9-b58a-9416edde0eb4'
-CERT_CLIENT_ID = '8c4b65ef-5a73-4d5a-a298-962d4a4ef7bc'
+CERT_CLIENT_ID = '8c4b65ef-5a73-4d5a-a298-962d4a4ef7bc'

scripts/run_performance_job.py

@@ -73,7 +73,6 @@ class RunPerformanceJobArgs:
     built_app_dir: Optional[str] = None
     extra_bdn_args: Optional[str] = None
     run_categories: str = 'Libraries Runtime'
-    perflab_upload_token: Optional[str] = None
     helix_access_token: Optional[str] = os.environ.get("HelixAccessToken")
     os_sub_group: Optional[str] = None
     project_file: Optional[str] = None
@@ -208,13 +207,6 @@ def get_pre_commands(args: RunPerformanceJobArgs, v8_version: str):
             "${V8_ENGINE_PATH} -e 'console.log(`V8 version: ${this.version()}`)'"
         ]
 
-    # Ensure that the upload token is set so that the results can be uploaded to the storage account
-    if args.internal:
-        if args.os_group == "windows":
-            install_prerequisites += [f"set \"PERFLAB_UPLOAD_TOKEN={args.perflab_upload_token}\""]
-        else:
-            install_prerequisites += [f"export PERFLAB_UPLOAD_TOKEN=\"{args.perflab_upload_token}\""]
-
     # Add the install_prerequisites to the pre_commands
     if args.os_group == "windows":
         # TODO: Should we also give Windows the same treatment as linux and ensure that each command succeeds?
@@ -371,12 +363,6 @@ def run_performance_job(args: RunPerformanceJobArgs):
     if args.project_file is None:
         args.project_file = os.path.join(args.performance_repo_dir, "eng", "performance", "helix.proj")
 
-    if args.perflab_upload_token is None:
-        env_var_name = "PerfCommandUploadToken" if args.os_group == "windows" else "PerfCommandUploadTokenLinux"
-        args.perflab_upload_token = os.environ.get(env_var_name)
-        if args.perflab_upload_token is None and args.internal:
-            getLogger().info(f"{env_var_name} is not set. This may be needed for results to be uploaded.")
-    
     args.performance_repo_dir = os.path.abspath(args.performance_repo_dir)
 
     mono_interpreter = args.codegen_type.lower() == "interpreter" and args.runtime_type == "mono"
@@ -456,7 +442,6 @@ def run_performance_job(args: RunPerformanceJobArgs):
     else:
         args.helix_access_token = None
         os.environ.pop("HelixAccessToken", None) # in case the environment variable is set on the system already
-        args.perflab_upload_token = ""
         extra_bdn_arguments += [
             "--iterationCount", "1", 
             "--warmupCount", "0", 
@@ -1204,7 +1189,6 @@ def main(argv: List[str]):
                 "--versions-props-path": "versions_props_path",
                 "--browser-versions-props-path": "browser_versions_props_path",
                 "--built-app-dir": "built_app_dir",
-                "--perflab-upload-token": "perflab_upload_token",
                 "--helix-access-token": "helix_access_token",
                 "--project-file": "project_file",
                 "--build-repository-name": "build_repository_name",

scripts/upload.py

@@ -27,7 +27,7 @@ def get_unique_name(filename: str, unique_id: str) -> str:
         newname = "{0}-perf-lab-report.json".format(randint(1000, 9999))
     return newname
 
-def upload(globpath: str, container: str, queue: str, sas_token_env: str, storage_account_uri: str):
+def upload(globpath: str, container: str, queue: str, storage_account_uri: str):
     try:
         credential = None
         try:
@@ -50,9 +50,7 @@ def upload(globpath: str, container: str, queue: str, sas_token_env: str, storag
             except Exception as ex:
                 credential = None
         if credential is None:
-            getLogger().error("Unable to authenticate with managed identity or certificates.")
-            getLogger().info("Falling back to environment variable.")
-            credential = os.getenv(sas_token_env)
+            raise RuntimeError("Authentication failed with managed identity and certificates. No valid authentication method available.")
 
         files = glob(globpath, recursive=True)
         any_upload_or_queue_failed = False

src/scenarios/shared/androidinstrumentation.py

@@ -7,7 +7,7 @@
 from logging import getLogger
 from shutil import copytree
 from performance.common import runninginlab, RunCommand
-from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_TOKEN_VAR, UPLOAD_QUEUE
+from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_QUEUE
 from shared.util import helixuploaddir, xharnesscommand, xharness_adb
 from shared.const import *
 from subprocess import CalledProcessError
@@ -139,7 +139,7 @@ def runtests(self, packagepath: str, packagename: str, instrumentationname: str,
                     TRACEDIR,
                     '**',
                     '*perf-lab-report.json')
-                upload_code = upload.upload(globpath, UPLOAD_CONTAINER, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
+                upload_code = upload.upload(globpath, UPLOAD_CONTAINER, UPLOAD_QUEUE, UPLOAD_STORAGE_URI)
                 getLogger().info("Device Benchmarks Upload Code: " + str(upload_code))
                 if upload_code != 0:
                     sys.exit(upload_code)

src/scenarios/shared/devicepowerconsumption.py

@@ -10,7 +10,7 @@
 from shutil import copytree
 import time
 from performance.common import extension, helixpayload, runninginlab, get_artifacts_directory, get_packages_directory, RunCommand
-from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_TOKEN_VAR, UPLOAD_QUEUE
+from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_QUEUE
 from dotnet import CSharpProject, CSharpProjFile
 from shared import const
 from shared.androidhelper import AndroidHelper
@@ -93,7 +93,7 @@ def parsetraces(self, traits: TestTraits):
             copytree(TRACEDIR, os.path.join(helix_upload_dir, 'traces'))
             if traits.upload_to_perflab_container:
                 import upload
-                upload.upload(self.reportjson, upload_container, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
+                upload.upload(self.reportjson, upload_container, UPLOAD_QUEUE, UPLOAD_STORAGE_URI)
 
     def runtestsandroid(self, packagepath: str, packagename: str, testiterations: int, runtimeseconds: int, closeToStartDelay: int, traits: TestTraits):
         getLogger().info("Clearing potential previous run nettraces")

src/scenarios/shared/memoryconsumption.py

@@ -6,7 +6,7 @@
 from logging import getLogger
 from shutil import copytree
 from performance.common import extension, helixpayload, runninginlab, get_artifacts_directory, get_packages_directory, RunCommand
-from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_TOKEN_VAR, UPLOAD_QUEUE
+from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_QUEUE
 from dotnet import CSharpProject, CSharpProjFile
 from shared.util import helixworkitempayload, helixuploaddir, getruntimeidentifier
 from shared.const import *
@@ -86,7 +86,7 @@ def parsetraces(self, traits: TestTraits):
             copytree(TRACEDIR, os.path.join(helix_upload_dir, 'traces'))
             if traits.upload_to_perflab_container:
                 import upload
-                upload.upload(self.reportjson, upload_container, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
+                upload.upload(self.reportjson, upload_container, UPLOAD_QUEUE, UPLOAD_STORAGE_URI)
 
     def runtests(self, traits: TestTraits):
         '''
@@ -159,7 +159,7 @@ def runtests(self, traits: TestTraits):
             copytree(TRACEDIR, os.path.join(helix_upload_dir, 'traces'))
             if traits.upload_to_perflab_container:
                 import upload
-                upload_code = upload.upload(self.reportjson, upload_container, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
+                upload_code = upload.upload(self.reportjson, upload_container, UPLOAD_QUEUE, UPLOAD_STORAGE_URI)
                 getLogger().info("memoryconsumption Upload Code: " + str(upload_code))
                 if upload_code != 0:
                     sys.exit(upload_code)

src/scenarios/shared/sod.py

@@ -8,7 +8,7 @@
 from shutil import copytree, copy
 from typing import Optional
 from performance.common import helixpayload, extension, runninginlab, get_artifacts_directory, get_packages_directory, RunCommand
-from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_TOKEN_VAR, UPLOAD_QUEUE
+from performance.constants import UPLOAD_CONTAINER, UPLOAD_STORAGE_URI, UPLOAD_QUEUE
 from dotnet import CSharpProject, CSharpProjFile
 from shared.util import helixworkitempayload, helixuploaddir, getruntimeidentifier
 from shared.const import *
@@ -97,7 +97,7 @@ def runtests(self, scenarioname: Optional[str], dirs: str, upload_to_perflab_con
 
             if upload_to_perflab_container:
                 import upload
-                upload_code = upload.upload(reportjson, UPLOAD_CONTAINER, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
+                upload_code = upload.upload(reportjson, UPLOAD_CONTAINER, UPLOAD_QUEUE, UPLOAD_STORAGE_URI)
                 getLogger().info("SoD Upload Code: " + str(upload_code))
                 if upload_code != 0:
                     sys.exit(upload_code)