wf updates and more rdm work

openziti · Jun 11, 2024 · 09a7973 · 09a7973
1 parent 811d17d
commit 09a7973
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,8 +38,8 @@ jobs:
         shell: bash
         run: |
           go install github.com/mitchellh/gox@latest
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags)" -cgo -os=darwin -arch=amd64 -output=$GOX_OUTPUT ./...
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags)" -cgo -os=darwin -arch=arm64 -output=$GOX_OUTPUT ./...
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=darwin -arch=amd64 -output=$GOX_OUTPUT ./...
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=darwin -arch=arm64 -output=$GOX_OUTPUT ./...
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -71,7 +71,7 @@ jobs:
         shell: bash
         run: |
           go install github.com/mitchellh/gox@latest
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags)" -cgo -os=windows -arch=amd64 -output=$GOX_OUTPUT ./...
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=windows -arch=amd64 -output=$GOX_OUTPUT ./...
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -104,9 +104,9 @@ jobs:
           sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf gcc-aarch64-linux-gnu
           $(go env GOPATH)/bin/ziti-ci configure-git
           go install github.com/mitchellh/gox@latest
-          $(go env GOPATH)/bin/gox -cgo -os=linux -arch=amd64 -output=$GOX_OUTPUT ./...
-          CC=arm-linux-gnueabihf-gcc $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags)" -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./...
-          CC=aarch64-linux-gnu-gcc   $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags)" -cgo -os=linux -arch=arm64 -output=$GOX_OUTPUT ./...
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=amd64 -output=$GOX_OUTPUT ./...
+          CC=arm-linux-gnueabihf-gcc $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./...
+          CC=aarch64-linux-gnu-gcc   $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm64 -output=$GOX_OUTPUT ./...
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -215,4 +215,4 @@ jobs:
         shell: bash
         run: |
           $(go env GOPATH)/bin/ziti-ci configure-git
-          $(go env GOPATH)/bin/ziti-ci publish-to-github --prerelease --archive-base ""
+          $(go env GOPATH)/bin/ziti-ci publish-to-github -t --prerelease --archive-base ""
diff --git a/controller/sync_strats/sync_instant.go b/controller/sync_strats/sync_instant.go
@@ -972,7 +972,7 @@ func (strategy *InstantStrategy) BuildAll(rdm *common.RouterDataModel) error {
 			return err
 		}
 
-		if err := strategy.BuildPostureChecks(tx, rdm); err != nil {
+		if err := strategy.BuildPostureChecks(index, tx, rdm); err != nil {
 			return err
 		}
 
@@ -1070,7 +1070,7 @@ func (strategy *InstantStrategy) ValidateServices(tx *bbolt.Tx, rdm *common.Rout
 }
 
 func (strategy *InstantStrategy) ValidatePostureChecks(tx *bbolt.Tx, rdm *common.RouterDataModel) []error {
-	return ValidateType(tx, strategy.ae.GetStores().PostureCheck, rdm.PostureChecks, func(t *db.PostureCheck, v *edge_ctrl_pb.DataState_PostureCheck) []error {
+	return ValidateType(tx, strategy.ae.GetStores().PostureCheck, rdm.PostureChecks, func(t *db.PostureCheck, v *common.PostureCheck) []error {
 		var result []error
 		result = diffVals("posture check", t.Id, "name", t.Name, v.Name, result)
 		result = diffVals("posture check", t.Id, "type", t.TypeId, v.TypeId, result)
@@ -1309,7 +1309,7 @@ func (strategy *InstantStrategy) BuildServices(index uint64, tx *bbolt.Tx, rdm *
 	return nil
 }
 
-func (strategy *InstantStrategy) BuildPostureChecks(tx *bbolt.Tx, rdm *common.RouterDataModel) error {
+func (strategy *InstantStrategy) BuildPostureChecks(index uint64, tx *bbolt.Tx, rdm *common.RouterDataModel) error {
 	for cursor := strategy.ae.GetStores().PostureCheck.IterateIds(tx, ast.BoolNodeTrue); cursor.IsValid(); cursor.Next() {
 		currentBytes := cursor.Current()
 		currentId := string(currentBytes)
@@ -1325,7 +1325,7 @@ func (strategy *InstantStrategy) BuildPostureChecks(tx *bbolt.Tx, rdm *common.Ro
 			Action: edge_ctrl_pb.DataState_Create,
 			Model:  newModel,
 		}
-		rdm.HandlePostureCheckEvent(newEvent, newModel)
+		rdm.HandlePostureCheckEvent(index, newEvent, newModel)
 	}
 	return nil
 }

diff --git a/router/xgress_edge_tunnel/fabric.go b/router/xgress_edge_tunnel/fabric.go
@@ -251,7 +251,8 @@ func (self *fabricProvider) tunnelServiceV1(
 	peerData map[uint32][]byte,
 	keyPair *kx.KeyPair) error {
 
-	log := logrus.WithField("service", service.GetName())
+	log := logrus.WithField("service", service.GetName()).
+		WithField("ctrlId", ctrlCh.Id())
 
 	sessionId := self.getDialSession(service.GetName())
 	request := &edge_ctrl_pb.CreateCircuitForServiceRequest{
@@ -316,7 +317,8 @@ func (self *fabricProvider) tunnelServiceV2(
 	peerData map[uint32][]byte,
 	keyPair *kx.KeyPair) error {
 
-	log := logrus.WithField("service", service.GetName())
+	log := logrus.WithField("service", service.GetName()).
+		WithField("ctrlId", ctrlCh.Id())
 
 	rdm := self.factory.stateManager.RouterDataModel()
 	if policy, err := posture.HasAccess(rdm, self.factory.routerConfig.Id.Token, service.GetId(), nil, edge_ctrl_pb.PolicyType_DialPolicy); err != nil && policy != nil {

diff --git a/zititest/models/smoke/actions/bootstrap.go b/zititest/models/smoke/actions/bootstrap.go
@@ -54,7 +54,7 @@ func (a *bootstrapAction) bind(m *model.Model) model.Action {
 	workflow.AddAction(component.Start(".ctrl"))
 
 	if isHA {
-		workflow.AddAction(semaphore.Sleep(2 * time.Second))
+		workflow.AddAction(semaphore.Sleep(10 * time.Second))
 		workflow.AddAction(edge.RaftJoin(".ctrl"))
 		workflow.AddAction(semaphore.Sleep(2 * time.Second))
 		workflow.AddAction(edge.InitRaftController("#ctrl1"))

diff --git a/zititest/zitilab/component_ziti_tunnel.go b/zititest/zitilab/component_ziti_tunnel.go
@@ -132,7 +132,7 @@ func (self *ZitiTunnelType) Start(_ model.Run, c *model.Component) error {
 		ha = "--ha"
 	}
 
-	serviceCmd := fmt.Sprintf("%s %s tunnel %s -v %s --cli-agent-alias %s --log-formatter pfxlog -i %s > %s 2>&1 &",
+	serviceCmd := fmt.Sprintf("%s %s tunnel %s -v %s --cli-agent-alias %s --log-formatter json -i %s > %s 2>&1 &",
 		useSudo, binaryPath, mode.String(), ha, c.Id, configPath, logsPath)
 
 	value, err := c.Host.ExecLogged(