Merge pull request #208 from kaovilai/static-checks

reasonerjt · web-flow · commit cedace153b40 · 2024-10-22T15:02:28.000+08:00
static checks
diff --git a/velero-plugin-for-aws/volume_snapshotter.go b/velero-plugin-for-aws/volume_snapshotter.go
@@ -242,7 +242,7 @@ func (b *VolumeSnapshotter) DeleteSnapshot(snapshotID string) error {
 	// see https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html
 	var apiErr smithy.APIError
 	if errors.As(err, &apiErr) {
-		if "InvalidSnapshot.NotFound" == apiErr.ErrorCode() {
+		if apiErr.ErrorCode() == "InvalidSnapshot.NotFound" {
 			return nil
 		}
 	}
diff --git a/velero-plugin-for-aws/volume_snapshotter_test.go b/velero-plugin-for-aws/volume_snapshotter_test.go
@@ -132,7 +132,7 @@ func TestSetVolumeID(t *testing.T) {
 	}
 
 	// missing spec.awsElasticBlockStore -> error
-	updatedPV, err := b.SetVolumeID(pv, "vol-updated")
+	_, err := b.SetVolumeID(pv, "vol-updated")
 	require.Error(t, err)
 
 	// happy path
@@ -149,7 +149,7 @@ func TestSetVolumeID(t *testing.T) {
 		"labels": labels,
 	}
 
-	updatedPV, err = b.SetVolumeID(pv, "vol-updated")
+	updatedPV, err := b.SetVolumeID(pv, "vol-updated")
 
 	require.NoError(t, err)
 
@@ -167,7 +167,7 @@ func TestSetVolumeIDNoZone(t *testing.T) {
 	}
 
 	// missing spec.awsElasticBlockStore -> error
-	updatedPV, err := b.SetVolumeID(pv, "vol-updated")
+	_, err := b.SetVolumeID(pv, "vol-updated")
 	require.Error(t, err)
 
 	// happy path
@@ -176,7 +176,7 @@ func TestSetVolumeIDNoZone(t *testing.T) {
 		"awsElasticBlockStore": aws,
 	}
 
-	updatedPV, err = b.SetVolumeID(pv, "vol-updated")
+	updatedPV, err := b.SetVolumeID(pv, "vol-updated")
 
 	require.NoError(t, err)
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func (b *VolumeSnapshotter) DeleteSnapshot(snapshotID string) error {`
`242`	`242`	`// see https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html`
`243`	`243`	`var apiErr smithy.APIError`
`244`	`244`	`if errors.As(err, &apiErr) {`
`245`		`- if "InvalidSnapshot.NotFound" == apiErr.ErrorCode() {`
	`245`	`+ if apiErr.ErrorCode() == "InvalidSnapshot.NotFound" {`
`246`	`246`	`return nil`
`247`	`247`	`}`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func TestSetVolumeID(t *testing.T) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`// missing spec.awsElasticBlockStore -> error`
`135`		`- updatedPV, err := b.SetVolumeID(pv, "vol-updated")`
	`135`	`+ _, err := b.SetVolumeID(pv, "vol-updated")`
`136`	`136`	`require.Error(t, err)`
`137`	`137`
`138`	`138`	`// happy path`
`@@ -149,7 +149,7 @@ func TestSetVolumeID(t *testing.T) {`
`149`	`149`	`"labels": labels,`
`150`	`150`	`}`
`151`	`151`
`152`		`- updatedPV, err = b.SetVolumeID(pv, "vol-updated")`
	`152`	`+ updatedPV, err := b.SetVolumeID(pv, "vol-updated")`
`153`	`153`
`154`	`154`	`require.NoError(t, err)`
`155`	`155`
`@@ -167,7 +167,7 @@ func TestSetVolumeIDNoZone(t *testing.T) {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`// missing spec.awsElasticBlockStore -> error`
`170`		`- updatedPV, err := b.SetVolumeID(pv, "vol-updated")`
	`170`	`+ _, err := b.SetVolumeID(pv, "vol-updated")`
`171`	`171`	`require.Error(t, err)`
`172`	`172`
`173`	`173`	`// happy path`
`@@ -176,7 +176,7 @@ func TestSetVolumeIDNoZone(t *testing.T) {`
`176`	`176`	`"awsElasticBlockStore": aws,`
`177`	`177`	`}`
`178`	`178`
`179`		`- updatedPV, err = b.SetVolumeID(pv, "vol-updated")`
	`179`	`+ updatedPV, err := b.SetVolumeID(pv, "vol-updated")`
`180`	`180`
`181`	`181`	`require.NoError(t, err)`
`182`	`182`