Skip to content

Commit c7ed4e4

Browse files
shubham-pampattiwarclaude
authored andcommitted
fix: resolve linter failures (gofmt, gocyclo)
Run gofmt on files with alignment issues and add nolint:gocyclo directive to TestLoadConfigFromEnv (complexity 31, threshold 30) matching the existing pattern in TestBuildDatamoverPod. Refs: #23 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent d600bcf commit c7ed4e4

4 files changed

Lines changed: 47 additions & 46 deletions

File tree

internal/controller/kubevirt_dataupload_controller.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,10 +1585,10 @@ func (r *KubeVirtDataUploadReconciler) buildDatamoverPodConfig(
15851585
}
15861586

15871587
return &DatamoverPodConfig{
1588-
Name: du.Name, // Used as a prefix for GenerateName
1589-
Namespace: vmRef.Namespace,
1590-
Image: image,
1591-
ImagePullPolicy: pullPolicy,
1588+
Name: du.Name, // Used as a prefix for GenerateName
1589+
Namespace: vmRef.Namespace,
1590+
Image: image,
1591+
ImagePullPolicy: pullPolicy,
15921592
BSLProvider: cfg.Provider,
15931593
BSLBucket: cfg.Bucket,
15941594
BSLPrefix: cfg.Prefix,
@@ -1599,17 +1599,17 @@ func (r *KubeVirtDataUploadReconciler) buildDatamoverPodConfig(
15991599
BSLCACert: cfg.CACert,
16001600
CredentialSecretName: cfg.CredentialName,
16011601
CredentialSecretKey: cfg.CredentialKey,
1602-
VMName: vmRef.Name,
1603-
VMNamespace: vmRef.Namespace,
1604-
CheckpointName: checkpointName,
1605-
BackupType: backupType,
1606-
VeleroBackupName: getVeleroBackupName(du),
1607-
DataUploadName: du.Name,
1608-
DataUploadUID: string(du.UID),
1609-
VMBName: vmb.Name,
1610-
VMBTName: vmbtName,
1611-
SourcePVCName: "", // overridden by handlePrepared with the rebound PVC name
1612-
Labels: make(map[string]string),
1602+
VMName: vmRef.Name,
1603+
VMNamespace: vmRef.Namespace,
1604+
CheckpointName: checkpointName,
1605+
BackupType: backupType,
1606+
VeleroBackupName: getVeleroBackupName(du),
1607+
DataUploadName: du.Name,
1608+
DataUploadUID: string(du.UID),
1609+
VMBName: vmb.Name,
1610+
VMBTName: vmbtName,
1611+
SourcePVCName: "", // overridden by handlePrepared with the rebound PVC name
1612+
Labels: make(map[string]string),
16131613
}, nil
16141614
}
16151615

