Skip to content

Commit ee9df19

Browse files
temporary commit for sonar test
1 parent 81caaca commit ee9df19

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

integrity-shield-operator/api/v1alpha1/integrityshield_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const (
5555
DefaultResourceSigningProfileYamlPath = "./resources/default-rsp.yaml"
5656
DefaultKeyringFilename = "pubring.gpg"
5757
DefaultIShieldWebhookTimeout = 10
58-
SATokenPath = "/var/run/secrets/kubernetes.io/serviceaccount/token"
58+
SATokenPath = "/var/run/secrets/kubernetes.io/serviceaccount/token" //NOSONAR
5959
)
6060

6161
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!

integrity-shield-operator/cert/cert.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ func GenerateCert(svcName, NS string) ([]byte, []byte, []byte, error) {
5353
return nil, nil, nil, err
5454
}
5555
caPEM := new(bytes.Buffer)
56-
pem.Encode(caPEM, &pem.Block{
56+
_ = pem.Encode(caPEM, &pem.Block{
5757
Type: "CERTIFICATE",
5858
Bytes: caBytes,
5959
})
6060

6161
caKeyPEM := new(bytes.Buffer)
62-
pem.Encode(caKeyPEM, &pem.Block{
62+
_ = pem.Encode(caKeyPEM, &pem.Block{
6363
Type: "RSA PRIVATE KEY",
6464
Bytes: x509.MarshalPKCS1PrivateKey(caKey),
6565
})
@@ -71,7 +71,7 @@ func GenerateCert(svcName, NS string) ([]byte, []byte, []byte, error) {
7171
}
7272

7373
tlsPrivKeyPEM := new(bytes.Buffer)
74-
pem.Encode(tlsPrivKeyPEM, &pem.Block{
74+
_ = pem.Encode(tlsPrivKeyPEM, &pem.Block{
7575
Type: "RSA PRIVATE KEY",
7676
Bytes: x509.MarshalPKCS1PrivateKey(tlsKey),
7777
})
@@ -94,7 +94,7 @@ func GenerateCert(svcName, NS string) ([]byte, []byte, []byte, error) {
9494
return nil, nil, nil, err
9595
}
9696
certPEM := new(bytes.Buffer)
97-
pem.Encode(certPEM, &pem.Block{
97+
_ = pem.Encode(certPEM, &pem.Block{
9898
Type: "CERTIFICATE",
9999
Bytes: certBytes,
100100
})

integrity-shield-operator/pgpkey/pgpkey.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"fmt"
2222
"io/ioutil"
2323
"os"
24+
"path/filepath"
2425

2526
"golang.org/x/crypto/openpgp"
2627
)
@@ -92,7 +93,7 @@ func CreateKeyringFile(path string, signers []string, invalidSigners []string) e
9293
if err != nil {
9394
return errors.New(fmt.Sprintf("Error in creating private keyring file; %s", err.Error()))
9495
}
95-
defer secfile.Close()
96+
defer secfile.Close() //NOSONAR
9697

9798
for _, ent := range entList {
9899
err := ent.SerializePrivate(secfile, nil)
@@ -105,7 +106,7 @@ func CreateKeyringFile(path string, signers []string, invalidSigners []string) e
105106
if err != nil {
106107
return errors.New(fmt.Sprintf("Error in creating public keyring file; %s", err.Error()))
107108
}
108-
defer pubfile.Close()
109+
defer pubfile.Close() //NOSONAR
109110

110111
for _, ent := range entList {
111112
idt := getFirstIdentity(ent.Identities)
@@ -122,12 +123,12 @@ func CreateKeyringFile(path string, signers []string, invalidSigners []string) e
122123
}
123124

124125
func GetKeyringValue(path string) (*Keyring, error) {
125-
rawPub, err := ioutil.ReadFile(path + defaultPublicKeyringName)
126+
rawPub, err := ioutil.ReadFile(filepath.Clean(path + defaultPublicKeyringName))
126127
if err != nil {
127128
return nil, errors.New(fmt.Sprintf("Error in getting value of public keyring; %s", err.Error()))
128129
}
129130

130-
rawSec, err := ioutil.ReadFile(path + defaultPrivateKeyringName)
131+
rawSec, err := ioutil.ReadFile(filepath.Clean(path + defaultPrivateKeyringName))
131132
if err != nil {
132133
return nil, errors.New(fmt.Sprintf("Error in getting value private keyring; %s", err.Error()))
133134
}

integrity-shield-operator/resources/utils.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"encoding/json"
2121
"fmt"
2222
"io/ioutil"
23+
"path/filepath"
2324
"reflect"
2425
"strings"
2526

@@ -86,7 +87,7 @@ func MergeDefaultIntegrityShieldCR(cr *apiv1alpha1.IntegrityShield, srcYamlPath
8687
if srcYamlPath == "" {
8788
srcYamlPath = apiv1alpha1.DefaultIShieldCRYamlPath
8889
}
89-
deafultCRBytes, _ := ioutil.ReadFile(srcYamlPath)
90+
deafultCRBytes, _ := ioutil.ReadFile(filepath.Clean(srcYamlPath))
9091
defaultCRJsonBytes, err := yaml.YAMLToJSON(deafultCRBytes)
9192
if err != nil {
9293
fmt.Println("failed to convert yaml2json; " + err.Error())

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sonar.projectKey=open-cluster-management_integrity-shield
22
sonar.projectName=integrity-shield
33
sonar.sources=.
4-
sonar.exclusions=**/*_test.go,**/*_generated*.go,**/*_generated/**,**/vendor/**,**/e2e/**,**/test/**
4+
sonar.exclusions=**/*_test.go,**/*_generated*.go,**/*_generated/**,**/vendor/**,**/e2e/**,**/test/**,shield/pkg/apis/**
55
sonar.tests=.
66
sonar.test.inclusions=**/*_test.go
77
sonar.test.exclusions=**/*_generated*.go,**/*_generated/**,**/vendor/**,**/e2e/**,**/test/**

0 commit comments

Comments
 (0)