refactor(gateway): use inline policy swap class

Author: aidandaly24

src/core/gateway.tsx

@@ -40,7 +40,7 @@ import {
   retryWhileGatewayRoleChangesPropagate,
   type GatewayTargetRoleConfiguration,
 } from "./gatewayExecutionRole";
-import { swapInlinePolicyForOperation } from "./inlinePolicySwap";
+import { InlinePolicySwap } from "./inlinePolicySwap";
 import { toClientConfig } from "./utils";
 
 export class GatewayClient implements CoreGatewayClient {
@@ -60,39 +60,25 @@ export class GatewayClient implements CoreGatewayClient {
 
     const iam = this.clients.iam({ region: options.region });
     const role = await ensureGatewayExecutionRole(iam, input.name!, options.region, input);
-    const response = await swapInlinePolicyForOperation(
-      iam,
-      {
-        roleName: role.roleName,
-        policyNamePrefix: GATEWAY_EXECUTION_POLICY_NAME,
-        policyDocument: role.candidatePolicyDocument(),
-      },
-      async () => {
-        const created = await retryWhileGatewayRoleChangesPropagate(() =>
-          control.send(
-            new CreateGatewayCommand(
-              buildGatewayCreateRequest({ ...input, roleArn: role.roleArn }),
-            ),
-          ),
-        );
-        if (!created.gatewayArn) {
-          throw new Error("CreateGateway response did not include the Gateway ARN");
-        }
-        return created;
-      },
-    );
-    return swapInlinePolicyForOperation(
-      iam,
-      {
-        roleName: role.roleName,
-        policyNamePrefix: GATEWAY_EXECUTION_POLICY_NAME,
-        policyDocument: role.candidatePolicyDocument(response.gatewayArn!),
-      },
-      async () => {
-        await role.updateTrust(response.gatewayArn!);
-        return response;
-      },
-    );
+    const policySwap = new InlinePolicySwap(iam, {
+      roleName: role.roleName,
+      policyNamePrefix: GATEWAY_EXECUTION_POLICY_NAME,
+    });
+    const response = await policySwap.run(role.candidatePolicyDocument(), async () => {
+      const created = await retryWhileGatewayRoleChangesPropagate(() =>
+        control.send(
+          new CreateGatewayCommand(buildGatewayCreateRequest({ ...input, roleArn: role.roleArn })),
+        ),
+      );
+      if (!created.gatewayArn) {
+        throw new Error("CreateGateway response did not include the Gateway ARN");
+      }
+      return created;
+    });
+    return policySwap.run(role.candidatePolicyDocument(response.gatewayArn!), async () => {
+      await role.updateTrust(response.gatewayArn!);
+      return response;
+    });
   }
 
   async getGateway(id: string, options: CoreOptions): Promise<GetGatewayResponse> {
@@ -160,17 +146,13 @@ export class GatewayClient implements CoreGatewayClient {
       undefined,
       request,
     );
-    return swapInlinePolicyForOperation(
-      iam,
-      {
-        roleName: role.roleName,
-        policyNamePrefix: GATEWAY_EXECUTION_POLICY_NAME,
-        policyDocument: role.candidatePolicyDocument(configurations),
-      },
-      () =>
-        retryWhileGatewayRoleChangesPropagate(() =>
-          control.send(new CreateGatewayTargetCommand(request)),
-        ),
+    return new InlinePolicySwap(iam, {
+      roleName: role.roleName,
+      policyNamePrefix: GATEWAY_EXECUTION_POLICY_NAME,
+    }).run(role.candidatePolicyDocument(configurations), () =>
+      retryWhileGatewayRoleChangesPropagate(() =>
+        control.send(new CreateGatewayTargetCommand(request)),
+      ),
     );
   }