edge sdk config (#112)

controller/disable.go

@@ -96,7 +96,7 @@ func (h *disableHandler) removeServicesForEnvironment(envId int, tx *sqlx.Tx, ed
 		if err := zrok_edge_sdk.DeleteServicePolicyBind(env.ZId, svcToken, edge); err != nil {
 			logrus.Error(err)
 		}
-		if err := deleteConfig(env.ZId, svcToken, edge); err != nil {
+		if err := zrok_edge_sdk.DeleteConfig(env.ZId, svcToken, edge); err != nil {
 			logrus.Error(err)
 		}
 		if err := zrok_edge_sdk.DeleteService(env.ZId, svc.ZId, edge); err != nil {

controller/edge.go

@@ -4,12 +4,9 @@ import (
 	"context"
 	"fmt"
 	"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
-	"github.com/openziti-test-kitchen/zrok/model"
 	"github.com/openziti/edge/rest_management_api_client"
-	"github.com/openziti/edge/rest_management_api_client/config"
 	"github.com/openziti/edge/rest_management_api_client/edge_router_policy"
 	identity_edge "github.com/openziti/edge/rest_management_api_client/identity"
-	"github.com/openziti/edge/rest_model"
 	rest_model_edge "github.com/openziti/edge/rest_model"
 	sdk_config "github.com/openziti/sdk-golang/ziti/config"
 	"github.com/openziti/sdk-golang/ziti/enroll"
@@ -18,69 +15,6 @@ import (
 	"time"
 )
 
-func createConfig(envZId, svcToken string, authSchemeStr string, authUsers []*model.AuthUser, edge *rest_management_api_client.ZitiEdgeManagement) (cfgID string, err error) {
-	authScheme, err := model.ParseAuthScheme(authSchemeStr)
-	if err != nil {
-		return "", err
-	}
-	cfg := &model.ProxyConfig{
-		AuthScheme: authScheme,
-	}
-	if cfg.AuthScheme == model.Basic {
-		cfg.BasicAuth = &model.BasicAuth{}
-		for _, authUser := range authUsers {
-			cfg.BasicAuth.Users = append(cfg.BasicAuth.Users, &model.AuthUser{Username: authUser.Username, Password: authUser.Password})
-		}
-	}
-	cfgCrt := &rest_model.ConfigCreate{
-		ConfigTypeID: &zrokProxyConfigId,
-		Data:         cfg,
-		Name:         &svcToken,
-		Tags:         zrok_edge_sdk.ZrokServiceTags(svcToken),
-	}
-	cfgReq := &config.CreateConfigParams{
-		Config:  cfgCrt,
-		Context: context.Background(),
-	}
-	cfgReq.SetTimeout(30 * time.Second)
-	cfgResp, err := edge.Config.CreateConfig(cfgReq, nil)
-	if err != nil {
-		return "", err
-	}
-	logrus.Infof("created config '%v' for environment '%v'", cfgResp.Payload.Data.ID, envZId)
-	return cfgResp.Payload.Data.ID, nil
-}
-
-func deleteConfig(envZId, svcToken string, edge *rest_management_api_client.ZitiEdgeManagement) error {
-	filter := fmt.Sprintf("tags.zrokServiceToken=\"%v\"", svcToken)
-	limit := int64(0)
-	offset := int64(0)
-	listReq := &config.ListConfigsParams{
-		Filter:  &filter,
-		Limit:   &limit,
-		Offset:  &offset,
-		Context: context.Background(),
-	}
-	listReq.SetTimeout(30 * time.Second)
-	listResp, err := edge.Config.ListConfigs(listReq, nil)
-	if err != nil {
-		return err
-	}
-	for _, cfg := range listResp.Payload.Data {
-		deleteReq := &config.DeleteConfigParams{
-			ID:      *cfg.ID,
-			Context: context.Background(),
-		}
-		deleteReq.SetTimeout(30 * time.Second)
-		_, err := edge.Config.DeleteConfig(deleteReq, nil)
-		if err != nil {
-			return err
-		}
-		logrus.Infof("deleted config '%v' for '%v'", *cfg.ID, envZId)
-	}
-	return nil
-}
-
 func createShareService(envZId, svcToken, cfgId string, edge *rest_management_api_client.ZitiEdgeManagement) (svcZId string, err error) {
 	configs := []string{cfgId}
 	tags := zrok_edge_sdk.ZrokServiceTags(svcToken)

controller/gc.go

@@ -81,7 +81,7 @@ func gcServices(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map
 				if err := zrok_edge_sdk.DeleteServicePolicyBind("gc", *svc.Name, edge); err != nil {
 					logrus.Errorf("error garbage collecting service bind policy: %v", err)
 				}
-				if err := deleteConfig("gc", *svc.Name, edge); err != nil {
+				if err := zrok_edge_sdk.DeleteConfig("gc", *svc.Name, edge); err != nil {
 					logrus.Errorf("error garbage collecting config: %v", err)
 				}
 				if err := zrok_edge_sdk.DeleteService("gc", *svc.ID, edge); err != nil {
@@ -160,7 +160,7 @@ func gcConfigs(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[
 	if listResp, err := edge.Config.ListConfigs(listReq, nil); err == nil {
 		for _, c := range listResp.Payload.Data {
 			if _, found := liveMap[*c.Name]; !found {
-				if err := deleteConfig("gc", *c.Name, edge); err != nil {
+				if err := zrok_edge_sdk.DeleteConfig("gc", *c.Name, edge); err != nil {
 					logrus.Errorf("error garbage collecting config: %v", err)
 				}
 			} else {

controller/share_private.go

@@ -18,7 +18,7 @@ func (a *privateResourceAllocator) allocate(envZId, svcToken string, params serv
 	for _, authUser := range params.Body.AuthUsers {
 		authUsers = append(authUsers, &model.AuthUser{authUser.Username, authUser.Password})
 	}
-	cfgId, err := createConfig(envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
+	cfgId, err := zrok_edge_sdk.CreateConfig(zrokProxyConfigId, envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
 	if err != nil {
 		return "", nil, err
 	}

controller/share_public.go

@@ -18,7 +18,7 @@ func (a *publicResourceAllocator) allocate(envZId, svcToken string, frontendZIds
 	for _, authUser := range params.Body.AuthUsers {
 		authUsers = append(authUsers, &model.AuthUser{authUser.Username, authUser.Password})
 	}
-	cfgId, err := createConfig(envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
+	cfgId, err := zrok_edge_sdk.CreateConfig(zrokProxyConfigId, envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
 	if err != nil {
 		return "", nil, err
 	}

controller/unshare.go

@@ -132,7 +132,7 @@ func (h *unshareHandler) deallocateResources(senv *store.Environment, svcToken,
 	if err := zrok_edge_sdk.DeleteServicePolicyBind(senv.ZId, svcToken, edge); err != nil {
 		return err
 	}
-	if err := deleteConfig(senv.ZId, svcToken, edge); err != nil {
+	if err := zrok_edge_sdk.DeleteConfig(senv.ZId, svcToken, edge); err != nil {
 		return err
 	}
 	if err := zrok_edge_sdk.DeleteService(senv.ZId, svcZId, edge); err != nil {

controller/zrok_edge_sdk/config.go

@@ -0,0 +1,75 @@
+package zrok_edge_sdk
+
+import (
+	"context"
+	"fmt"
+	"github.com/openziti-test-kitchen/zrok/model"
+	"github.com/openziti/edge/rest_management_api_client"
+	"github.com/openziti/edge/rest_management_api_client/config"
+	"github.com/openziti/edge/rest_model"
+	"github.com/sirupsen/logrus"
+	"time"
+)
+
+func CreateConfig(cfgZId, envZId, svcToken string, authSchemeStr string, authUsers []*model.AuthUser, edge *rest_management_api_client.ZitiEdgeManagement) (cfgID string, err error) {
+	authScheme, err := model.ParseAuthScheme(authSchemeStr)
+	if err != nil {
+		return "", err
+	}
+	cfg := &model.ProxyConfig{
+		AuthScheme: authScheme,
+	}
+	if cfg.AuthScheme == model.Basic {
+		cfg.BasicAuth = &model.BasicAuth{}
+		for _, authUser := range authUsers {
+			cfg.BasicAuth.Users = append(cfg.BasicAuth.Users, &model.AuthUser{Username: authUser.Username, Password: authUser.Password})
+		}
+	}
+	cfgCrt := &rest_model.ConfigCreate{
+		ConfigTypeID: &cfgZId,
+		Data:         cfg,
+		Name:         &svcToken,
+		Tags:         ZrokServiceTags(svcToken),
+	}
+	cfgReq := &config.CreateConfigParams{
+		Config:  cfgCrt,
+		Context: context.Background(),
+	}
+	cfgReq.SetTimeout(30 * time.Second)
+	cfgResp, err := edge.Config.CreateConfig(cfgReq, nil)
+	if err != nil {
+		return "", err
+	}
+	logrus.Infof("created config '%v' for environment '%v'", cfgResp.Payload.Data.ID, envZId)
+	return cfgResp.Payload.Data.ID, nil
+}
+
+func DeleteConfig(envZId, svcToken string, edge *rest_management_api_client.ZitiEdgeManagement) error {
+	filter := fmt.Sprintf("tags.zrokServiceToken=\"%v\"", svcToken)
+	limit := int64(0)
+	offset := int64(0)
+	listReq := &config.ListConfigsParams{
+		Filter:  &filter,
+		Limit:   &limit,
+		Offset:  &offset,
+		Context: context.Background(),
+	}
+	listReq.SetTimeout(30 * time.Second)
+	listResp, err := edge.Config.ListConfigs(listReq, nil)
+	if err != nil {
+		return err
+	}
+	for _, cfg := range listResp.Payload.Data {
+		deleteReq := &config.DeleteConfigParams{
+			ID:      *cfg.ID,
+			Context: context.Background(),
+		}
+		deleteReq.SetTimeout(30 * time.Second)
+		_, err := edge.Config.DeleteConfig(deleteReq, nil)
+		if err != nil {
+			return err
+		}
+		logrus.Infof("deleted config '%v' for '%v'", *cfg.ID, envZId)
+	}
+	return nil
+}