🧹 migrate os/npm

we do not use it yet, but it will come up soon, so migrate Signed-off-by: Dominik Richter <[email protected]>
mondoohq · Sep 11, 2023 · 4d53feb · 4d53feb
1 parent 3384a16
commit 4d53feb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/_resources/packs/os/npm/packagejson.go → providers/os/resources/npm/packagejson.go b/_resources/packs/os/npm/packagejson.go → providers/os/resources/npm/packagejson.go
@@ -6,9 +6,8 @@ package npm
 import (
 	"encoding/json"
 	"io"
-	"io/ioutil"
 
-	"go.mondoo.com/cnquery/upstream/mvd"
+	"go.mondoo.com/cnquery/providers-sdk/v1/upstream/mvd"
 )
 
 // PackageJson allows parsing the package json file
@@ -34,7 +33,7 @@ type PackageJsonLock struct {
 }
 
 func ParsePackageJson(r io.Reader) ([]*mvd.Package, error) {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}
@@ -70,7 +69,7 @@ func ParsePackageJson(r io.Reader) ([]*mvd.Package, error) {
 }
 
 func ParsePackageJsonLock(r io.Reader) ([]*mvd.Package, error) {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}

diff --git a/_resources/packs/os/npm/packagejson_test.go → ...ders/os/resources/npm/packagejson_test.go b/_resources/packs/os/npm/packagejson_test.go → ...ders/os/resources/npm/packagejson_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.mondoo.com/cnquery/resources/packs/os/npm"
-	"go.mondoo.com/cnquery/upstream/mvd"
+	"go.mondoo.com/cnquery/providers-sdk/v1/upstream/mvd"
+	"go.mondoo.com/cnquery/providers/os/resources/npm"
 )
 
 func TestPackageJsonParser(t *testing.T) {

diff --git a/...ources/packs/os/npm/testdata/d3-yarn.lock → ...rs/os/resources/npm/testdata/d3-yarn.lock b/...ources/packs/os/npm/testdata/d3-yarn.lock → ...rs/os/resources/npm/testdata/d3-yarn.lock
diff --git a/...acks/os/npm/testdata/express-package.json → ...sources/npm/testdata/express-package.json b/...acks/os/npm/testdata/express-package.json → ...sources/npm/testdata/express-package.json
diff --git a/...os/npm/testdata/workbox-package-lock.json → ...es/npm/testdata/workbox-package-lock.json b/...os/npm/testdata/workbox-package-lock.json → ...es/npm/testdata/workbox-package-lock.json
diff --git a/_resources/packs/os/npm/yarn.go → providers/os/resources/npm/yarn.go b/_resources/packs/os/npm/yarn.go → providers/os/resources/npm/yarn.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/rs/zerolog/log"
-	"go.mondoo.com/cnquery/upstream/mvd"
+	"go.mondoo.com/cnquery/providers-sdk/v1/upstream/mvd"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/_resources/packs/os/npm/yarn_test.go → providers/os/resources/npm/yarn_test.go b/_resources/packs/os/npm/yarn_test.go → providers/os/resources/npm/yarn_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.mondoo.com/cnquery/resources/packs/os/npm"
-	"go.mondoo.com/cnquery/upstream/mvd"
+	"go.mondoo.com/cnquery/providers-sdk/v1/upstream/mvd"
+	"go.mondoo.com/cnquery/providers/os/resources/npm"
 )
 
 func TestYarnParser(t *testing.T) {