@go-to-k/cdkd 0.102.1 → 0.102.2

package/dist/cli.js

@@ -12357,6 +12357,21 @@ var ApiGatewayProvider = class ApiGatewayProvider {
 	* `Invalid mapping expression specified: ... [No method response exists
 	* for method.]` — the canonical trigger is a CORS preflight OPTIONS
 	* method emitted by `RestApi({ defaultCorsPreflightOptions: ... })`.
+	*
+	* Partial-failure cleanup: if any AWS call AFTER `PutMethodCommand`
+	* fails, the method has already been created on AWS but cdkd state
+	* does NOT record it (the throw happens before the success return).
+	* A subsequent redeploy would then attempt CREATE again and AWS would
+	* reject with `Method already exists for this resource`. To prevent
+	* this orphan, the post-`PutMethod` block is wrapped in an inner
+	* try/catch that issues a best-effort `DeleteMethodCommand` before
+	* re-throwing the original error. Cleanup failures are logged at warn
+	* (the underlying create failure is what matters; we don't mask it by
+	* promoting a cleanup error). The class of bug — partial AWS-side
+	* commit on `createMethod` failure — was first seen via the
+	* `PutIntegrationResponse`-before-`PutMethodResponse` ordering bug
+	* fixed in PR #373; this cleanup makes any future shape of
+	* post-`PutMethod` failure self-healing on the next redeploy.
 	*/
 	async createMethod(logicalId, resourceType, properties) {
 		this.logger.debug(`Creating API Gateway Method ${logicalId}`);
@@ -12386,54 +12401,68 @@ var ApiGatewayProvider = class ApiGatewayProvider {
 				requestValidatorId,
 				authorizationScopes
 			}));
-			const integration = properties["Integration"];
-			if (integration) await this.apiGatewayClient.send(new PutIntegrationCommand({
-				restApiId,
-				resourceId,
-				httpMethod,
-				type: integration["Type"],
-				integrationHttpMethod: integration["IntegrationHttpMethod"],
-				uri: integration["Uri"],
-				connectionType: integration["ConnectionType"],
-				connectionId: integration["ConnectionId"],
-				credentials: integration["Credentials"],
-				requestParameters: integration["RequestParameters"],
-				requestTemplates: integration["RequestTemplates"],
-				passthroughBehavior: integration["PassthroughBehavior"],
-				contentHandling: integration["ContentHandling"],
-				timeoutInMillis: integration["TimeoutInMillis"],
-				cacheNamespace: integration["CacheNamespace"],
-				cacheKeyParameters: integration["CacheKeyParameters"],
-				tlsConfig: integration["TlsConfig"] ? { insecureSkipVerification: integration["TlsConfig"]["InsecureSkipVerification"] } : void 0,
-				responseTransferMode: integration["ResponseTransferMode"]
-			}));
-			const methodResponses = properties["MethodResponses"];
-			if (methodResponses) for (const resp of methodResponses) {
-				const statusCode = String(resp["StatusCode"]);
-				await this.apiGatewayClient.send(new PutMethodResponseCommand({
+			try {
+				const integration = properties["Integration"];
+				if (integration) await this.apiGatewayClient.send(new PutIntegrationCommand({
 					restApiId,
 					resourceId,
 					httpMethod,
-					statusCode,
-					responseModels: resp["ResponseModels"],
-					responseParameters: resp["ResponseParameters"]
+					type: integration["Type"],
+					integrationHttpMethod: integration["IntegrationHttpMethod"],
+					uri: integration["Uri"],
+					connectionType: integration["ConnectionType"],
+					connectionId: integration["ConnectionId"],
+					credentials: integration["Credentials"],
+					requestParameters: integration["RequestParameters"],
+					requestTemplates: integration["RequestTemplates"],
+					passthroughBehavior: integration["PassthroughBehavior"],
+					contentHandling: integration["ContentHandling"],
+					timeoutInMillis: integration["TimeoutInMillis"],
+					cacheNamespace: integration["CacheNamespace"],
+					cacheKeyParameters: integration["CacheKeyParameters"],
+					tlsConfig: integration["TlsConfig"] ? { insecureSkipVerification: integration["TlsConfig"]["InsecureSkipVerification"] } : void 0,
+					responseTransferMode: integration["ResponseTransferMode"]
 				}));
-			}
-			if (integration) {
-				const integrationResponses = integration["IntegrationResponses"];
-				if (integrationResponses) for (const ir of integrationResponses) {
-					const statusCode = String(ir["StatusCode"]);
-					await this.apiGatewayClient.send(new PutIntegrationResponseCommand({
+				const methodResponses = properties["MethodResponses"];
+				if (methodResponses) for (const resp of methodResponses) {
+					const statusCode = String(resp["StatusCode"]);
+					await this.apiGatewayClient.send(new PutMethodResponseCommand({
 						restApiId,
 						resourceId,
 						httpMethod,
 						statusCode,
-						selectionPattern: ir["SelectionPattern"],
-						responseParameters: ir["ResponseParameters"],
-						responseTemplates: ir["ResponseTemplates"],
-						contentHandling: ir["ContentHandling"]
+						responseModels: resp["ResponseModels"],
+						responseParameters: resp["ResponseParameters"]
+					}));
+				}
+				if (integration) {
+					const integrationResponses = integration["IntegrationResponses"];
+					if (integrationResponses) for (const ir of integrationResponses) {
+						const statusCode = String(ir["StatusCode"]);
+						await this.apiGatewayClient.send(new PutIntegrationResponseCommand({
+							restApiId,
+							resourceId,
+							httpMethod,
+							statusCode,
+							selectionPattern: ir["SelectionPattern"],
+							responseParameters: ir["ResponseParameters"],
+							responseTemplates: ir["ResponseTemplates"],
+							contentHandling: ir["ContentHandling"]
+						}));
+					}
+				}
+			} catch (innerError) {
+				try {
+					await this.apiGatewayClient.send(new DeleteMethodCommand({
+						restApiId,
+						resourceId,
+						httpMethod
 					}));
+					this.logger.debug(`Cleaned up partially-created API Gateway Method ${logicalId} (${restApiId}/${resourceId}/${httpMethod}) after wiring failure`);
+				} catch (cleanupError) {
+					this.logger.warn(`Failed to clean up partially-created API Gateway Method ${logicalId} (${restApiId}/${resourceId}/${httpMethod}): ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Manual deletion may be required before the next deploy: aws apigateway delete-method --rest-api-id ${restApiId} --resource-id ${resourceId} --http-method ${httpMethod}`);
 				}
+				throw innerError;
 			}
 			const physicalId = `${restApiId}|${resourceId}|${httpMethod}`;
 			this.logger.debug(`Successfully created API Gateway Method ${logicalId}: ${physicalId}`);
@@ -42709,7 +42738,7 @@ function reorderArgs(argv) {
 */
 async function main() {
 	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.102.1");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.102.2");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());