lint: gopls fixes
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
+1
-1
@@ -100,7 +100,7 @@ func testCreateRemoteContainer(t *testing.T, sb integration.Sandbox) {
|
||||
out, err = inspectCmd(sb, withArgs(remoteBuilderName))
|
||||
require.NoError(t, err, out)
|
||||
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if v, ok := strings.CutPrefix(line, "Status:"); ok {
|
||||
require.Equal(t, "running", strings.TrimSpace(v))
|
||||
return
|
||||
|
||||
+4
-4
@@ -32,7 +32,7 @@ func testInspect(t *testing.T, sb integration.Sandbox) {
|
||||
var name string
|
||||
var driver string
|
||||
var hostGatewayIP string
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if v, ok := strings.CutPrefix(line, "Name:"); ok && name == "" {
|
||||
name = strings.TrimSpace(v)
|
||||
}
|
||||
@@ -75,7 +75,7 @@ func testInspectBuildkitdFlags(t *testing.T, sb integration.Sandbox) {
|
||||
out, err = inspectCmd(sb, withArgs(builderName))
|
||||
require.NoError(t, err, out)
|
||||
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if v, ok := strings.CutPrefix(line, "BuildKit daemon flags:"); ok {
|
||||
require.Contains(t, v, "--oci-worker-net=bridge")
|
||||
return
|
||||
@@ -105,7 +105,7 @@ func testInspectNetworkHostEntitlement(t *testing.T, sb integration.Sandbox) {
|
||||
out, err = inspectCmd(sb, withArgs(builderName))
|
||||
require.NoError(t, err, out)
|
||||
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if v, ok := strings.CutPrefix(line, "BuildKit daemon flags:"); ok {
|
||||
require.Contains(t, v, "--allow-insecure-entitlement=network.host")
|
||||
return
|
||||
@@ -160,7 +160,7 @@ insecure-entitlements = ["network.host", "security.insecure"]
|
||||
var fileLines []string
|
||||
var fileFound bool
|
||||
var reConfLine = regexp.MustCompile(`^[\s\t]*>\s(.*)`)
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if strings.HasPrefix(line, "File#buildkitd.toml:") {
|
||||
fileFound = true
|
||||
continue
|
||||
|
||||
@@ -184,7 +184,7 @@ func buildkitVersion(t *testing.T, sb integration.Sandbox) string {
|
||||
if !ok {
|
||||
out, err := inspectCmd(sb, withArgs(sb.Address()))
|
||||
require.NoError(t, err, out)
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if v, ok := strings.CutPrefix(line, "BuildKit version:"); ok {
|
||||
ver = strings.TrimSpace(v)
|
||||
bkvers[sb.Name()] = ver
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ func testLs(t *testing.T, sb integration.Sandbox) {
|
||||
out, err := lsCmd(sb, withArgs(tt.args...))
|
||||
require.NoError(t, err, out)
|
||||
found := false
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
for line := range strings.SplitSeq(out, "\n") {
|
||||
if strings.Contains(line, sb.Address()) {
|
||||
found = true
|
||||
require.Contains(t, line, sbDriver)
|
||||
|
||||
@@ -27,8 +27,7 @@ func InitDockerWorker() {
|
||||
})
|
||||
// e.g. `docker@26.0=/opt/docker-26.0,docker@25.0=/opt/docker-25.0`
|
||||
if s := os.Getenv("TEST_DOCKER_EXTRA"); s != "" {
|
||||
entries := strings.Split(s, ",")
|
||||
for _, entry := range entries {
|
||||
for entry := range strings.SplitSeq(s, ",") {
|
||||
ver, bin, err := func(entry string) (string, string, error) {
|
||||
p1 := strings.Split(strings.TrimSpace(entry), "=")
|
||||
if len(p1) != 2 {
|
||||
|
||||
Reference in New Issue
Block a user