Skip to content

Commit

Permalink
Merge pull request #1463 from kubescape/bump-logger
Browse files Browse the repository at this point in the history
  • Loading branch information
@craigbox
craigbox committed Oct 31, 2023
2 parents c9ccef9 + 450df67 commit ee37dc4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
1 change: 0 additions & 1 deletion core/cautils/customerloader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ func updateCloudURLs(configObj *ConfigObj) {

func initializeCloudAPI(c ITenantConfig) *v1.KSCloudAPI {
if ksCloud := getter.GetKSCloudAPIConnector(); ksCloud != nil {
logger.L().Debug("KS Cloud API already initialized")

if val := c.GetCloudAPIURL(); val != "" && val != ksCloud.GetCloudAPIURL() {
logger.L().Debug("updating KS Cloud API from config", helpers.String("old", ksCloud.GetCloudAPIURL()), helpers.String("new", val))
Expand Down
4 changes: 1 addition & 3 deletions core/cautils/getter/kscloudapi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ var (
//
// NOTE: cannot be used concurrently.
func SetKSCloudAPIConnector(ksCloudAPI *v1.KSCloudAPI) {
if ksCloudAPI != nil {
if ksCloudAPI != nil && ksCloudAPI.GetCloudAPIURL() != "" {
logger.L().Debug("setting global KS Cloud API connector",
helpers.String("accountID", ksCloudAPI.GetAccountID()),
helpers.String("cloudAPIURL", ksCloudAPI.GetCloudAPIURL()),
helpers.String("cloudReportURL", ksCloudAPI.GetCloudReportURL()))
} else {
logger.L().Debug("setting global KS Cloud API connector (nil)")
}
globalKSCloudAPIConnector = ksCloudAPI
}
Expand Down
2 changes: 1 addition & 1 deletion core/pkg/resultshandling/printer/v2/prettyprinter/reposcan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (rp *RepoPrinter) PrintConfigurationsScanning(summaryDetails *reportsummary
}

func (rp *RepoPrinter) PrintNextSteps() {
printNextSteps(rp.writer, rp.getNextSteps(), false)
printNextSteps(rp.writer, rp.getNextSteps(), true)
}

func (rp *RepoPrinter) getNextSteps() []string {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/jwalton/gchalk v1.3.0
github.com/kubescape/backend v0.0.13
github.com/kubescape/go-git-url v0.0.25
github.com/kubescape/go-logger v0.0.21
github.com/kubescape/go-logger v0.0.22
github.com/kubescape/k8s-interface v0.0.146
github.com/kubescape/opa-utils v0.0.271
github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1357,8 +1357,8 @@ github.com/kubescape/backend v0.0.13 h1:N+fH8giGGqvy3ff2li2AwG5guVduhdiPWyvZaZxr
github.com/kubescape/backend v0.0.13/go.mod h1:ug9NFmmxT4DcQx3sgdLRzlLPWMKGHE/fpbcYUm5G5Qo=
github.com/kubescape/go-git-url v0.0.25 h1:i7SSSC1+1m/Dg+4LV3erp0YklnWj1Z0cVlRxCT3Zy/0=
github.com/kubescape/go-git-url v0.0.25/go.mod h1:IbVT7Wsxlghsa+YxI5KOx4k9VQJaa3z0kTaQz5D3nKM=
github.com/kubescape/go-logger v0.0.21 h1:4ZRIEw3UGUH6BG/cH3yiqFipzQSfGAoCrxlsZuk37ys=
github.com/kubescape/go-logger v0.0.21/go.mod h1:x3HBpZo3cMT/WIdy18BxvVVd5D0e/PWFVk/HiwBNu3g=
github.com/kubescape/go-logger v0.0.22 h1:gle7wH6emOiGv9ljdpVi82pWLQ3jGucrUucvil6JXHE=
github.com/kubescape/go-logger v0.0.22/go.mod h1:x3HBpZo3cMT/WIdy18BxvVVd5D0e/PWFVk/HiwBNu3g=
github.com/kubescape/k8s-interface v0.0.146 h1:SF3ARFhQkjbq85+VinDzSeYru8+XZvSLWKdxZFqv7Uc=
github.com/kubescape/k8s-interface v0.0.146/go.mod h1:5sz+5Cjvo98lTbTVDiDA4MmlXxeHSVMW/wR0V3hV4K8=
github.com/kubescape/opa-utils v0.0.271 h1:VY/YUi+WvAtN6gfSPrAW+0LNlMmEpKsOb1hl475ZR0E=
Expand Down
2 changes: 1 addition & 1 deletion httphandler/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/gorilla/mux v1.8.0
github.com/gorilla/schema v1.2.0
github.com/kubescape/backend v0.0.13
github.com/kubescape/go-logger v0.0.21
github.com/kubescape/go-logger v0.0.22
github.com/kubescape/k8s-interface v0.0.146
github.com/kubescape/kubescape/v3 v3.0.0-00010101000000-000000000000
github.com/kubescape/opa-utils v0.0.271
Expand Down
4 changes: 2 additions & 2 deletions httphandler/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1360,8 +1360,8 @@ github.com/kubescape/backend v0.0.13 h1:N+fH8giGGqvy3ff2li2AwG5guVduhdiPWyvZaZxr
github.com/kubescape/backend v0.0.13/go.mod h1:ug9NFmmxT4DcQx3sgdLRzlLPWMKGHE/fpbcYUm5G5Qo=
github.com/kubescape/go-git-url v0.0.25 h1:i7SSSC1+1m/Dg+4LV3erp0YklnWj1Z0cVlRxCT3Zy/0=
github.com/kubescape/go-git-url v0.0.25/go.mod h1:IbVT7Wsxlghsa+YxI5KOx4k9VQJaa3z0kTaQz5D3nKM=
github.com/kubescape/go-logger v0.0.21 h1:4ZRIEw3UGUH6BG/cH3yiqFipzQSfGAoCrxlsZuk37ys=
github.com/kubescape/go-logger v0.0.21/go.mod h1:x3HBpZo3cMT/WIdy18BxvVVd5D0e/PWFVk/HiwBNu3g=
github.com/kubescape/go-logger v0.0.22 h1:gle7wH6emOiGv9ljdpVi82pWLQ3jGucrUucvil6JXHE=
github.com/kubescape/go-logger v0.0.22/go.mod h1:x3HBpZo3cMT/WIdy18BxvVVd5D0e/PWFVk/HiwBNu3g=
github.com/kubescape/k8s-interface v0.0.146 h1:SF3ARFhQkjbq85+VinDzSeYru8+XZvSLWKdxZFqv7Uc=
github.com/kubescape/k8s-interface v0.0.146/go.mod h1:5sz+5Cjvo98lTbTVDiDA4MmlXxeHSVMW/wR0V3hV4K8=
github.com/kubescape/opa-utils v0.0.271 h1:VY/YUi+WvAtN6gfSPrAW+0LNlMmEpKsOb1hl475ZR0E=
Expand Down

0 comments on commit ee37dc4

Please sign in to comment.