reorganize packages (#25)

* reorganize packages --------- Signed-off-by: Pablo Chacin <[email protected]>
grafana · Aug 27, 2024 · 777ef8e · 777ef8e
1 parent a44444d
commit 777ef8e
Show file tree

Hide file tree

Showing 35 changed files with 762 additions and 696 deletions.
diff --git a/README.md b/README.md
@@ -242,8 +242,7 @@ k6build server -e GOPROXY=http://localhost:80
 ## Flags
 
 ```
-  -f, --cache-dir string     cache dir (default "/tmp/buildservice")
-      --cache-url string     cache server url. If not specified, a local cache server is started
+      --cache-url string     cache server url (default "http://localhost:9000")
   -c, --catalog string       dependencies catalog (default "catalog.json")
   -g, --copy-go-env          copy go environment (default true)
   -e, --env stringToString   build environment variables (default [])

diff --git a/apiserver_test.go b/apiserver_test.go
diff --git a/build.go b/build.go
@@ -4,15 +4,11 @@ package k6build
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
-
-	"github.com/grafana/k6catalog"
-	"github.com/grafana/k6foundry"
 )
 
-const (
-	k6Dep = "k6"
-)
+var ErrBuildFailed = errors.New("build failed") //nolint:revive
 
 // Dependency contains the properties of a k6 dependency.
 type Dependency struct {
@@ -60,23 +56,3 @@ type BuildService interface {
 	// Build returns a k6 Artifact given its dependencies and version constrain
 	Build(ctx context.Context, platform string, k6Constrains string, deps []Dependency) (Artifact, error)
 }
-
-// implements the BuildService interface
-type localBuildSrv struct {
-	catalog k6catalog.Catalog
-	builder k6foundry.Builder
-	cache   Cache
-}
-
-// NewBuildService creates a build service
-func NewBuildService(
-	catalog k6catalog.Catalog,
-	builder k6foundry.Builder,
-	cache Cache,
-) BuildService {
-	return &localBuildSrv{
-		catalog: catalog,
-		builder: builder,
-		cache:   cache,
-	}
-}
diff --git a/cache.go b/cache.go
diff --git a/catalog.json b/catalog.json
@@ -1,5 +1,6 @@
 {
         "k6": {"module": "go.k6.io/k6", "versions": ["v0.50.0", "v0.51.0"]},
         "k6/x/kubernetes": {"module": "github.com/grafana/xk6-kubernetes", "versions": ["v0.8.0","v0.9.0"]},
+        "k6/x/sql": {"module": "github.com/grafana/xk6-sql", "versions": ["v0.4.0"]},
         "k6/x/output-kafka": {"module": "github.com/grafana/xk6-output-kafka", "versions": ["v0.7.0"]}
 }