From 90ad37f70a330fda7b18bb76e8d30866728083ef Mon Sep 17 00:00:00 2001
From: William Burton <165080750+wbxyz@users.noreply.github.com>
Date: Wed, 22 May 2024 22:24:47 +0000
Subject: [PATCH] Fix library imports.

---
 go.mod                  | 1 +
 go.sum                  | 2 ++
 tools/ctl/ctl.go        | 2 +-
 tools/indexscan/main.go | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index ab746e99..d1758d26 100644
--- a/go.mod
+++ b/go.mod
@@ -44,6 +44,7 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-yaml/yaml v2.1.0+incompatible // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
diff --git a/go.sum b/go.sum
index 97151c59..2ed5b8af 100644
--- a/go.sum
+++ b/go.sum
@@ -86,6 +86,8 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
+github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
diff --git a/tools/ctl/ctl.go b/tools/ctl/ctl.go
index 2b823e02..8486efa4 100644
--- a/tools/ctl/ctl.go
+++ b/tools/ctl/ctl.go
@@ -33,6 +33,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/go-yaml/yaml"
 	"github.com/google/oss-rebuild/internal/oauth"
 	"github.com/google/oss-rebuild/pkg/rebuild/rebuild"
 	"github.com/google/oss-rebuild/pkg/rebuild/schema"
@@ -42,7 +43,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/pkg/errors"
 	"github.com/cheggaaa/pb"
-	"google3/third_party/golang/yaml/yaml"
 )
 
 var rootCmd = &cobra.Command{
diff --git a/tools/indexscan/main.go b/tools/indexscan/main.go
index cf4d2f82..77a01be0 100644
--- a/tools/indexscan/main.go
+++ b/tools/indexscan/main.go
@@ -35,7 +35,7 @@ import (
 	"github.com/pkg/errors"
 	git "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/cache"
-	"google3/third_party/golang/gitv5/plumbing/filemode/filemode"
+	"github.com/go-git/go-git/v5/plumbing/filemode"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/storage/filesystem"