internal: move packages to internal
Move packages to internal as we rework the API.
Change-Id: I8a8e6ac1a9a25f1955e77cd406c7211c00a25208
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/475015
Run-TryBot: Julie Qiu <julieqiu@google.com>
Reviewed-by: Julie Qiu <julieqiu@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
diff --git a/cmd/govulncheck/doc.go b/cmd/govulncheck/doc.go
index 145f575..d329d8a 100644
--- a/cmd/govulncheck/doc.go
+++ b/cmd/govulncheck/doc.go
@@ -72,7 +72,7 @@
# Limitations
-Govulncheck uses [golang.org/x/vuln/vulncheck], which has these limitations:
+Govulncheck has these limitations:
- Govulncheck analyzes function pointer and interface calls conservatively,
which may result in false positives or inaccurate call stacks in some cases.
diff --git a/doc/vulndb.md b/doc/vulndb.md
index c885b0a..388a89d 100644
--- a/doc/vulndb.md
+++ b/doc/vulndb.md
@@ -3,10 +3,7 @@
## Accessing the database
The Go vulnerability database is rooted at
-`https://vuln.go.dev` and provides data as JSON. We
-recommend using
-[client.Client](https://pkg.go.dev/golang.org/x/vuln/client#Client) to read
-data from the Go vulnerability database.
+`https://vuln.go.dev` and provides data as JSON.
Do not rely on the contents of the x/vulndb repository. The YAML files in that
repository are maintained using an internal format that is subject to change
diff --git a/exp/README.md b/exp/README.md
deleted file mode 100644
index d7f8300..0000000
--- a/exp/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### Experimental Packages
-
-This directory holds experimental packages for x/vuln.
-
-It was originally created in order to provide exported APIs for experimental IDE features, through integration with gopls. These APIs would otherwise be kept under internal/, since they are likely to be unstable.
-
-Warning: Packages here are experimental and unreliable. Some may one day be promoted to an exported package under this repository, or they may be modified arbitrarily or even disappear altogether.
-
-In short, there is no compatibility promise for code in this directory. (There is currently no compatibility promise for the entire x/vuln repository, since it is untagged, but other packages can be expected to be relatively stable. Packages under this directory are likely to change without warning.)
-
-Caveat emptor.
diff --git a/exp/govulncheck/govulncheck.go b/exp/govulncheck/govulncheck.go
deleted file mode 100644
index 2b4fb8c..0000000
--- a/exp/govulncheck/govulncheck.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package govulncheck provides an experimental govulncheck API.
-package govulncheck
-
-import (
- "golang.org/x/vuln/internal/govulncheck"
- "golang.org/x/vuln/internal/result"
-)
-
-var (
- // Source reports vulnerabilities that affect the analyzed packages.
- Source = govulncheck.Source
-
- // DefaultCache constructs cache for a vulnerability database client.
- DefaultCache = govulncheck.DefaultCache
-)
-
-type (
- // Config is the configuration for Main.
- Config = govulncheck.Config
-
- // Result is the result of executing Source.
- Result = result.Result
-
- // Vuln represents a single OSV entry.
- Vuln = result.Vuln
-
- // Module represents a specific vulnerability relevant to a
- // single module or package.
- Module = result.Module
-
- // Package is a Go package with known vulnerable symbols.
- Package = result.Package
-
- // CallStacks contains a representative call stack for each
- // vulnerable symbol that is called.
- CallStack = result.CallStack
-
- // StackFrame represents a call stack entry.
- StackFrame = result.StackFrame
-)
diff --git a/client/cache.go b/internal/client/cache.go
similarity index 100%
rename from client/cache.go
rename to internal/client/cache.go
diff --git a/client/client.go b/internal/client/client.go
similarity index 100%
rename from client/client.go
rename to internal/client/client.go
diff --git a/client/client_test.go b/internal/client/client_test.go
similarity index 100%
rename from client/client_test.go
rename to internal/client/client_test.go
diff --git a/client/file.go b/internal/client/file.go
similarity index 100%
rename from client/file.go
rename to internal/client/file.go
diff --git a/client/http.go b/internal/client/http.go
similarity index 100%
rename from client/http.go
rename to internal/client/http.go
diff --git a/client/testdata/vulndb/ID/GO-2021-0157.json b/internal/client/testdata/vulndb/ID/GO-2021-0157.json
similarity index 100%
rename from client/testdata/vulndb/ID/GO-2021-0157.json
rename to internal/client/testdata/vulndb/ID/GO-2021-0157.json
diff --git a/client/testdata/vulndb/ID/GO-2021-0159.json b/internal/client/testdata/vulndb/ID/GO-2021-0159.json
similarity index 100%
rename from client/testdata/vulndb/ID/GO-2021-0159.json
rename to internal/client/testdata/vulndb/ID/GO-2021-0159.json
diff --git a/client/testdata/vulndb/ID/GO-2022-0463.json b/internal/client/testdata/vulndb/ID/GO-2022-0463.json
similarity index 100%
rename from client/testdata/vulndb/ID/GO-2022-0463.json
rename to internal/client/testdata/vulndb/ID/GO-2022-0463.json
diff --git a/client/testdata/vulndb/ID/GO-2022-0569.json b/internal/client/testdata/vulndb/ID/GO-2022-0569.json
similarity index 100%
rename from client/testdata/vulndb/ID/GO-2022-0569.json
rename to internal/client/testdata/vulndb/ID/GO-2022-0569.json
diff --git a/client/testdata/vulndb/ID/GO-2022-0572.json b/internal/client/testdata/vulndb/ID/GO-2022-0572.json
similarity index 100%
rename from client/testdata/vulndb/ID/GO-2022-0572.json
rename to internal/client/testdata/vulndb/ID/GO-2022-0572.json
diff --git a/client/testdata/vulndb/ID/index.json b/internal/client/testdata/vulndb/ID/index.json
similarity index 100%
rename from client/testdata/vulndb/ID/index.json
rename to internal/client/testdata/vulndb/ID/index.json
diff --git a/client/testdata/vulndb/aliases.json b/internal/client/testdata/vulndb/aliases.json
similarity index 100%
rename from client/testdata/vulndb/aliases.json
rename to internal/client/testdata/vulndb/aliases.json
diff --git "a/client/testdata/vulndb/github.com/\041bee\041go/beego.json" "b/internal/client/testdata/vulndb/github.com/\041bee\041go/beego.json"
similarity index 100%
rename from "client/testdata/vulndb/github.com/\041bee\041go/beego.json"
rename to "internal/client/testdata/vulndb/github.com/\041bee\041go/beego.json"
diff --git a/client/testdata/vulndb/github.com/tidwall/gjson.json b/internal/client/testdata/vulndb/github.com/tidwall/gjson.json
similarity index 100%
rename from client/testdata/vulndb/github.com/tidwall/gjson.json
rename to internal/client/testdata/vulndb/github.com/tidwall/gjson.json
diff --git a/client/testdata/vulndb/index.json b/internal/client/testdata/vulndb/index.json
similarity index 100%
rename from client/testdata/vulndb/index.json
rename to internal/client/testdata/vulndb/index.json
diff --git a/internal/govulncheck/binary_118.go b/internal/govulncheck/binary_118.go
index de71f3d..74a9219 100644
--- a/internal/govulncheck/binary_118.go
+++ b/internal/govulncheck/binary_118.go
@@ -11,7 +11,7 @@
"context"
"io"
- "golang.org/x/vuln/vulncheck"
+ "golang.org/x/vuln/internal/vulncheck"
)
func binary(ctx context.Context, exe io.ReaderAt, cfg *vulncheck.Config) (_ *vulncheck.Result, err error) {
diff --git a/internal/govulncheck/binary_not118.go b/internal/govulncheck/binary_not118.go
index 06b43e2..474a6b4 100644
--- a/internal/govulncheck/binary_not118.go
+++ b/internal/govulncheck/binary_not118.go
@@ -12,7 +12,7 @@
"errors"
"io"
- "golang.org/x/vuln/vulncheck"
+ "golang.org/x/vuln/internal/vulncheck"
)
func binary(ctx context.Context, exe io.ReaderAt, cfg *vulncheck.Config) (_ *vulncheck.Result, err error) {
diff --git a/internal/govulncheck/cache.go b/internal/govulncheck/cache.go
index 24f3a4d..6d341aa 100644
--- a/internal/govulncheck/cache.go
+++ b/internal/govulncheck/cache.go
@@ -11,8 +11,8 @@
"sync"
"time"
- "golang.org/x/vuln/client"
"golang.org/x/vuln/internal"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/osv"
)
diff --git a/internal/govulncheck/cache_test.go b/internal/govulncheck/cache_test.go
index adda1e9..6debd32 100644
--- a/internal/govulncheck/cache_test.go
+++ b/internal/govulncheck/cache_test.go
@@ -13,7 +13,7 @@
"time"
"golang.org/x/sync/errgroup"
- "golang.org/x/vuln/client"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/osv"
)
diff --git a/internal/govulncheck/callstacks.go b/internal/govulncheck/callstacks.go
index f9b1f2b..74728f6 100644
--- a/internal/govulncheck/callstacks.go
+++ b/internal/govulncheck/callstacks.go
@@ -13,7 +13,7 @@
"golang.org/x/vuln/internal"
"golang.org/x/vuln/internal/result"
- "golang.org/x/vuln/vulncheck"
+ "golang.org/x/vuln/internal/vulncheck"
)
// updateInitPositions populates non-existing positions of init functions
diff --git a/internal/govulncheck/callstacks_test.go b/internal/govulncheck/callstacks_test.go
index dc3c869..66f9a9b 100644
--- a/internal/govulncheck/callstacks_test.go
+++ b/internal/govulncheck/callstacks_test.go
@@ -16,8 +16,8 @@
"golang.org/x/tools/go/packages/packagestest"
"golang.org/x/vuln/internal/result"
"golang.org/x/vuln/internal/test"
+ "golang.org/x/vuln/internal/vulncheck"
"golang.org/x/vuln/osv"
- "golang.org/x/vuln/vulncheck"
)
func TestUniqueCallStack(t *testing.T) {
diff --git a/internal/govulncheck/json.go b/internal/govulncheck/json.go
index 7eec6a7..7b36c98 100644
--- a/internal/govulncheck/json.go
+++ b/internal/govulncheck/json.go
@@ -11,7 +11,7 @@
"io"
- "golang.org/x/vuln/client"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/internal/result"
)
diff --git a/internal/govulncheck/result.go b/internal/govulncheck/result.go
index f44bed7..dc3a6db 100644
--- a/internal/govulncheck/result.go
+++ b/internal/govulncheck/result.go
@@ -10,7 +10,7 @@
"strings"
"golang.org/x/tools/go/packages"
- "golang.org/x/vuln/client"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/internal/result"
)
diff --git a/internal/govulncheck/result_test.go b/internal/govulncheck/result_test.go
index 2bee377..c0997aa 100644
--- a/internal/govulncheck/result_test.go
+++ b/internal/govulncheck/result_test.go
@@ -19,20 +19,20 @@
}{
{
&result.StackFrame{
- PkgPath: "golang.org/x/vuln/vulncheck",
+ PkgPath: "golang.org/x/vuln/internal/vulncheck",
FuncName: "Foo",
Position: token.Position{Filename: "some/path/file.go", Line: 12},
},
- "golang.org/x/vuln/vulncheck.Foo",
+ "golang.org/x/vuln/internal/vulncheck.Foo",
"some/path/file.go:12",
},
{
&result.StackFrame{
- PkgPath: "golang.org/x/vuln/vulncheck",
- RecvType: "golang.org/x/vuln/vulncheck.Bar",
+ PkgPath: "golang.org/x/vuln/internal/vulncheck",
+ RecvType: "golang.org/x/vuln/internal/vulncheck.Bar",
FuncName: "Foo",
},
- "golang.org/x/vuln/vulncheck.Bar.Foo",
+ "golang.org/x/vuln/internal/vulncheck.Bar.Foo",
"",
},
} {
diff --git a/internal/govulncheck/run.go b/internal/govulncheck/run.go
index a02052f..efb590d 100644
--- a/internal/govulncheck/run.go
+++ b/internal/govulncheck/run.go
@@ -12,8 +12,8 @@
"sort"
"golang.org/x/vuln/internal/result"
+ "golang.org/x/vuln/internal/vulncheck"
"golang.org/x/vuln/osv"
- "golang.org/x/vuln/vulncheck"
)
// Source reports vulnerabilities that affect the analyzed packages.
diff --git a/internal/govulncheck/scan.go b/internal/govulncheck/scan.go
index b8206f0..da626ee 100644
--- a/internal/govulncheck/scan.go
+++ b/internal/govulncheck/scan.go
@@ -16,9 +16,9 @@
"golang.org/x/tools/go/buildutil"
"golang.org/x/tools/go/packages"
- "golang.org/x/vuln/client"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/internal/result"
- "golang.org/x/vuln/vulncheck"
+ "golang.org/x/vuln/internal/vulncheck"
)
func Main(ctx context.Context, args []string, w io.Writer) (err error) {
diff --git a/internal/govulncheck/text.go b/internal/govulncheck/text.go
index d21da4f..35434d0 100644
--- a/internal/govulncheck/text.go
+++ b/internal/govulncheck/text.go
@@ -14,11 +14,11 @@
"text/template"
"time"
- "golang.org/x/vuln/client"
"golang.org/x/vuln/internal"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/internal/result"
+ "golang.org/x/vuln/internal/vulncheck"
"golang.org/x/vuln/osv"
- "golang.org/x/vuln/vulncheck"
)
const (
diff --git a/internal/govulncheck/util.go b/internal/govulncheck/util.go
index 916004e..d4af133 100644
--- a/internal/govulncheck/util.go
+++ b/internal/govulncheck/util.go
@@ -11,8 +11,8 @@
"golang.org/x/vuln/internal"
"golang.org/x/vuln/internal/result"
isem "golang.org/x/vuln/internal/semver"
+ "golang.org/x/vuln/internal/vulncheck"
"golang.org/x/vuln/osv"
- "golang.org/x/vuln/vulncheck"
)
// latestFixed returns the latest fixed version in the list of affected ranges,
diff --git a/internal/govulncheck/util_test.go b/internal/govulncheck/util_test.go
index c2a8711..0866623 100644
--- a/internal/govulncheck/util_test.go
+++ b/internal/govulncheck/util_test.go
@@ -7,8 +7,8 @@
import (
"testing"
+ "golang.org/x/vuln/internal/vulncheck"
"golang.org/x/vuln/osv"
- "golang.org/x/vuln/vulncheck"
)
func TestPkgPath(t *testing.T) {
diff --git a/internal/govulncheck/utils.go b/internal/govulncheck/utils.go
index 0af2bed..3a28f5d 100644
--- a/internal/govulncheck/utils.go
+++ b/internal/govulncheck/utils.go
@@ -10,7 +10,7 @@
"strings"
"time"
- "golang.org/x/vuln/vulncheck"
+ "golang.org/x/vuln/internal/vulncheck"
)
// compact replaces consecutive runs of equal elements with a single copy.
diff --git a/internal/test/client.go b/internal/test/client.go
index 086196d..247c503 100644
--- a/internal/test/client.go
+++ b/internal/test/client.go
@@ -7,7 +7,7 @@
import (
"context"
- "golang.org/x/vuln/client"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/osv"
)
diff --git a/vulncheck/binary.go b/internal/vulncheck/binary.go
similarity index 98%
rename from vulncheck/binary.go
rename to internal/vulncheck/binary.go
index 085d2cf..f37ef7d 100644
--- a/vulncheck/binary.go
+++ b/internal/vulncheck/binary.go
@@ -17,7 +17,7 @@
"golang.org/x/tools/go/packages"
"golang.org/x/vuln/internal/derrors"
"golang.org/x/vuln/internal/semver"
- "golang.org/x/vuln/vulncheck/internal/buildinfo"
+ "golang.org/x/vuln/internal/vulncheck/internal/buildinfo"
)
// Binary detects presence of vulnerable symbols in exe.
diff --git a/vulncheck/binary_test.go b/internal/vulncheck/binary_test.go
similarity index 98%
rename from vulncheck/binary_test.go
rename to internal/vulncheck/binary_test.go
index a67f23d..b1f0d09 100644
--- a/vulncheck/binary_test.go
+++ b/internal/vulncheck/binary_test.go
@@ -22,7 +22,7 @@
"github.com/google/go-cmp/cmp/cmpopts"
"golang.org/x/tools/go/packages/packagestest"
"golang.org/x/vuln/internal/semver"
- "golang.org/x/vuln/vulncheck/internal/buildinfo"
+ "golang.org/x/vuln/internal/vulncheck/internal/buildinfo"
)
// TODO: we build binary programatically, so what if the underlying tool chain changes?
diff --git a/vulncheck/doc.go b/internal/vulncheck/doc.go
similarity index 96%
rename from vulncheck/doc.go
rename to internal/vulncheck/doc.go
index f141c0f..bfeba7d 100644
--- a/vulncheck/doc.go
+++ b/internal/vulncheck/doc.go
@@ -29,7 +29,7 @@
Both [Source] and [Binary] require information about known
vulnerabilities in the form of a vulnerability database,
-specifically a [golang.org/x/vuln/client.Client].
+specifically a [golang.org/x/vuln/internal/client.Client].
The vulnerabilities
are modeled using the [golang.org/x/vuln/osv] format.
diff --git a/vulncheck/entries.go b/internal/vulncheck/entries.go
similarity index 100%
rename from vulncheck/entries.go
rename to internal/vulncheck/entries.go
diff --git a/vulncheck/fetch.go b/internal/vulncheck/fetch.go
similarity index 97%
rename from vulncheck/fetch.go
rename to internal/vulncheck/fetch.go
index 2cadd15..ca10e91 100644
--- a/vulncheck/fetch.go
+++ b/internal/vulncheck/fetch.go
@@ -8,8 +8,8 @@
"context"
"fmt"
- "golang.org/x/vuln/client"
"golang.org/x/vuln/internal"
+ "golang.org/x/vuln/internal/client"
)
var stdlibModule = &Module{
diff --git a/vulncheck/fetch_test.go b/internal/vulncheck/fetch_test.go
similarity index 100%
rename from vulncheck/fetch_test.go
rename to internal/vulncheck/fetch_test.go
diff --git a/vulncheck/helpers_test.go b/internal/vulncheck/helpers_test.go
similarity index 100%
rename from vulncheck/helpers_test.go
rename to internal/vulncheck/helpers_test.go
diff --git a/vulncheck/internal/buildinfo/README.md b/internal/vulncheck/internal/buildinfo/README.md
similarity index 100%
rename from vulncheck/internal/buildinfo/README.md
rename to internal/vulncheck/internal/buildinfo/README.md
diff --git a/vulncheck/internal/buildinfo/additions_buildinfo.go b/internal/vulncheck/internal/buildinfo/additions_buildinfo.go
similarity index 100%
rename from vulncheck/internal/buildinfo/additions_buildinfo.go
rename to internal/vulncheck/internal/buildinfo/additions_buildinfo.go
diff --git a/vulncheck/internal/buildinfo/additions_scan.go b/internal/vulncheck/internal/buildinfo/additions_scan.go
similarity index 98%
rename from vulncheck/internal/buildinfo/additions_scan.go
rename to internal/vulncheck/internal/buildinfo/additions_scan.go
index 4f2bbe0..1582f3f 100644
--- a/vulncheck/internal/buildinfo/additions_scan.go
+++ b/internal/vulncheck/internal/buildinfo/additions_scan.go
@@ -20,7 +20,7 @@
"strings"
"golang.org/x/tools/go/packages"
- "golang.org/x/vuln/vulncheck/internal/gosym"
+ "golang.org/x/vuln/internal/vulncheck/internal/gosym"
)
func debugModulesToPackagesModules(debugModules []*debug.Module) []*packages.Module {
diff --git a/vulncheck/internal/buildinfo/additions_scan_test.go b/internal/vulncheck/internal/buildinfo/additions_scan_test.go
similarity index 100%
rename from vulncheck/internal/buildinfo/additions_scan_test.go
rename to internal/vulncheck/internal/buildinfo/additions_scan_test.go
diff --git a/vulncheck/internal/buildinfo/buildinfo.go b/internal/vulncheck/internal/buildinfo/buildinfo.go
similarity index 100%
rename from vulncheck/internal/buildinfo/buildinfo.go
rename to internal/vulncheck/internal/buildinfo/buildinfo.go
diff --git a/vulncheck/internal/buildinfo/testdata/main.go b/internal/vulncheck/internal/buildinfo/testdata/main.go
similarity index 100%
rename from vulncheck/internal/buildinfo/testdata/main.go
rename to internal/vulncheck/internal/buildinfo/testdata/main.go
diff --git a/vulncheck/internal/gosym/README.md b/internal/vulncheck/internal/gosym/README.md
similarity index 100%
rename from vulncheck/internal/gosym/README.md
rename to internal/vulncheck/internal/gosym/README.md
diff --git a/vulncheck/internal/gosym/additions.go b/internal/vulncheck/internal/gosym/additions.go
similarity index 100%
rename from vulncheck/internal/gosym/additions.go
rename to internal/vulncheck/internal/gosym/additions.go
diff --git a/vulncheck/internal/gosym/additions_test.go b/internal/vulncheck/internal/gosym/additions_test.go
similarity index 100%
rename from vulncheck/internal/gosym/additions_test.go
rename to internal/vulncheck/internal/gosym/additions_test.go
diff --git a/vulncheck/internal/gosym/pclntab.go b/internal/vulncheck/internal/gosym/pclntab.go
similarity index 100%
rename from vulncheck/internal/gosym/pclntab.go
rename to internal/vulncheck/internal/gosym/pclntab.go
diff --git a/vulncheck/internal/gosym/pclntab_test.go b/internal/vulncheck/internal/gosym/pclntab_test.go
similarity index 100%
rename from vulncheck/internal/gosym/pclntab_test.go
rename to internal/vulncheck/internal/gosym/pclntab_test.go
diff --git a/vulncheck/internal/gosym/symtab.go b/internal/vulncheck/internal/gosym/symtab.go
similarity index 100%
rename from vulncheck/internal/gosym/symtab.go
rename to internal/vulncheck/internal/gosym/symtab.go
diff --git a/vulncheck/internal/gosym/symtab_test.go b/internal/vulncheck/internal/gosym/symtab_test.go
similarity index 100%
rename from vulncheck/internal/gosym/symtab_test.go
rename to internal/vulncheck/internal/gosym/symtab_test.go
diff --git a/vulncheck/internal/gosym/testdata/main.go b/internal/vulncheck/internal/gosym/testdata/main.go
similarity index 100%
rename from vulncheck/internal/gosym/testdata/main.go
rename to internal/vulncheck/internal/gosym/testdata/main.go
diff --git a/vulncheck/internal/gosym/testdata/pclinetest.h b/internal/vulncheck/internal/gosym/testdata/pclinetest.h
similarity index 100%
rename from vulncheck/internal/gosym/testdata/pclinetest.h
rename to internal/vulncheck/internal/gosym/testdata/pclinetest.h
diff --git a/vulncheck/internal/gosym/testdata/pclinetest.s b/internal/vulncheck/internal/gosym/testdata/pclinetest.s
similarity index 100%
rename from vulncheck/internal/gosym/testdata/pclinetest.s
rename to internal/vulncheck/internal/gosym/testdata/pclinetest.s
diff --git a/vulncheck/internal/gosym/testdata/pcln115.gz b/internal/vulncheck/internal/gosym/testdata/pcln115.gz
similarity index 100%
rename from vulncheck/internal/gosym/testdata/pcln115.gz
rename to internal/vulncheck/internal/gosym/testdata/pcln115.gz
Binary files differ
diff --git a/vulncheck/lib.sh b/internal/vulncheck/lib.sh
similarity index 100%
rename from vulncheck/lib.sh
rename to internal/vulncheck/lib.sh
diff --git a/vulncheck/slicing.go b/internal/vulncheck/slicing.go
similarity index 100%
rename from vulncheck/slicing.go
rename to internal/vulncheck/slicing.go
diff --git a/vulncheck/slicing_test.go b/internal/vulncheck/slicing_test.go
similarity index 100%
rename from vulncheck/slicing_test.go
rename to internal/vulncheck/slicing_test.go
diff --git a/vulncheck/source.go b/internal/vulncheck/source.go
similarity index 100%
rename from vulncheck/source.go
rename to internal/vulncheck/source.go
diff --git a/vulncheck/source_test.go b/internal/vulncheck/source_test.go
similarity index 100%
rename from vulncheck/source_test.go
rename to internal/vulncheck/source_test.go
diff --git a/vulncheck/tools_test.go b/internal/vulncheck/tools_test.go
similarity index 100%
rename from vulncheck/tools_test.go
rename to internal/vulncheck/tools_test.go
diff --git a/vulncheck/utils.go b/internal/vulncheck/utils.go
similarity index 100%
rename from vulncheck/utils.go
rename to internal/vulncheck/utils.go
diff --git a/vulncheck/vulncheck.go b/internal/vulncheck/vulncheck.go
similarity index 99%
rename from vulncheck/vulncheck.go
rename to internal/vulncheck/vulncheck.go
index 2b2ab6e..b8caa11 100644
--- a/vulncheck/vulncheck.go
+++ b/internal/vulncheck/vulncheck.go
@@ -13,7 +13,7 @@
"time"
"golang.org/x/tools/go/packages"
- "golang.org/x/vuln/client"
+ "golang.org/x/vuln/internal/client"
"golang.org/x/vuln/osv"
)
diff --git a/vulncheck/vulncheck_test.go b/internal/vulncheck/vulncheck_test.go
similarity index 100%
rename from vulncheck/vulncheck_test.go
rename to internal/vulncheck/vulncheck_test.go
diff --git a/vulncheck/witness.go b/internal/vulncheck/witness.go
similarity index 100%
rename from vulncheck/witness.go
rename to internal/vulncheck/witness.go
diff --git a/vulncheck/witness_test.go b/internal/vulncheck/witness_test.go
similarity index 100%
rename from vulncheck/witness_test.go
rename to internal/vulncheck/witness_test.go
