From 18b1171b48b19abbb0043553d6b2d9651715d655 Mon Sep 17 00:00:00 2001
From: Josh W Lewis <josh.lewis@salesforce.com>
Date: Tue, 23 Apr 2024 15:28:50 -0500
Subject: [PATCH] Drop bzr dependency support (#553)

* Drop bzr dependency support

* Update changelog entry for bzr change
---
 CHANGELOG.md                           |  3 +++
 bin/compile                            |  1 -
 data.json                              |  3 ---
 files.json                             |  4 ----
 test/fixtures/mod-with-bzr-dep/go.mod  |  8 --------
 test/fixtures/mod-with-bzr-dep/go.sum  |  4 ----
 test/fixtures/mod-with-bzr-dep/main.go | 12 ------------
 test/run.sh                            | 15 ---------------
 8 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 test/fixtures/mod-with-bzr-dep/go.mod
 delete mode 100644 test/fixtures/mod-with-bzr-dep/go.sum
 delete mode 100644 test/fixtures/mod-with-bzr-dep/main.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db17696b..30ba1abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+* Drop support for installing bzr-hosted dependencies directly; bzr-hosted
+  dependencies may still be installed via `GOPROXY`
+
 ## [v190] - 2024-04-05
 
 * Add go1.22.2
diff --git a/bin/compile b/bin/compile
index 281a0f10..a90efeb1 100755
--- a/bin/compile
+++ b/bin/compile
@@ -24,7 +24,6 @@ GovendorVersion="$(<${DataJSON} jq -r '.Govendor.DefaultVersion')"
 GBVersion="$(<${DataJSON} jq -r '.GB.DefaultVersion')"
 PkgErrorsVersion="$(<${DataJSON} jq -r '.PkgErrors.DefaultVersion')"
 MercurialVersion="$(<${DataJSON} jq -r '.HG.DefaultVersion')"
-BazaarVersion="$(<${DataJSON} jq -r '.BZR.DefaultVersion')"
 MattesMigrateVersion="$(<${DataJSON} jq -r '.MattesMigrate.DefaultVersion')"
 GolangMigrateVersion="$(<${DataJSON} jq -r '.GolangMigrate.DefaultVersion')"
 TQVersion="$(<${DataJSON} jq -r '.tq.DefaultVersion')"
diff --git a/data.json b/data.json
index 6690b508..d74a9584 100644
--- a/data.json
+++ b/data.json
@@ -103,9 +103,6 @@
   "HG": {
     "DefaultVersion": "3.9"
   },
-  "BZR": {
-    "DefaultVersion": "2.7.0"
-  },
   "MattesMigrate": {
     "DefaultVersion": "v3.0.0"
   },
diff --git a/files.json b/files.json
index 46e8b40d..e035df30 100644
--- a/files.json
+++ b/files.json
@@ -1,8 +1,4 @@
 {
-  "bzr-2.7.0.tar.gz": {
-    "SHA": "0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3",
-    "URL": "https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz"
-  },
   "dep-linux-amd64": {
     "Comment": "This is here for backwards compat. Remove after a while.",
     "LocalName": "dep",
diff --git a/test/fixtures/mod-with-bzr-dep/go.mod b/test/fixtures/mod-with-bzr-dep/go.mod
deleted file mode 100644
index fbe77ddc..00000000
--- a/test/fixtures/mod-with-bzr-dep/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module github.com/heroku/fixture
-
-go 1.12
-
-require (
-	launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
-	launchpad.net/xmlpath v0.0.0-20130614043138-000000000004
-)
diff --git a/test/fixtures/mod-with-bzr-dep/go.sum b/test/fixtures/mod-with-bzr-dep/go.sum
deleted file mode 100644
index 6c2d93f2..00000000
--- a/test/fixtures/mod-with-bzr-dep/go.sum
+++ /dev/null
@@ -1,4 +0,0 @@
-launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54=
-launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
-launchpad.net/xmlpath v0.0.0-20130614043138-000000000004 h1:B8nNZBUrx8YufDCAJjvO/lVs4GxXMQHyrjwJdJzXMFg=
-launchpad.net/xmlpath v0.0.0-20130614043138-000000000004/go.mod h1:vqyExLOM3qBx7mvYRkoxjSCF945s0mbe7YynlKYXtsA=
diff --git a/test/fixtures/mod-with-bzr-dep/main.go b/test/fixtures/mod-with-bzr-dep/main.go
deleted file mode 100644
index f03f7198..00000000
--- a/test/fixtures/mod-with-bzr-dep/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"launchpad.net/xmlpath"
-)
-
-func main() {
-	fmt.Println(xmlpath.Path{})
-	fmt.Println("fixture")
-}
diff --git a/test/run.sh b/test/run.sh
index d68150a7..7c2f2abc 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,21 +1,6 @@
 #!/usr/bin/env bash
 # See README.md for info on running these tests.
 
-testModWithBZRDep() {
-  fixture "mod-with-bzr-dep"
-
-  assertDetected
-
-  compile
-  assertModulesBoilerplateCaptured
-  assertGoInstallCaptured "go1.12.17"
-  assertGoInstallOnlyFixturePackageCaptured
-
-  assertCapturedExitSuccess
-  assertInstalledFixtureBinary
-  assertFile "web: bin/fixture" "Procfile"
-}
-
 testTestPackModulesVendoredGolangLintCI() {
   fixture "mod-deps-vendored-with-tests"