Merge remote-tracking branch 'origin/develop' into feat/EE-189/EE-577/support-git-automated-sync-for-k8s-applications

2021-09-29 17:18:14 +13:00
parent 99ff9b21f9 e3b6e4a1d3
commit 79e0cef09c
75 changed files with 2166 additions and 1256 deletions
--- a/api/http/handler/stacks/webhook_invoke_test.go
+++ b/api/http/handler/stacks/webhook_invoke_test.go
@@ -6,15 +6,13 @@ import (
 	"testing"

 	"github.com/gofrs/uuid"
-	"github.com/stretchr/testify/assert"
-
 	portainer "github.com/portainer/portainer/api"
-
-	"github.com/portainer/portainer/api/bolt/bolttest"
+	"github.com/portainer/portainer/api/bolt"
+	"github.com/stretchr/testify/assert"
 )

 func TestHandler_webhookInvoke(t *testing.T) {
-	store, teardown := bolttest.MustNewTestStore(true)
+	store, teardown := bolt.MustNewTestStore(true)
 	defer teardown()

 	webhookID := newGuidString(t)