diff --git a/controller/limits/accountRelaxAction.go b/controller/limits/accountRelaxAction.go index cea7aa21..5fe2045e 100644 --- a/controller/limits/accountRelaxAction.go +++ b/controller/limits/accountRelaxAction.go @@ -33,24 +33,26 @@ func (a *accountRelaxAction) HandleAccount(acct *store.Account, _, _ int64, _ *B } for _, shr := range shrs { - if shr.ShareMode == "public" { - env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) - if err != nil { - return errors.Wrap(err, "error finding environment") - } + if !shr.Deleted { + if shr.ShareMode == "public" { + env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) + if err != nil { + return errors.Wrap(err, "error finding environment") + } - fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) - if err != nil { - return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) - } + fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) + if err != nil { + return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) + } - if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { - return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) - } - logrus.Infof("added dial service policy for '%v'", shr.Token) + if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { + return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) + } + logrus.Infof("added dial service policy for '%v'", shr.Token) - } else if shr.ShareMode == "private" { - return errors.New("share relax for private share not implemented") + } else if shr.ShareMode == "private" { + return errors.New("share relax for private share not implemented") + } } } } diff --git a/controller/limits/environmentRelaxAction.go b/controller/limits/environmentRelaxAction.go index aa79ade3..c867d0db 100644 --- a/controller/limits/environmentRelaxAction.go +++ b/controller/limits/environmentRelaxAction.go @@ -27,24 +27,26 @@ func (a *environmentRelaxAction) HandleEnvironment(env *store.Environment, rxByt } for _, shr := range shrs { - if shr.ShareMode == "public" { - env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) - if err != nil { - return errors.Wrap(err, "error finding environment") - } + if !shr.Deleted { + if shr.ShareMode == "public" { + env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) + if err != nil { + return errors.Wrap(err, "error finding environment") + } - fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) - if err != nil { - return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) - } + fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) + if err != nil { + return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) + } - if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { - return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) - } - logrus.Infof("added dial service policy for '%v'", shr.Token) + if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { + return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) + } + logrus.Infof("added dial service policy for '%v'", shr.Token) - } else if shr.ShareMode == "private" { - return errors.New("share relax for private share not implemented") + } else if shr.ShareMode == "private" { + return errors.New("share relax for private share not implemented") + } } } diff --git a/controller/limits/shareRelaxAction.go b/controller/limits/shareRelaxAction.go index e702cf01..4e0a0340 100644 --- a/controller/limits/shareRelaxAction.go +++ b/controller/limits/shareRelaxAction.go @@ -21,24 +21,26 @@ func newShareRelaxAction(str *store.Store, edge *rest_management_api_client.Ziti func (a *shareRelaxAction) HandleShare(shr *store.Share, rxBytes, txBytes int64, limit *BandwidthPerPeriod, trx *sqlx.Tx) error { logrus.Infof("relaxing '%v'", shr.Token) - if shr.ShareMode == "public" { - env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) - if err != nil { - return errors.Wrap(err, "error finding environment") - } + if !shr.Deleted { + if shr.ShareMode == "public" { + env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) + if err != nil { + return errors.Wrap(err, "error finding environment") + } - fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) - if err != nil { - return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) - } + fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) + if err != nil { + return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) + } - if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { - return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) - } - logrus.Infof("added dial service policy for '%v'", shr.Token) + if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { + return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) + } + logrus.Infof("added dial service policy for '%v'", shr.Token) - } else if shr.ShareMode == "private" { - return errors.New("share relax for private share not implemented") + } else if shr.ShareMode == "private" { + return errors.New("share relax for private share not implemented") + } } return nil