Merge dashboard lib (#12512)

* change dashboard module path * dashboard lib * fix go mod
smartcontractkit · Mar 20, 2024 · 48779ad · 48779ad
1 parent ece2329
commit 48779ad
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 10 deletions.
diff --git a/charts/chainlink-cluster/dashboard/cmd/deploy.go b/charts/chainlink-cluster/dashboard/cmd/deploy.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"github.com/K-Phoen/grabana/dashboard"
-	lib "github.com/smartcontractkit/chainlink/dashboard-lib/lib"
-	core_don "github.com/smartcontractkit/chainlink/dashboard-lib/lib/core-don"
-	k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/lib/k8s-pods"
+	lib "github.com/smartcontractkit/chainlink/dashboard-lib"
+	core_don "github.com/smartcontractkit/chainlink/dashboard-lib/core-don"
+	k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/k8s-pods"
 	waspdb "github.com/smartcontractkit/wasp/dashboard"
 )
 

diff --git a/charts/chainlink-cluster/go.mod b/charts/chainlink-cluster/go.mod
@@ -4,7 +4,7 @@ go 1.21.7
 
 require (
 	github.com/K-Phoen/grabana v0.22.1
-	github.com/smartcontractkit/chainlink/dashboard-lib v0.22.1
+	github.com/smartcontractkit/chainlink/dashboard-lib v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/wasp v0.4.6
 )
 
@@ -34,5 +34,5 @@ replace (
 	github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f
 
 	github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
-	github.com/smartcontractkit/chainlink/dashboard-lib => ../../dashboard
+	github.com/smartcontractkit/chainlink/dashboard-lib => ../../dashboard-lib
 )
diff --git a/dashboard/README.md → dashboard-lib/README.md b/dashboard/README.md → dashboard-lib/README.md
@@ -21,4 +21,4 @@ Components should be imported from this module, see [example](../charts/chainlin
 ## How to convert from JSON using Grabana codegen utility
 1. Download Grabana binary [here](https://github.com/K-Phoen/grabana/releases)
 2. ./bin/grabana convert-go -i dashboard.json > lib/my_new_component/rows.go
-3. Create a [component](lib/k8s-pods/component.go)
+3. Create a [component](k8s-pods/component.go)
diff --git a/...oard/lib/ccip-load-test-view/component.go → ...oard-lib/ccip-load-test-view/component.go b/...oard/lib/ccip-load-test-view/component.go → ...oard-lib/ccip-load-test-view/component.go
diff --git a/dashboard/lib/config.go → dashboard-lib/config.go b/dashboard/lib/config.go → dashboard-lib/config.go
@@ -1,4 +1,4 @@
-package dashboardlib
+package dashboard_lib
 
 import "os"
 

diff --git a/dashboard/lib/core-don/component.go → dashboard-lib/core-don/component.go b/dashboard/lib/core-don/component.go → dashboard-lib/core-don/component.go
diff --git a/dashboard/lib/core-don/platform.go → dashboard-lib/core-don/platform.go b/dashboard/lib/core-don/platform.go → dashboard-lib/core-don/platform.go
diff --git a/dashboard/lib/core-ocrv2-ccip/component.go → dashboard-lib/core-ocrv2-ccip/component.go b/dashboard/lib/core-ocrv2-ccip/component.go → dashboard-lib/core-ocrv2-ccip/component.go
diff --git a/dashboard/lib/dashboard.go → dashboard-lib/dashboard.go b/dashboard/lib/dashboard.go → dashboard-lib/dashboard.go
@@ -1,4 +1,4 @@
-package dashboardlib
+package dashboard_lib
 
 import (
 	"context"

diff --git a/dashboard/go.mod → dashboard-lib/go.mod b/dashboard/go.mod → dashboard-lib/go.mod
@@ -1,4 +1,4 @@
-module github.com/smartcontractkit/chainlink/v2/dashboard-lib
+module github.com/smartcontractkit/chainlink/dashboard-lib
 
 go 1.21.7
 

diff --git a/dashboard/go.sum → dashboard-lib/go.sum b/dashboard/go.sum → dashboard-lib/go.sum
diff --git a/dashboard/lib/k8s-pods/component.go → dashboard-lib/k8s-pods/component.go b/dashboard/lib/k8s-pods/component.go → dashboard-lib/k8s-pods/component.go
diff --git a/dashboard/lib/log.go → dashboard-lib/log.go b/dashboard/lib/log.go → dashboard-lib/log.go
@@ -1,4 +1,4 @@
-package dashboardlib
+package dashboard_lib
 
 import (
 	"os"