Skip to content

Commit 92a0741

Browse files
authored
Merge branch 'main' into renovate/cso-builder-image
2 parents fd94ed6 + fce238f commit 92a0741

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.github/actions/setup-go/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: "composite"
55
steps:
66
- name: Install go
7-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
7+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
88
with:
99
go-version: "1.24"
1010
go-version-file: "go.mod"

internal/controller/clusterstack_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ func TestMakeDiff(t *testing.T) {
117117
expectedToDelete := []*csov1alpha1.ClusterStackRelease{csr1}
118118

119119
if !reflect.DeepEqual(toString(toCreate), toString(expectedToCreate)) {
120-
t.Errorf("toCreate is not as expected")
120+
t.Error("toCreate is not as expected")
121121
}
122122

123123
if !reflect.DeepEqual(toString(toDelete), toString(expectedToDelete)) {
124-
t.Errorf("toDelete is not as expected")
124+
t.Error("toDelete is not as expected")
125125
}
126126

127127
// Test Case 2:
@@ -239,7 +239,7 @@ func TestGetLatestReadyClusterStackRelease(t *testing.T) {
239239
}
240240
expectedLatest := "docker-ferrol-1-21-v3"
241241
if latest == nil {
242-
t.Errorf("Expected latest to be non-nil, but got nil")
242+
t.Error("Expected latest to be non-nil, but got nil")
243243
} else if *latest != expectedLatest {
244244
t.Errorf("Expected latest to be %s, but got %s", expectedLatest, *latest)
245245
}

pkg/test/utils/conditions.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
//revive:disable:var-naming
1718
package utils
1819

20+
//revive:enable:var-naming
1921
import (
2022
"context"
2123

pkg/test/utils/mod.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ limitations under the License.
1515
*/
1616

1717
// Package utils contains important functions for envtest.
18+
//
19+
//revive:disable:var-naming
1820
package utils
1921

22+
//revive:enable:var-naming
23+
2024
import (
2125
"fmt"
2226
"os"

0 commit comments

Comments
 (0)