Stop trying to clean up AR cache on function deletion. (#6927)

* Stop trying to clean up AR cache on function deletion.

Since release of this feature, GCF has started cleaning up cache
images automatically on function deletion. This has led to us getting
404 errors and printing scary messages in the console.

Fixes #6882

* Ignore quota project in GCF source uploads (#6917)

* Ignore quota project in GCF source uploads

* Changelog

* Remove superfluous change

* format + fix tests

---------

Co-authored-by: Joe Hanley <joehanley@google.com>

* 13.6.0

* [firebase-release] Removed change log and reset repo after 13.6.0 release

* Changelog

* Remove dead code unit test

---------

Co-authored-by: Joe Hanley <joehanley@google.com>
Co-authored-by: Google Open Source Bot <firebase-oss-bot@google.com>

Author: 3 people

CHANGELOG.md

@@ -1 +1,2 @@
+- Stop trying to delete cache images after functions deletion that GCF already cleans up (#6927)
 - Add support timelines for functions runtimes (#6866)

src/deploy/functions/containerCleaner.ts

@@ -63,7 +63,7 @@ export async function cleanupBuildImages(
   cleanup.push(
     ...deletedFunctions.map(async (func) => {
       try {
-        await Promise.all([arCleaner.cleanupFunction(func), arCleaner.cleanupFunctionCache(func)]);
+        await arCleaner.cleanupFunction(func);
       } catch (err: any) {
         const path = `${func.project}/${func.region}/gcf-artifacts`;
         failedDomains.add(`https://console.cloud.google.com/artifacts/docker/${path}`);
@@ -151,33 +151,13 @@ export class ArtifactRegistryCleaner {
       operationResourceName: op.name,
     });
   }
-
-  async cleanupFunctionCache(func: backend.TargetIds): Promise<void> {
-    // GCF uses "<id>/cache" as their pacakge name, but AR percent-encodes this to
-    // avoid parsing issues with OP.
-    const op = await artifactregistry.deletePackage(
-      `${ArtifactRegistryCleaner.packagePath(func)}%2Fcache`,
-    );
-    if (op.done) {
-      return;
-    }
-    await poller.pollOperation<void>({
-      ...ArtifactRegistryCleaner.POLLER_OPTIONS,
-      pollerName: `cleanup-cache-${func.region}-${func.id}`,
-      operationResourceName: op.name,
-    });
-  }
 }
 
 // Temporary class to turn off AR cleaning if AR isn't enabled yet
 export class NoopArtifactRegistryCleaner extends ArtifactRegistryCleaner {
   cleanupFunction(): Promise<void> {
     return Promise.resolve();
   }
-
-  cleanupFunctionCache(): Promise<void> {
-    return Promise.resolve();
-  }
 }
 
 export class ContainerRegistryCleaner {

src/test/deploy/functions/containerCleaner.spec.ts

@@ -35,7 +35,7 @@ describe("CleanupBuildImages", () => {
   });
 
   it("reports failed domains from AR", async () => {
-    ar.cleanupFunctionCache.rejects(new Error("uh oh"));
+    ar.cleanupFunction.rejects(new Error("uh oh"));
     await containerCleaner.cleanupBuildImages([], [TARGET], { gcr, ar } as any);
     expect(logLabeledWarning).to.have.been.calledWithMatch(
       "functions",
@@ -207,23 +207,6 @@ describe("ArtifactRegistryCleaner", () => {
     expect(poll.pollOperation).to.have.been.called;
   });
 
-  it("deletes cache dirs", async () => {
-    const cleaner = new containerCleaner.ArtifactRegistryCleaner();
-    const func = {
-      id: "function",
-      region: "region",
-      project: "project",
-    };
-
-    ar.deletePackage.returns(Promise.resolve({ name: "op", done: false }));
-
-    await cleaner.cleanupFunctionCache(func);
-    expect(ar.deletePackage).to.have.been.calledWith(
-      "projects/project/locations/region/repositories/gcf-artifacts/packages/function%2Fcache",
-    );
-    expect(poll.pollOperation).to.have.been.called;
-  });
-
   it("bypasses poller if the operation is completed", async () => {
     const cleaner = new containerCleaner.ArtifactRegistryCleaner();
     const func = {