Skip to content

Commit bea178b

Browse files
committed
change from plutus vendor to plutus enterprise
Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
1 parent 330bd12 commit bea178b

17 files changed

Lines changed: 200 additions & 71 deletions

File tree

pkg/config/config.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,15 @@ func VendorServiceAddress() string {
161161
return GetServiceAddress(s.Name, s.Port)
162162
}
163163

164+
func EnterpriseServiceInfo() *setting.ServiceInfo {
165+
return GetServiceByCode(setting.Enterprise)
166+
}
167+
168+
func EnterpriseServiceAddress() string {
169+
s := EnterpriseServiceInfo()
170+
return GetServiceAddress(s.Name, s.Port)
171+
}
172+
164173
func GetServiceAddress(name string, port int32) string {
165174
return fmt.Sprintf("http://%s:%d", name, port)
166175
}

pkg/microservice/aslan/core/common/repository/models/private_key.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
2323
"github.com/koderover/zadig/v2/pkg/setting"
24-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
24+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
2525
e "github.com/koderover/zadig/v2/pkg/tool/errors"
2626
"github.com/koderover/zadig/v2/pkg/types"
2727
"go.mongodb.org/mongo-driver/bson/primitive"
@@ -83,13 +83,13 @@ func (PrivateKey) TableName() string {
8383
}
8484

8585
func (args *PrivateKey) Validate() error {
86-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
86+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
8787
if err != nil {
8888
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
8989
}
90-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
91-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
92-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
90+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
91+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
92+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
9393
if args.Provider == config.VMProviderAmazon {
9494
return e.ErrLicenseInvalid.AddDesc("")
9595
}

pkg/microservice/aslan/core/common/repository/models/registry_namespace.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"go.mongodb.org/mongo-driver/bson/primitive"
2626

2727
"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
28-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
28+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
2929
e "github.com/koderover/zadig/v2/pkg/tool/errors"
3030
)
3131

@@ -87,17 +87,17 @@ func (ns *RegistryNamespace) GetRegistryAddress() (string, error) {
8787
}
8888

8989
func (args *RegistryNamespace) LicenseValidate() error {
90-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
90+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
9191
if err != nil {
9292
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
9393
}
9494
if args.RegProvider == config.RegistryProviderACREnterprise ||
9595
args.RegProvider == config.RegistryProviderTCREnterprise ||
9696
args.RegProvider == config.RegistryProviderECR ||
9797
args.RegProvider == config.RegistryProviderJFrog {
98-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
99-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
100-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
98+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
99+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
100+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
101101
return e.ErrLicenseInvalid.AddDesc("")
102102
}
103103
}

pkg/microservice/aslan/core/common/util/validate.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"k8s.io/apimachinery/pkg/api/resource"
2424

2525
"github.com/koderover/zadig/v2/pkg/setting"
26-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
26+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
2727
e "github.com/koderover/zadig/v2/pkg/tool/errors"
2828
)
2929

@@ -57,7 +57,7 @@ func CheckDefineResourceParam(req setting.Request, reqSpec setting.RequestSpec)
5757
}
5858

