Use stable deps.dev v3 API (google#882)

Deps.dev officially released their stable v3 API, and made their resolution client use it.
josieang · Mar 21, 2024 · 2f240e8 · 2f240e8
1 parent ab82e91
commit 2f240e8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -3,10 +3,10 @@ module github.com/google/osv-scanner
 go 1.21.8
 
 require (
-	deps.dev/api/v3alpha v0.0.0-20240312000934-38ffc8dd1d92
-	deps.dev/util/maven v0.0.0-20240312000934-38ffc8dd1d92
-	deps.dev/util/resolve v0.0.0-20240312000934-38ffc8dd1d92
-	deps.dev/util/semver v0.0.0-20240312000934-38ffc8dd1d92
+	deps.dev/api/v3 v3.0.0-20240318003216-81f538734eda
+	deps.dev/util/maven v0.0.0-20240318003216-81f538734eda
+	deps.dev/util/resolve v0.0.0-20240318003216-81f538734eda
+	deps.dev/util/semver v0.0.0-20240318003216-81f538734eda
 	github.com/BurntSushi/toml v1.3.2
 	github.com/CycloneDX/cyclonedx-go v0.8.0
 	github.com/charmbracelet/bubbles v0.18.0

diff --git a/go.sum b/go.sum
@@ -1,13 +1,13 @@
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-deps.dev/api/v3alpha v0.0.0-20240312000934-38ffc8dd1d92 h1:iOI1Nf2XI9FGluEmEFuKT6XgfFUb0LESmfUcVuOBNDA=
-deps.dev/api/v3alpha v0.0.0-20240312000934-38ffc8dd1d92/go.mod h1:uRN72FJn1F0FD/2ZYUOqdyFMu8VUsyHxvmZAMW30/DA=
-deps.dev/util/maven v0.0.0-20240312000934-38ffc8dd1d92 h1:Ddwk4QwKRzOFGtVCrll5F4tE22Fr0zPbt8bJf+plIPk=
-deps.dev/util/maven v0.0.0-20240312000934-38ffc8dd1d92/go.mod h1:SBW3EribdkZYk6zxi5oVn/ZECvi4ixb7EGgEWfSimNk=
-deps.dev/util/resolve v0.0.0-20240312000934-38ffc8dd1d92 h1:U8EfM+tLxvNJRELjYNH6f70vDe927q/Ywd3zJRx7G7c=
-deps.dev/util/resolve v0.0.0-20240312000934-38ffc8dd1d92/go.mod h1:jf1QVEA+0Tj8gSiKyKabwsx4M5zK1LC49xjphwNP5ko=
-deps.dev/util/semver v0.0.0-20240312000934-38ffc8dd1d92 h1:apadfwF7+yCUGynV8PuI0ERui4eELKE3AMeLiMnQGqU=
-deps.dev/util/semver v0.0.0-20240312000934-38ffc8dd1d92/go.mod h1:jkcH+k02gWHBiZ7G4OnUOkSZ6WDq54Pt5DrOA8FN8Uo=
+deps.dev/api/v3 v3.0.0-20240318003216-81f538734eda h1:PsXawR2L0l1oqy0mbydQO6KDvELa1rxxh0fb9WzMTOU=
+deps.dev/api/v3 v3.0.0-20240318003216-81f538734eda/go.mod h1:k3RHZwAw7ijqoXmVDvcO7ikeTwTC4jtmhCDathV+IKE=
+deps.dev/util/maven v0.0.0-20240318003216-81f538734eda h1:7itah956/F9BOpNY1rAmfayhliAUeEONUiLGFq/zV3Y=
+deps.dev/util/maven v0.0.0-20240318003216-81f538734eda/go.mod h1:SBW3EribdkZYk6zxi5oVn/ZECvi4ixb7EGgEWfSimNk=
+deps.dev/util/resolve v0.0.0-20240318003216-81f538734eda h1:Mi492CiTkpotwyxs4x5GtvvJngMU1luwHz87pgDJjTY=
+deps.dev/util/resolve v0.0.0-20240318003216-81f538734eda/go.mod h1:nNVaBL87+SIfv5gk8P26tpiF0+YqpW0gnXMe0066gtE=
+deps.dev/util/semver v0.0.0-20240318003216-81f538734eda h1:bSqyDUzYy/rudrbXtD/LGzAeVC5bObcmkje6E12JP8I=
+deps.dev/util/semver v0.0.0-20240318003216-81f538734eda/go.mod h1:jkcH+k02gWHBiZ7G4OnUOkSZ6WDq54Pt5DrOA8FN8Uo=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/CycloneDX/cyclonedx-go v0.8.0 h1:FyWVj6x6hoJrui5uRQdYZcSievw3Z32Z88uYzG/0D6M=

diff --git a/internal/resolution/client/depsdev_client.go b/internal/resolution/client/depsdev_client.go
@@ -5,7 +5,7 @@ import (
 	"encoding/gob"
 	"os"
 
-	pb "deps.dev/api/v3alpha"
+	pb "deps.dev/api/v3"
 	"deps.dev/util/resolve"
 	"github.com/google/osv-scanner/internal/resolution/datasource"
 )

diff --git a/internal/resolution/client/npm_registry_client.go b/internal/resolution/client/npm_registry_client.go
@@ -9,7 +9,7 @@ import (
 	"slices"
 	"strings"
 
-	pb "deps.dev/api/v3alpha"
+	pb "deps.dev/api/v3"
 	"deps.dev/util/resolve"
 	"deps.dev/util/resolve/dep"
 	"deps.dev/util/semver"

diff --git a/internal/resolution/datasource/depsdev_api.go b/internal/resolution/datasource/depsdev_api.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	pb "deps.dev/api/v3alpha"
+	pb "deps.dev/api/v3"
 	"github.com/google/osv-scanner/pkg/osv"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"

diff --git a/pkg/depsdev/license.go b/pkg/depsdev/license.go
@@ -9,7 +9,7 @@ import (
 	"github.com/google/osv-scanner/pkg/models"
 	"github.com/google/osv-scanner/pkg/osv"
 
-	depsdevpb "deps.dev/api/v3alpha"
+	depsdevpb "deps.dev/api/v3"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

diff --git a/pkg/osvscanner/osvscanner.go b/pkg/osvscanner/osvscanner.go
@@ -26,7 +26,7 @@ import (
 	"github.com/google/osv-scanner/pkg/osv"
 	"github.com/google/osv-scanner/pkg/reporter"
 
-	depsdevpb "deps.dev/api/v3alpha"
+	depsdevpb "deps.dev/api/v3"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/format/gitignore"
 )