internal/controller/pod_builder_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -350,32 +350,32 @@ func TestDatamoverPodConfigDefaults(t *testing.T) {
350350
// insensitive) should produce true; "false" must not.
351351
func TestS3CompatibleBooleanRoundtrip(t *testing.T) {
352352
tests := []struct {
353-
name string
354-
s3ForcePathStyle string
353+
name string
354+
s3ForcePathStyle string
355355
insecureSkipTLSVerify string
356-
wantForcePathStyle bool
357-
wantInsecureSkip bool
356+
wantForcePathStyle bool
357+
wantInsecureSkip bool
358358
}{
359359
{
360-
name: "both true",
361-
s3ForcePathStyle: "true",
360+
name: "both true",
361+
s3ForcePathStyle: "true",
362362
insecureSkipTLSVerify: "true",
363-
wantForcePathStyle: true,
364-
wantInsecureSkip: true,
363+
wantForcePathStyle: true,
364+
wantInsecureSkip: true,
365365
},
366366
{
367-
name: "both false (from strconv.FormatBool)",
368-
s3ForcePathStyle: "false",
367+
name: "both false (from strconv.FormatBool)",
368+
s3ForcePathStyle: "false",
369369
insecureSkipTLSVerify: "false",
370-
wantForcePathStyle: false,
371-
wantInsecureSkip: false,
370+
wantForcePathStyle: false,
371+
wantInsecureSkip: false,
372372
},
373373
{
374-
name: "both empty",
375-
s3ForcePathStyle: "",
374+
name: "both empty",
375+
s3ForcePathStyle: "",
376376
insecureSkipTLSVerify: "",
377-
wantForcePathStyle: false,
378-
wantInsecureSkip: false,
377+
wantForcePathStyle: false,
378+
wantInsecureSkip: false,
379379
},
380380
}
381381

pkg/uploader/run.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,25 @@ func Run(ctx context.Context, logger logr.Logger) error {
136136
// LoadConfigFromEnv parses environment variables into UploaderConfig.
137137
func LoadConfigFromEnv() (*UploaderConfig, error) {
138138
config := &UploaderConfig{
139-
BSLProvider: os.Getenv(EnvBSLProvider),
140-
BSLBucket: os.Getenv(EnvBSLBucket),
141-
BSLPrefix: os.Getenv(EnvBSLPrefix),
142-
BSLRegion: os.Getenv(EnvBSLRegion),
139+
BSLProvider: os.Getenv(EnvBSLProvider),
140+
BSLBucket: os.Getenv(EnvBSLBucket),
141+
BSLPrefix: os.Getenv(EnvBSLPrefix),
142+
BSLRegion: os.Getenv(EnvBSLRegion),
143143
BSLS3URL: os.Getenv(EnvBSLS3URL),
144144
BSLS3ForcePathStyle: strings.EqualFold(os.Getenv(EnvBSLS3ForcePathStyle), "true"),
145145
BSLInsecureSkipTLSVerify: strings.EqualFold(os.Getenv(EnvBSLInsecureSkipTLSVerify), "true"),
146146
BSLCACert: os.Getenv(EnvBSLCACert),
147-
CredentialsFile: os.Getenv(EnvCredentialsFile),
148-
VMName: os.Getenv(EnvVMName),
149-
VMNamespace: os.Getenv(EnvVMNamespace),
150-
CheckpointName: os.Getenv(EnvCheckpointName),
151-
BackupType: os.Getenv(EnvBackupType),
152-
VeleroBackupName: os.Getenv(EnvVeleroBackupName),
153-
DataUploadName: os.Getenv(EnvDataUploadName),
154-
DataUploadUID: os.Getenv(EnvDataUploadUID),
155-
VMBName: os.Getenv(EnvVMBName),
156-
VMBTName: os.Getenv(EnvVMBTName),
157-
SourcePVCPath: os.Getenv(EnvSourcePVCPath),
147+
CredentialsFile: os.Getenv(EnvCredentialsFile),
148+
VMName: os.Getenv(EnvVMName),
149+
VMNamespace: os.Getenv(EnvVMNamespace),
150+
CheckpointName: os.Getenv(EnvCheckpointName),
151+
BackupType: os.Getenv(EnvBackupType),
152+
VeleroBackupName: os.Getenv(EnvVeleroBackupName),
153+
DataUploadName: os.Getenv(EnvDataUploadName),
154+
DataUploadUID: os.Getenv(EnvDataUploadUID),
155+
VMBName: os.Getenv(EnvVMBName),
156+
VMBTName: os.Getenv(EnvVMBTName),
157+
SourcePVCPath: os.Getenv(EnvSourcePVCPath),
158158
}
159159

160160
// Apply defaults

pkg/uploader/run_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ func TestExtractDiskName(t *testing.T) {
137137
}
138138
}
139139

140+
//nolint:gocyclo // Table-driven test with many validation cases
140141
func TestLoadConfigFromEnv(t *testing.T) {
141142
// Save original env and restore after test
142143
originalEnv := map[string]string{

0 commit comments

Comments
 (0)