5959
func CheckZadigProfessionalLicense() error {
60-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
60+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
6161
if err != nil {
6262
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
6363
}
@@ -68,7 +68,7 @@ func CheckZadigProfessionalLicense() error {
6868
}
6969

7070
func CheckZadigEnterpriseLicense() error {
71-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
71+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
7272
if err != nil {
7373
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
7474
}
@@ -78,49 +78,49 @@ func CheckZadigEnterpriseLicense() error {
7878
return nil
7979
}
8080

81-
func ValidateZadigProfessionalLicense(licenseStatus *plutusvendor.ZadigXLicenseStatus) bool {
82-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
83-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
84-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
81+
func ValidateZadigProfessionalLicense(licenseStatus *plutusenterprise.ZadigXLicenseStatus) bool {
82+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
83+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
84+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
8585
return false
8686
}
8787
return true
8888
}
8989

90-
func ValidateZadigEnterpriseLicense(licenseStatus *plutusvendor.ZadigXLicenseStatus) bool {
91-
if !(licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise &&
92-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
90+
func ValidateZadigEnterpriseLicense(licenseStatus *plutusenterprise.ZadigXLicenseStatus) bool {
91+
if !(licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise &&
92+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
9393
return false
9494
}
9595
return true
9696
}
9797

9898
func CheckZadigLicenseFeatureSae() error {
99-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
99+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
100100
if err != nil {
101101
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
102102
}
103103
if !ValidateZadigProfessionalLicense(licenseStatus) {
104104
return e.ErrLicenseInvalid.AddDesc("")
105105
}
106106
for _, feature := range licenseStatus.Features {
107-
if feature == plutusvendor.ZadigLicenseFeatureSae {
107+
if feature == plutusenterprise.ZadigLicenseFeatureSae {
108108
return nil
109109
}
110110
}
111111
return e.ErrLicenseInvalid.AddDesc("")
112112
}
113113

114114
func CheckZadigLicenseFeatureDelivery() error {
115-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
115+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
116116
if err != nil {
117117
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
118118
}
119119
if !ValidateZadigProfessionalLicense(licenseStatus) {
120120
return e.ErrLicenseInvalid.AddDesc("")
121121
}
122122
for _, feature := range licenseStatus.Features {
123-
if feature == plutusvendor.ZadigLicenseFeatureDelivery {
123+
if feature == plutusenterprise.ZadigLicenseFeatureDelivery {
124124
return nil
125125
}
126126
}

pkg/microservice/aslan/core/environment/handler/environment.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
commonutil "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/util"
4242
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/environment/service"
4343
"github.com/koderover/zadig/v2/pkg/setting"
44-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
44+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
4545
internalhandler "github.com/koderover/zadig/v2/pkg/shared/handler"
4646
"github.com/koderover/zadig/v2/pkg/shared/kube/resource"
4747
e "github.com/koderover/zadig/v2/pkg/tool/errors"
@@ -860,7 +860,7 @@ func UpdateHelmProductDefaultValues(c *gin.Context) {
860860
return
861861
}
862862

863-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
863+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
864864
if err != nil {
865865
ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
866866
return
@@ -1206,7 +1206,7 @@ func updateMultiK8sEnv(c *gin.Context, request *service.UpdateEnvRequest, produc
12061206
return
12071207
}
12081208

1209-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
1209+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
12101210
if err != nil {
12111211
ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
12121212
return
@@ -1215,9 +1215,9 @@ func updateMultiK8sEnv(c *gin.Context, request *service.UpdateEnvRequest, produc
12151215
for _, arg := range args {
12161216
for _, service := range arg.Services {
12171217
if service.DeployStrategy == setting.ServiceDeployStrategyImport {
1218-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
1219-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
1220-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
1218+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
1219+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
1220+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
12211221
ctx.RespErr = e.ErrLicenseInvalid.AddDesc("")
12221222
return
12231223
}
@@ -1381,7 +1381,7 @@ func updateMultiHelmChartEnv(c *gin.Context, request *service.UpdateEnvRequest,
13811381
return
13821382
}
13831383

1384-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
1384+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
13851385
if err != nil {
13861386
ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
13871387
return

pkg/microservice/aslan/core/multicluster/service/clusters.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import (
5353
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/kube"
5454
commonutil "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/util"
5555
"github.com/koderover/zadig/v2/pkg/setting"
56-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
56+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
5757
"github.com/koderover/zadig/v2/pkg/shared/handler"
5858
"github.com/koderover/zadig/v2/pkg/tool/clientmanager"
5959
e "github.com/koderover/zadig/v2/pkg/tool/errors"
@@ -115,13 +115,13 @@ type ScheduleStrategy struct {
115115
}
116116

117117
func (args *K8SCluster) Validate() error {
118-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
118+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
119119
if err != nil {
120120
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
121121
}
122-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
123-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
124-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
122+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
123+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
124+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
125125
if args.Provider == config.ClusterProviderTKEServerless || args.Provider == config.ClusterProviderAmazonEKS || args.Production {
126126
return e.ErrLicenseInvalid.AddDesc("")
127127
}

pkg/microservice/aslan/core/system/handler/registry.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
commonservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service"
3232
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/system/service"
3333
"github.com/koderover/zadig/v2/pkg/setting"
34-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
34+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
3535
internalhandler "github.com/koderover/zadig/v2/pkg/shared/handler"
3636
e "github.com/koderover/zadig/v2/pkg/tool/errors"
3737
"github.com/koderover/zadig/v2/pkg/tool/log"
@@ -84,17 +84,17 @@ func GetDefaultRegistryNamespace(c *gin.Context) {
8484
return
8585
}
8686

87-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
87+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
8888
if err != nil {
8989
ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
9090
return
9191
}
9292
if reg.RegType == config.RegistryProviderACREnterprise ||
9393
reg.RegType == config.RegistryProviderTCREnterprise ||
9494
reg.RegType == config.RegistryProviderJFrog {
95-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
96-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
97-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
95+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
96+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
97+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
9898
ctx.RespErr = e.ErrLicenseInvalid.AddDesc("")
9999
return
100100
}

pkg/microservice/aslan/core/system/handler/s3.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
commonmodels "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models"
3030
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/s3"
3131
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/system/service"
32-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
32+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
3333
internalhandler "github.com/koderover/zadig/v2/pkg/shared/handler"
3434
e "github.com/koderover/zadig/v2/pkg/tool/errors"
3535
"github.com/koderover/zadig/v2/pkg/tool/log"
@@ -132,15 +132,15 @@ func CreateS3Storage(c *gin.Context) {
132132
return
133133
}
134134

135-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
135+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
136136
if err != nil {
137137
ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
138138
return
139139
}
140140
if args.Provider == config.S3StorageProviderAmazonS3 {
141-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
142-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
143-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
141+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
142+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
143+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
144144
ctx.RespErr = e.ErrLicenseInvalid.AddDesc("")
145145
return
146146
}
@@ -259,15 +259,15 @@ func UpdateS3Storage(c *gin.Context) {
259259
return
260260
}
261261

262-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
262+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
263263
if err != nil {
264264
ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
265265
return
266266
}
267267
if args.Provider == config.S3StorageProviderAmazonS3 {
268-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
269-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
270-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
268+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
269+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
270+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
271271
ctx.RespErr = e.ErrLicenseInvalid.AddDesc("")
272272
return
273273
}

pkg/microservice/aslan/core/workflow/service/workflow/controller/workflow.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
commonutil "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/util"
3434
jobctrl "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/workflow/service/workflow/controller/job"
3535
"github.com/koderover/zadig/v2/pkg/setting"
36-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
36+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
3737
e "github.com/koderover/zadig/v2/pkg/tool/errors"
3838
"github.com/koderover/zadig/v2/pkg/tool/log"
3939
"github.com/koderover/zadig/v2/pkg/types"
@@ -413,7 +413,7 @@ func (w *Workflow) Validate(isExecution bool) error {
413413
return e.ErrLintWorkflow.AddErr(err)
414414
}
415415

416-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
416+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
417417
if err != nil {
418418
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
419419
}

pkg/microservice/user/core/handler/permission/role.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ import (
2828
userhandler "github.com/koderover/zadig/v2/pkg/microservice/user/core/handler/user"
2929
"github.com/koderover/zadig/v2/pkg/microservice/user/core/service/permission"
3030
"github.com/koderover/zadig/v2/pkg/setting"
31-
"github.com/koderover/zadig/v2/pkg/shared/client/plutusvendor"
31+
"github.com/koderover/zadig/v2/pkg/shared/client/plutusenterprise"
3232
internalhandler "github.com/koderover/zadig/v2/pkg/shared/handler"
3333
e "github.com/koderover/zadig/v2/pkg/tool/errors"
3434
"github.com/koderover/zadig/v2/pkg/tool/log"
3535
)
3636

3737
func checkLicense(actions []string) error {
38-
licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
38+
licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
3939
if err != nil {
4040
return fmt.Errorf("failed to validate zadig license status, error: %s", err)
4141
}
42-
if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
43-
licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
44-
licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
42+
if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
43+
licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
44+
licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
4545
actionSet := sets.NewString(actions...)
4646
if actionSet.Has(permission.VerbCreateReleasePlan) || actionSet.Has(permission.VerbDeleteReleasePlan) ||
4747
actionSet.Has(permission.VerbEditReleasePlanMetadata) || actionSet.Has(permission.VerbEditReleasePlanApproval) ||
@@ -240,14 +240,14 @@ func UpdateRoleImpl(c *gin.Context, ctx *internalhandler.Context) {
240240
}
241241
}
242242

243-
//licenseStatus, err := plutusvendor.New().CheckZadigXLicenseStatus()
243+
//licenseStatus, err := plutusenterprise.New().CheckZadigXLicenseStatus()
244244
//if err != nil {
245245
// ctx.RespErr = fmt.Errorf("failed to validate zadig license status, error: %s", err)
246246
// return
247247
//}
248-
//if !((licenseStatus.Type == plutusvendor.ZadigSystemTypeProfessional ||
249-
// licenseStatus.Type == plutusvendor.ZadigSystemTypeEnterprise) &&
250-
// licenseStatus.Status == plutusvendor.ZadigXLicenseStatusNormal) {
248+
//if !((licenseStatus.Type == plutusenterprise.ZadigSystemTypeProfessional ||
249+
// licenseStatus.Type == plutusenterprise.ZadigSystemTypeEnterprise) &&
250+
// licenseStatus.Status == plutusenterprise.ZadigXLicenseStatusNormal) {
251251
// actionSet := sets.NewString(args.Actions...)
252252
// if actionSet.Has(permission.VerbCreateReleasePlan) || actionSet.Has(permission.VerbDeleteReleasePlan) ||
253253
// actionSet.Has(permission.VerbEditReleasePlan) || actionSet.Has(permission.VerbGetReleasePlan) ||

0 commit comments

Comments
 (0)