Skip to content

Commit ec456b4

Browse files
matttrachmatttrach
committed
fix: lint errors and add linting check to CI
Signed-off-by: matttrach <matt.trachier@suse.com>
1 parent f3eaf65 commit ec456b4

11 files changed

Lines changed: 247 additions & 94 deletions

File tree

‎.envrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ if ! which "$0" | grep -q nix; then
3737
fi
3838

3939
echo 'Installing Nix Profile...'
40-
if ! nf profile install . --profile "$profile"; then
40+
if ! nf profile add . --profile "$profile"; then
4141
echo 'Failed to install new Nix profile! Reverting to previous profile...'
4242
git checkout flake.lock
43-
nf profile install . --profile "$profile"
43+
nf profile add . --profile "$profile"
4444
fi
4545

4646
nf profile list --profile "$profile"

‎flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
gitleaks
6060
gnupg
6161
go
62-
golint
62+
golangci-lint
6363
gotestfmt
6464
gotestsum
6565
kubernetes-helm

‎run_tests.sh‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,30 @@ if [ -z "$GITHUB_OWNER" ]; then echo "GITHUB_OWNER isn't set"; else echo "GITHUB
186186
if [ -z "$ZONE" ]; then echo "ZONE isn't set"; else echo "ZONE is set"; fi
187187

188188
if [ -z "$cleanup_id" ]; then
189-
echo "checking tests for compile errors..."
189+
190+
190191
D="$(pwd)"
191192

193+
echo "tidying..."
192194
cd "$REPO_ROOT/test/tests" || exit
193195
if ! go mod tidy; then C=$?; echo "failed to tidy, exit code $C"; exit $C; fi
194-
echo "completed tidy..."
195196

197+
echo "checking tests for compile errors..."
196198
while IFS= read -r file; do
197199
echo "found $file";
198200
if ! go test -c "$file" -o "${file}.test"; then C=$?; echo "failed to compile $file, exit code $C"; exit $C; fi
199201
rm -rf "${file}.test"
200202
done <<< "$(find "$REPO_ROOT/test" -not \( -path "$REPO_ROOT/test/tests/data" -prune \) -name '*.go')"
201203
echo "compile checks passed..."
202204

205+
echo "checking tests for go lint errors..."
206+
if ! golangci-lint run; then echo "lint failed..."; exit 1; fi
207+
echo "lint errors complete"
208+
209+
echo "formatting tests..."
210+
gofmt -s -w -e .
211+
echo "done formatting"
212+
203213
cd "$D" || exit
204214

205215
echo "checking terraform configs for errors..."

