Skip to content

Commit 57fea23

Browse files
1gtm1gtm
authored
Fix SiteInfo publishing (#1402)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent a3acd49 commit 57fea23

File tree

8 files changed

+27
-21
lines changed

8 files changed

+27
-21
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ require (
1414
github.com/robfig/cron/v3 v3.0.1
1515
github.com/spf13/cobra v1.1.3
1616
github.com/spf13/pflag v1.0.5
17-
go.bytebuilders.dev/audit v0.0.13
18-
go.bytebuilders.dev/license-verifier v0.9.6
19-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.6
17+
go.bytebuilders.dev/audit v0.0.14
18+
go.bytebuilders.dev/license-verifier v0.9.7
19+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.7
2020
gomodules.xyz/blobfs v0.1.7
2121
gomodules.xyz/cert v1.2.0
2222
gomodules.xyz/encoding v0.0.2

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -772,13 +772,13 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
772772
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
773773
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
774774
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
775-
go.bytebuilders.dev/audit v0.0.13 h1:Ne2tYw6aM7p5fbGOxQWfhQvGyv0IVZphLBAK3rMLGFE=
776-
go.bytebuilders.dev/audit v0.0.13/go.mod h1:p5z/qZKf9awnjs8mKSWiwz1OwUdzbK5SXKi+Xtww5HQ=
775+
go.bytebuilders.dev/audit v0.0.14 h1:45gtWgZ7lDuBoUresrtubXMajsSf7ZG2AKREEGrlMLo=
776+
go.bytebuilders.dev/audit v0.0.14/go.mod h1:1hnjSI68Bz+LFJrzMepztve5A7slQg1sLK7+rISEJTY=
777777
go.bytebuilders.dev/license-verifier v0.9.3/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
778-
go.bytebuilders.dev/license-verifier v0.9.6 h1:nT4Eplu0OQWM7Re81ZQibkYKeno6nDAwOzaz14Yvadc=
779-
go.bytebuilders.dev/license-verifier v0.9.6/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
780-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.6 h1:QwiUgNug1pD4cwxLuSQmSLn1WvvNreKfBajdymoRmeM=
781-
go.bytebuilders.dev/license-verifier/kubernetes v0.9.6/go.mod h1:b1oIjrDuNN1T3d1ixnr020hi2i0sXlR7CIsWrhkzga4=
778+
go.bytebuilders.dev/license-verifier v0.9.7 h1:m7Z3cuVJYUUctCfTK6qT0IKtPVZurxq1b1bKzWjqwsE=
779+
go.bytebuilders.dev/license-verifier v0.9.7/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
780+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.7 h1:TN9N9FmmxrPTQoAPJsQnHRgY00liNZgiTUyZ2QNtqyg=
781+
go.bytebuilders.dev/license-verifier/kubernetes v0.9.7/go.mod h1:hsNtdOrSnm5v8dwTgbKLVADNTgD+b6eaZHXiJZXoPcE=
782782
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
783783
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
784784
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=

‎vendor/go.bytebuilders.dev/audit/lib/nats.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func NewNatsConfig(clusterID string, LicenseFile string) (*NatsConfig, error) {
6161

6262
opts := verifier.Options{
6363
ClusterUID: clusterID,
64-
Features: info.Features(),
64+
Features: info.ProductName,
6565
CACert: []byte(info.LicenseCA),
6666
License: licenseBytes,
6767
}

‎vendor/go.bytebuilders.dev/license-verifier/info/lib.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ var (
4040
)
4141

4242
func Features() []string {
43-
return strings.FieldsFunc(ProductName, func(r rune) bool {
43+
return ParseFeatures(ProductName)
44+
}
45+
46+
func ParseFeatures(features string) []string {
47+
return strings.FieldsFunc(features, func(r rune) bool {
4448
return unicode.IsSpace(r) || r == ',' || r == ';'
4549
})
4650
}

‎vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.16
44

55
require (
66
github.com/gogo/protobuf v1.3.2
7-
go.bytebuilders.dev/license-verifier v0.9.6
7+
go.bytebuilders.dev/license-verifier v0.9.7
88
k8s.io/api v0.21.1
99
k8s.io/apimachinery v0.21.1
1010
k8s.io/apiserver v0.21.1

‎vendor/go.bytebuilders.dev/license-verifier/kubernetes/lib.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func NewLicenseEnforcer(config *rest.Config, licenseFile string) *LicenseEnforce
7474
config: config,
7575
opts: &verifier.Options{
7676
CACert: []byte(info.LicenseCA),
77-
Features: info.Features(),
77+
Features: info.ProductName,
7878
},
7979
}
8080
}
@@ -227,7 +227,7 @@ func VerifyLicensePeriodically(config *rest.Config, licenseFile string, stopCh <
227227
config: config,
228228
opts: &verifier.Options{
229229
CACert: []byte(info.LicenseCA),
230-
Features: info.Features(),
230+
Features: info.ProductName,
231231
},
232232
}
233233

@@ -286,7 +286,7 @@ func CheckLicenseFile(config *rest.Config, licenseFile string) error {
286286
config: config,
287287
opts: &verifier.Options{
288288
CACert: []byte(info.LicenseCA),
289-
Features: info.Features(),
289+
Features: info.ProductName,
290290
},
291291
}
292292

‎vendor/go.bytebuilders.dev/license-verifier/lib.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@ import (
2020
"crypto/x509"
2121
"encoding/pem"
2222
"fmt"
23-
"go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1"
2423
"strings"
2524

25+
"go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1"
26+
"go.bytebuilders.dev/license-verifier/info"
27+
2628
"github.com/pkg/errors"
2729
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2830
"k8s.io/apimachinery/pkg/util/sets"
2931
)
3032

3133
type Options struct {
3234
ClusterUID string `json:"clusterUID"`
33-
Features []string `json:"features"`
35+
Features string `json:"features"`
3436
CACert []byte `json:"caCert,omitempty"`
3537
License []byte `json:"license"`
3638
}
@@ -163,7 +165,7 @@ func VerifyLicense(opts *Options) (v1alpha1.License, error) {
163165
license.Reason = e2.Error()
164166
return license, e2
165167
}
166-
if !sets.NewString(cert.Subject.Organization...).HasAny(opts.Features...) {
168+
if !sets.NewString(cert.Subject.Organization...).HasAny(info.ParseFeatures(opts.Features)...) {
167169
e2 := fmt.Errorf("license was not issued for %s", opts.Features)
168170
license.Status = v1alpha1.LicenseExpired
169171
license.Reason = e2.Error()

‎vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,17 +341,17 @@ github.com/yudai/gojsondiff
341341
github.com/yudai/gojsondiff/formatter
342342
# github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
343343
github.com/yudai/golcs
344-
# go.bytebuilders.dev/audit v0.0.13
344+
# go.bytebuilders.dev/audit v0.0.14
345345
## explicit
346346
go.bytebuilders.dev/audit/api/v1
347347
go.bytebuilders.dev/audit/lib
348-
# go.bytebuilders.dev/license-verifier v0.9.6
348+
# go.bytebuilders.dev/license-verifier v0.9.7
349349
## explicit
350350
go.bytebuilders.dev/license-verifier
351351
go.bytebuilders.dev/license-verifier/apis/licenses
352352
go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1
353353
go.bytebuilders.dev/license-verifier/info
354-
# go.bytebuilders.dev/license-verifier/kubernetes v0.9.6
354+
# go.bytebuilders.dev/license-verifier/kubernetes v0.9.7
355355
## explicit
356356
go.bytebuilders.dev/license-verifier/kubernetes
357357
# go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 => go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489

0 commit comments

Comments
 (0)