extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-09 00:04:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

lint; assert 'metrics' service (#131)

Browse Source
This commit is contained in:
Michael Quigley
2022-12-05 16:10:38 -05:00
parent 15d289cc87
commit 4d75e2da4f
4 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
controller/bootstrap.go
View File

@ -11,6 +11,7 @@ import (
"github.com/openziti/edge/rest_management_api_client/config"
"github.com/openziti/edge/rest_management_api_client/edge_router_policy"
"github.com/openziti/edge/rest_management_api_client/identity"
"github.com/openziti/edge/rest_management_api_client/service"
"github.com/openziti/edge/rest_model"
rest_model_edge "github.com/openziti/edge/rest_model"
"github.com/openziti/sdk-golang/ziti"
@ -68,6 +69,10 @@ func Bootstrap(skipCtrl, skipFrontend bool, inCfg *Config) error {
return err
}
if err := assertMetricsService(edge); err != nil {
return err
}
return nil
}
@ -145,13 +150,13 @@ func assertIdentity(zId string, edge *rest_management_api_client.ZitiEdgeManagem
func bootstrapIdentity(name string, edge *rest_management_api_client.ZitiEdgeManagement) (string, error) {
idc, err := createIdentity(name, rest_model_edge.IdentityTypeDevice, nil, edge)
if err != nil {
return "", errors.Wrap(err, "error creating 'ctrl' identity")
return "", errors.Wrapf(err, "error creating '%v' identity", name)
}
zId := idc.Payload.Data.ID
cfg, err := enrollIdentity(zId, edge)
if err != nil {
return "", errors.Wrap(err, "error enrolling 'ctrl' identity")
return "", errors.Wrapf(err, "error enrolling '%v' identity", name)
}
var out bytes.Buffer
@ -168,7 +173,6 @@ func bootstrapIdentity(name string, edge *rest_management_api_client.ZitiEdgeMan
}
func assertErpForIdentity(name, zId string, edge *rest_management_api_client.ZitiEdgeManagement) error {
logrus.Infof("asserting erps for '%v'", name)
filter := fmt.Sprintf("name=\"%v\" and tags.zrok != null", name)
limit := int64(0)
offset := int64(0)
@ -191,3 +195,28 @@ func assertErpForIdentity(name, zId string, edge *rest_management_api_client.Zit
logrus.Infof("asserted erps for '%v' (%v)", name, zId)
return nil
}
func assertMetricsService(edge *rest_management_api_client.ZitiEdgeManagement) error {
filter := "name=\"metrics\" and tags.zrok != null"
limit := int64(0)
offset := int64(0)
listReq := &service.ListServicesParams{
Filter: &filter,
Limit: &limit,
Offset: &offset,
}
listReq.SetTimeout(30 * time.Second)
listResp, err := edge.Service.ListServices(listReq, nil)
if err != nil {
return errors.Wrap(err, "error listing metrics service")
}
if len(listResp.Payload.Data) != 1 {
logrus.Infof("creating 'metrics' service")
_, err := createService("metrics", nil, nil, edge)
if err != nil {
return errors.Wrap(err, "error creating metrics service")
}
}
logrus.Infof("asserted metrics service")
return nil
}