[rush] move sharded operation config to its own block

build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/projects/a/config/rush-project.json

@@ -6,12 +6,12 @@
       "outputFolderNames": ["dist"],
       "sharding": {
         "count": 4,
-        "outputFolderArgumentFormat": "--output-directory=.rush/{phaseName}/shards/{shardIndex}",
-
-        "shardOperationSettings": {
-          "weight": 4
-        }
+        "outputFolderArgumentFormat": "--output-directory=.rush/{phaseName}/shards/{shardIndex}"
       }
+    },
+    {
+      "operationName": "_phase:build:shard",
+      "weight": 4
     }
   ]
 }

build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/projects/b/config/rush-project.json

@@ -5,11 +5,12 @@
       "outputFolderNames": ["dist"],
       "sharding": {
         "count": 5,
-        "outputFolderArgumentFormat": "--output-directory=.rush/{phaseName}/shards/{shardIndex}",
-        "shardOperationSettings": {
-          "weight": 10
-        }
+        "outputFolderArgumentFormat": "--output-directory=.rush/{phaseName}/shards/{shardIndex}"
       }
+    },
+    {
+      "operationName": "_phase:build:shard",
+      "weight": 10
     }
   ]
 }

common/changes/@microsoft/rush/sennyeya-shard-schema-updates_2024-09-13-22-46.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove sharding.shardOperationSettings. Use a new operationSettings object with a name of ':shard'",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "aramissennyeydd@users.noreply.github.com"
+}

common/reviews/api/rush-lib.api.md

@@ -785,9 +785,6 @@ export interface IRushPhaseSharding {
     count: number;
     outputFolderArgumentFormat?: string;
     shardArgumentFormat?: string;
-    shardOperationSettings?: {
-        weight?: number;
-    };
 }
 
 // @beta (undocumented)

libraries/rush-lib/src/api/RushProjectConfiguration.ts

@@ -63,17 +63,6 @@ export interface IRushPhaseSharding {
    * @defaultValue `--shard-output-folder=.rush/operations/{phaseName}/shards/{shardIndex}`.
    */
   outputFolderArgumentFormat?: string;
-
-  /**
-   * Configuration for the shard operation. All other configuration applies to the collator operation.
-   */
-  shardOperationSettings?: {
-    /**
-     * How many concurrency units this operation should take up during execution. The maximum concurrent units is
-     *  determined by the -p flag.
-     */
-    weight?: number;
-  };
 }
 
 /**

libraries/rush-lib/src/logic/operations/ShardedPhaseOperationPlugin.ts

@@ -2,6 +2,7 @@
 // See LICENSE in the project root for license information.
 
 import type { IPhase } from '../../api/CommandLineConfiguration';
+import type { RushProjectConfiguration } from '../../api/RushProjectConfiguration';
 import type {
   ICreateOperationsContext,
   IPhasedCommandPlugin,
@@ -45,7 +46,7 @@ export class ShardedPhasedOperationPlugin implements IPhasedCommandPlugin {
 }
 
 function spliceShards(existingOperations: Set<Operation>, context: ICreateOperationsContext): Set<Operation> {
-  const { rushConfiguration } = context;
+  const { rushConfiguration, projectConfigurations } = context;
 
   const getCustomParameterValuesForPhase: (phase: IPhase) => ReadonlyArray<string> =
     getCustomParameterValuesByPhase();
@@ -58,7 +59,7 @@ function spliceShards(existingOperations: Set<Operation>, context: ICreateOperat
       logFilenameIdentifier: baseLogFilenameIdentifier
     } = operation;
     if (phase && project && operationSettings?.sharding && !operation.runner) {
-      const { count: shards, shardOperationSettings } = operationSettings.sharding;
+      const { count: shards } = operationSettings.sharding;
 
       /**
        * A single operation to reduce the number of edges in the graph when creating shards.
@@ -165,6 +166,7 @@ function spliceShards(existingOperations: Set<Operation>, context: ICreateOperat
         );
       }
 
+      const projectConfiguration: RushProjectConfiguration | undefined = projectConfigurations.get(project);
       for (let shard: number = 1; shard <= shards; shard++) {
         const outputDirectory: string = outputFolderWithTemplate.replace(
           TemplateStringRegexes.SHARD_INDEX,
@@ -175,7 +177,7 @@ function spliceShards(existingOperations: Set<Operation>, context: ICreateOperat
           project,
           phase,
           settings: {
-            ...shardOperationSettings,
+            ...projectConfiguration?.operationSettingsByOperationName.get(shardOperationName),
             operationName: shardOperationName,
             outputFolderNames: [outputDirectory]
           },

libraries/rush-lib/src/schemas/rush-project.schema.json

@@ -90,17 +90,6 @@
               "outputFolderArgumentFormat": {
                 "type": "string",
                 "description": "The command-line argument to pass to the operation to specify the output folder. The string may contain the following placeholders: {phaseName} {shardIndex}. Must end with {shardIndex}. Defaults to --shard-output-folder=\".rush/operations/{phaseName}/shards/{shardIndex}\""
-              },
-              "shardOperationSettings": {
-                "type": "object",
-                "additionalProperties": false,
-                "properties": {
-                  "weight": {
-                    "description": "The number of concurrency units that this operation should take up. The maximum concurrency units is determined by the -p flag.",
-                    "type": "integer",
-                    "minimum": 0
-                  }
-                }
               }
             }
           },