From 748e71c1026474bb75bf44ccd5c10720ff811f7b Mon Sep 17 00:00:00 2001
From: Zane Whitfield <zwhitfield@salesforce.com>
Date: Fri, 8 Mar 2024 10:23:46 -0800
Subject: [PATCH] fix(workflow): remove fig command & update workflow (#2686)

* Remove @fig/complete-oclif for different approach

* WIP install @fig/complete-oclif

* WIP install @fig/complete-oclif using ubuntu runners

* WIP remove jq install step

* WIP try creating fig spec

* WIP attempting entire workflow

* WIP update fig workflow version

* WIP help debug fig workflow

* WIP generate fig spec

* Update workflow

* Clean up workflow
---
 .../workflows/publish-to-fig-autocomplete.yml |  8 +++++---
 packages/cli/package.json                     |  2 --
 .../cli/test/acceptance/commands-output.ts    |  1 -
 yarn.lock                                     | 20 -------------------
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/publish-to-fig-autocomplete.yml b/.github/workflows/publish-to-fig-autocomplete.yml
index 2a46817e2f..ca807d8685 100644
--- a/.github/workflows/publish-to-fig-autocomplete.yml
+++ b/.github/workflows/publish-to-fig-autocomplete.yml
@@ -14,20 +14,22 @@ jobs:
         with:
           node-version: 16.x
           cache: yarn
+      - name: Install Fig Oclif Plugin
+        run: cd packages/cli && yarn add @fig/complete-oclif && jq '.oclif.plugins += ["@fig/complete-oclif"]' package.json > temp.json && mv temp.json package.json
       - run: yarn --immutable --network-timeout 1000000
       - name: Build Heroku CLI
         run: yarn build
       - name: Generate Fig Spec
-        run: ./bin/run generate-fig-spec > spec.ts
+        run: cd packages/cli && ./bin/run generate-fig-spec > spec.ts
       - name: Get Heroku Version
         id: cli-version
         run: echo "version=$(./bin/run --version | sed -rn 's/^heroku\/([0-9\.]+).*$/\1/p')"
       - name: Create Fig Autocomplete PR
-        uses: withfig/push-to-fig-autocomplete-action@v1
+        uses: withfig/push-to-fig-autocomplete-action@v2
         with:
           token: ${{ secrets.HEROKU_CLI_BOT_TOKEN }}
           autocomplete-spec-name: 'heroku'
-          spec-path: spec.ts
+          spec-path: ./packages/cli/spec.ts
           integration: oclif
           diff-based-versioning: true
           new-spec-version: ${{ steps.cli-version.outputs.version }}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index cfddeb5f3d..7a68e4bda8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -6,7 +6,6 @@
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
   "dependencies": {
-    "@fig/complete-oclif": "^2.0.0",
     "@heroku-cli/color": "1.1.14",
     "@heroku-cli/command": "^10.0.0",
     "@heroku-cli/command-v9": "npm:@heroku-cli/command@^9.0.2",
@@ -156,7 +155,6 @@
     ],
     "commands": "./lib/commands",
     "plugins": [
-      "@fig/complete-oclif",
       "@oclif/plugin-legacy",
       "@heroku-cli/plugin-addons-v5",
       "@heroku-cli/plugin-apps-v5",
diff --git a/packages/cli/test/acceptance/commands-output.ts b/packages/cli/test/acceptance/commands-output.ts
index e1db857262..2fc9e9636d 100644
--- a/packages/cli/test/acceptance/commands-output.ts
+++ b/packages/cli/test/acceptance/commands-output.ts
@@ -124,7 +124,6 @@ export default `\u001B[1m Command                                        Summary
  features:disable                               disables an app feature                                                                                                                                 
  features:enable                                enables an app feature                                                                                                                                  
  features:info                                  display information about a feature                                                                                                                     
- generate-fig-spec                              Generate a Fig completion spec
  git:clone                                      clones a heroku app to your local machine at DIRECTORY (defaults to app name)                                                                           
  git:remote                                     adds a git remote to an app repo                                                                                                                        
  help                                           Display help for heroku.                                                                                                                                
diff --git a/yarn.lock b/yarn.lock
index 7e3527e25a..967df784fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1128,16 +1128,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fig/complete-oclif@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@fig/complete-oclif@npm:2.0.0"
-  dependencies:
-    "@oclif/core": ^2.8.11
-    prettier: ^3.1.1
-  checksum: c7b148073456723cd85baaab5179a667c8078fb317ea03e184523ac9164ac4ff8f80452006c527e9c4340b08467fe480a2046554a5e6ca75b2e3aa1f27cac8da
-  languageName: node
-  linkType: hard
-
 "@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
@@ -10972,7 +10962,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "heroku@workspace:packages/cli"
   dependencies:
-    "@fig/complete-oclif": ^2.0.0
     "@heroku-cli/color": 1.1.14
     "@heroku-cli/command": ^10.0.0
     "@heroku-cli/command-v9": "npm:@heroku-cli/command@^9.0.2"
@@ -15650,15 +15639,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.1.1":
-  version: 3.2.5
-  resolution: "prettier@npm:3.2.5"
-  bin:
-    prettier: bin/prettier.cjs
-  checksum: 2ee4e1417572372afb7a13bb446b34f20f1bf1747db77cf6ccaf57a9be005f2f15c40f903d41a6b79eec3f57fff14d32a20fb6dee1f126da48908926fe43c311
-  languageName: node
-  linkType: hard
-
 "pretty-bytes@npm:^5.3.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"