temporary commit for sonar test 2

IBM · Dec 11, 2020 · 7680fdb · 7680fdb
1 parent ee9df19
commit 7680fdb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/shield/pkg/shield/handler/checkFunctions.go b/shield/pkg/shield/handler/checkFunctions.go
@@ -25,7 +25,6 @@ import (
 
  common "github.com/IBM/integrity-enforcer/shield/pkg/common/common"
  config "github.com/IBM/integrity-enforcer/shield/pkg/shield/config"
- handlerutil "github.com/IBM/integrity-enforcer/shield/pkg/shield/handlerutil"
  sign "github.com/IBM/integrity-enforcer/shield/pkg/shield/sign"
 )
 
@@ -75,7 +74,7 @@ func inScopeCheck(reqc *common.ReqContext, config *config.ShieldConfig, data *Ru
 }
 
 func formatCheck(reqc *common.ReqContext, config *config.ShieldConfig, data *RunData, ctx *CheckContext) *DecisionResult {
- if ok, msg := handlerutil.ValidateResource(reqc, config.Namespace); !ok {
+ if ok, msg := ValidateResource(reqc, config.Namespace); !ok {
  ctx.Allow = false
  ctx.ReasonCode = common.REASON_VALIDATION_FAIL
  ctx.Message = msg
@@ -220,7 +219,7 @@ func singleProfileCheck(singleProfile rspapi.ResourceSigningProfile, reqc *commo
  var mutResult *common.MutationEvalResult
  var err error
  if reqc.IsUpdateRequest() {
- mutResult, err = handlerutil.NewMutationChecker().Eval(reqc, singleProfile)
+ mutResult, err = NewMutationChecker().Eval(reqc, singleProfile)
  if err != nil {
  return false, common.REASON_ERROR, err.Error(), nil, mutResult
  }

diff --git a/shield/pkg/shield/handlerutil/mutation.go → shield/pkg/shield/handler/mutation.go b/shield/pkg/shield/handlerutil/mutation.go → shield/pkg/shield/handler/mutation.go
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-package handlerutil
+package shield
 
 import (
  "strings"

diff --git a/shield/pkg/shield/handlerutil/patch.go → shield/pkg/shield/handler/patch.go b/shield/pkg/shield/handlerutil/patch.go → shield/pkg/shield/handler/patch.go
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-package handlerutil
+package shield
 
 import (
  "encoding/json"

diff --git a/shield/pkg/shield/handlerutil/validation.go → shield/pkg/shield/handler/validation.go b/shield/pkg/shield/handlerutil/validation.go → shield/pkg/shield/handler/validation.go
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-package handlerutil
+package shield
 
 import (
  "encoding/json"

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.projectKey=open-cluster-management_integrity-shield
 sonar.projectName=integrity-shield
 sonar.sources=.
-sonar.exclusions=**/*_test.go,**/*_generated*.go,**/*_generated/**,**/vendor/**,**/e2e/**,**/test/**,shield/pkg/apis/**
+sonar.exclusions=**/*_test.go,**/*_generated*.go,**/*_generated/**,**/vendor/**,**/e2e/**,**/test/**,shield/pkg/apis/**,shield/pkg/client/**,shield/pkg/plugins/**,integrity-shield-operator/pkg/api/**
 sonar.tests=.
 sonar.test.inclusions=**/*_test.go
 sonar.test.exclusions=**/*_generated*.go,**/*_generated/**,**/vendor/**,**/e2e/**,**/test/**