‎test/tests/dev/basic_test.go‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ import (
1515

1616
func TestDevBasic(t *testing.T) {
1717
t.Parallel()
18+
var err error
19+
var err2 error
1820
id := util.GetId()
1921
region := util.GetRegion()
2022
directory := "dev"
2123
owner := "terraform-ci@suse.com"
22-
acme_server_url := util.SetAcmeServer()
2324

2425
repoRoot, err := filepath.Abs(g.GetRepoRoot(t))
2526
if err != nil {
@@ -31,25 +32,39 @@ func TestDevBasic(t *testing.T) {
3132

3233
err = util.CreateTestDirectories(t, id)
3334
if err != nil {
34-
os.RemoveAll(testDir)
35+
err2 = os.RemoveAll(testDir)
36+
if err2 != nil {
37+
t.Logf("Error removing test data directories: %s", err2)
38+
}
3539
t.Fatalf("Error creating test data directories: %s", err)
3640
}
3741
keyPair, err := util.CreateKeypair(t, region, owner, id)
3842
if err != nil {
39-
os.RemoveAll(testDir)
43+
err2 = os.RemoveAll(testDir)
44+
if err2 != nil {
45+
t.Logf("Error removing test data directories: %s", err2)
46+
}
4047
t.Fatalf("Error creating test key pair: %s", err)
4148
}
42-
err = os.WriteFile(testDir+"/id_rsa", []byte(keyPair.KeyPair.PrivateKey), 0600)
49+
keyPairObj := keyPair.KeyPair
50+
privateKey := keyPairObj.PrivateKey
51+
publicKey := keyPairObj.PublicKey
52+
keyPairName := keyPair.Name
53+
54+
err = os.WriteFile(testDir+"/id_rsa", []byte(privateKey), 0600)
4355
if err != nil {
44-
err = aws.DeleteEC2KeyPairE(t, keyPair)
45-
if err != nil {
46-
t.Logf("Failed to destroy key pair: %v", err)
56+
err2 = aws.DeleteEC2KeyPairE(t, keyPair)
57+
if err2 != nil {
58+
t.Logf("Failed to destroy key pair: %v", err2)
59+
}
60+
err2 = os.RemoveAll(testDir)
61+
if err2 != nil {
62+
t.Logf("Error removing test data directories: %s", err2)
4763
}
48-
os.RemoveAll(testDir)
4964
t.Fatalf("Error creating test key pair: %s", err)
5065
}
51-
sshAgent := ssh.SshAgentWithKeyPair(t, keyPair.KeyPair)
52-
t.Logf("Key %s created and added to agent", keyPair.Name)
66+
sshAgent := ssh.SshAgentWithKeyPair(t, keyPairObj)
67+
t.Logf("Key %s created and added to agent", keyPairName)
5368

5469
backendTerraformOptions, err := util.CreateObjectStorageBackend(t, testDir, id, owner, region)
5570
tfOptions := []*terraform.Options{backendTerraformOptions}
@@ -83,13 +98,12 @@ func TestDevBasic(t *testing.T) {
8398
Vars: map[string]interface{}{
8499
"identifier": id,
85100
"owner": owner,
86-
"key_name": keyPair.Name,
87-
"key": keyPair.KeyPair.PublicKey,
101+
"key_name": keyPairName,
102+
"key": publicKey,
88103
"zone": os.Getenv("ZONE"),
89104
"rke2_version": rke2Version,
90105
"rancher_version": rancherVersion,
91106
"file_path": testDir,
92-
"acme_server_url": acme_server_url,
93107
},
94108
// Environment variables to set when running Terraform
95109
EnvVars: map[string]string{

‎test/tests/downstream/basic_test.go‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ import (
1414

1515
func TestDownstreamBasic(t *testing.T) {
1616
t.Parallel()
17+
var err error
18+
var err2 error
1719
id := util.GetId()
1820
region := util.GetRegion()
1921
accessKey := util.GetAwsAccessKey()
2022
secretKey := util.GetAwsSecretKey()
2123
sessionToken := util.GetAwsSessionToken()
2224
directory := "downstream"
2325
owner := "terraform-ci@suse.com"
24-
acme_server_url := util.SetAcmeServer()
26+
acme_server_url := util.SetAcmeServer(t)
2527

2628
repoRoot, err := filepath.Abs(g.GetRepoRoot(t))
2729
if err != nil {
@@ -33,26 +35,43 @@ func TestDownstreamBasic(t *testing.T) {
3335

3436
err = util.CreateTestDirectories(t, id)
3537
if err != nil {
36-
os.RemoveAll(testDir)
38+
err2 = os.RemoveAll(testDir)
39+
if err2 != nil {
40+
t.Logf("Error removing data directories: %s", err2)
41+
}
3742
t.Fatalf("Error creating test data directories: %s", err)
3843
}
3944
keyPair, err := util.CreateKeypair(t, region, owner, id)
4045
if err != nil {
41-
os.RemoveAll(testDir)
46+
err2 = os.RemoveAll(testDir)
47+
if err2 != nil {
48+
t.Logf("Error removing data directories: %s", err2)
49+
}
4250
t.Fatalf("Error creating test key pair: %s", err)
4351
}
44-
err = os.WriteFile(testDir+"/id_rsa", []byte(keyPair.KeyPair.PrivateKey), 0600)
52+
keyPairObj := keyPair.KeyPair
53+
privateKey := keyPairObj.PrivateKey
54+
publicKey := keyPairObj.PublicKey
55+
keyPairName := keyPair.Name
56+
57+
err = os.WriteFile(testDir+"/id_rsa", []byte(privateKey), 0600)
4558
if err != nil {
46-
os.RemoveAll(testDir)
59+
err2 = os.RemoveAll(testDir)
60+
if err2 != nil {
61+
t.Logf("Error removing data directories: %s", err2)
62+
}
4763
t.Fatalf("Error creating test key pair: %s", err)
4864
}
49-
sshAgent := ssh.SshAgentWithKeyPair(t, keyPair.KeyPair)
50-
t.Logf("Key %s created and added to agent", keyPair.Name)
65+
sshAgent := ssh.SshAgentWithKeyPair(t, keyPairObj)
66+
t.Logf("Key %s created and added to agent", keyPairName)
5167

5268
// use oldest RKE2, remember it releases much more than Rancher
5369
_, _, rke2Version, err := util.GetRke2Releases()
5470
if err != nil {
55-
os.RemoveAll(testDir)
71+
err2 = os.RemoveAll(testDir)
72+
if err2 != nil {
73+
t.Logf("Error removing data directories: %s", err2)
74+
}
5675
aws.DeleteEC2KeyPair(t, keyPair)
5776
sshAgent.Stop()
5877
t.Fatalf("Error getting Rke2 release version: %s", err)
@@ -65,7 +84,10 @@ func TestDownstreamBasic(t *testing.T) {
6584
_, rancherVersion, _, err = util.GetRancherReleases()
6685
}
6786
if err != nil {
68-
os.RemoveAll(testDir)
87+
err2 = os.RemoveAll(testDir)
88+
if err2 != nil {
89+
t.Logf("Error removing data directories: %s", err2)
90+
}
6991
aws.DeleteEC2KeyPair(t, keyPair)
7092
sshAgent.Stop()
7193
t.Fatalf("Error getting Rancher release version: %s", err)
@@ -77,8 +99,8 @@ func TestDownstreamBasic(t *testing.T) {
7799
Vars: map[string]interface{}{
78100
"identifier": id,
79101
"owner": owner,
80-
"key_name": keyPair.Name,
81-
"key": keyPair.KeyPair.PublicKey,
102+
"key_name": keyPairName,
103+
"key": publicKey,
82104
"zone": os.Getenv("ZONE"),
83105
"rke2_version": rke2Version,
84106
"rancher_version": rancherVersion,

‎test/tests/downstream/splitrole_test.go‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ import (
1414

1515
func TestDownstreamSplitrole(t *testing.T) {
1616
t.Parallel()
17+
var err error
18+
var err2 error
1719
id := util.GetId()
1820
region := util.GetRegion()
1921
accessKey := util.GetAwsAccessKey()
2022
secretKey := util.GetAwsSecretKey()
2123
sessionToken := util.GetAwsSessionToken()
2224
directory := "downstream_splitrole"
2325
owner := "terraform-ci@suse.com"
24-
acme_server_url := util.SetAcmeServer()
26+
acme_server_url := util.SetAcmeServer(t)
2527

2628
repoRoot, err := filepath.Abs(g.GetRepoRoot(t))
2729
if err != nil {
@@ -33,28 +35,44 @@ func TestDownstreamSplitrole(t *testing.T) {
3335

3436
err = util.CreateTestDirectories(t, id)
3537
if err != nil {
36-
os.RemoveAll(testDir)
38+
err2 = os.RemoveAll(testDir)
39+
if err2 != nil {
40+
t.Logf("Error removing data directories: %s", err2)
41+
}
3742
t.Fatalf("Error creating test data directories: %s", err)
3843
}
3944
keyPair, err := util.CreateKeypair(t, region, owner, id)
4045
if err != nil {
41-
os.RemoveAll(testDir)
46+
err2 = os.RemoveAll(testDir)
47+
if err2 != nil {
48+
t.Logf("Error removing data directories: %s", err2)
49+
}
4250
t.Fatalf("Error creating test key pair: %s", err)
4351
}
52+
keyPairObj := keyPair.KeyPair
53+
privateKey := keyPairObj.PrivateKey
54+
publicKey := keyPairObj.PublicKey
55+
keyPairName := keyPair.Name
4456

45-
err = os.WriteFile(testDir+"/id_rsa", []byte(keyPair.KeyPair.PrivateKey), 0600)
57+
err = os.WriteFile(testDir+"/id_rsa", []byte(privateKey), 0600)
4658
if err != nil {
47-
os.RemoveAll(testDir)
59+
err2 = os.RemoveAll(testDir)
60+
if err2 != nil {
61+
t.Logf("Error removing data directories: %s", err2)
62+
}
4863
t.Fatalf("Error creating test key pair: %s", err)
4964
}
5065

51-
sshAgent := ssh.SshAgentWithKeyPair(t, keyPair.KeyPair)
52-
t.Logf("Key %s created and added to agent", keyPair.Name)
66+
sshAgent := ssh.SshAgentWithKeyPair(t, keyPairObj)
67+
t.Logf("Key %s created and added to agent", keyPairName)
5368

5469
// use oldest RKE2, remember it releases much more than Rancher
5570
_, _, rke2Version, err := util.GetRke2Releases()
5671
if err != nil {
57-
os.RemoveAll(testDir)
72+
err2 = os.RemoveAll(testDir)
73+
if err2 != nil {
74+
t.Logf("Error removing data directories: %s", err2)
75+
}
5876
aws.DeleteEC2KeyPair(t, keyPair)
5977
sshAgent.Stop()
6078
t.Fatalf("Error getting Rke2 release version: %s", err)
@@ -67,7 +85,10 @@ func TestDownstreamSplitrole(t *testing.T) {
6785
_, rancherVersion, _, err = util.GetRancherReleases()
6886
}
6987
if err != nil {
70-
os.RemoveAll(testDir)
88+
err2 = os.RemoveAll(testDir)
89+
if err2 != nil {
90+
t.Logf("Error removing data directories: %s", err2)
91+
}
7192
aws.DeleteEC2KeyPair(t, keyPair)
7293
sshAgent.Stop()
7394
t.Fatalf("Error getting Rancher release version: %s", err)
@@ -79,8 +100,8 @@ func TestDownstreamSplitrole(t *testing.T) {
79100
Vars: map[string]interface{}{
80101
"identifier": id,
81102
"owner": owner,
82-
"key_name": keyPair.Name,
83-
"key": keyPair.KeyPair.PublicKey,
103+
"key_name": keyPairName,
104+
"key": publicKey,
84105
"zone": os.Getenv("ZONE"),
85106
"rke2_version": rke2Version,
86107
"rancher_version": rancherVersion,

0 commit comments

Comments
 (0)