From 25a0be7f26c865f41c0a8aafd77cf756ac0afbad Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Fri, 21 Apr 2023 21:11:33 +0200 Subject: [PATCH] backend: fix linter warnings --- internal/backend/azure/config_test.go | 6 +-- internal/backend/b2/config_test.go | 12 +++--- internal/backend/gs/config_test.go | 6 +-- internal/backend/rclone/config_test.go | 4 +- internal/backend/s3/config_test.go | 28 ++++++------ internal/backend/sftp/config_test.go | 60 +++++++++++++------------- internal/backend/swift/config_test.go | 12 +++--- 7 files changed, 64 insertions(+), 64 deletions(-) diff --git a/internal/backend/azure/config_test.go b/internal/backend/azure/config_test.go index 0d76c98ee..49cda6571 100644 --- a/internal/backend/azure/config_test.go +++ b/internal/backend/azure/config_test.go @@ -7,17 +7,17 @@ import ( ) var configTests = []test.ConfigTestData[Config]{ - {"azure:container-name:/", Config{ + {S: "azure:container-name:/", Cfg: Config{ Container: "container-name", Prefix: "", Connections: 5, }}, - {"azure:container-name:/prefix/directory", Config{ + {S: "azure:container-name:/prefix/directory", Cfg: Config{ Container: "container-name", Prefix: "prefix/directory", Connections: 5, }}, - {"azure:container-name:/prefix/directory/", Config{ + {S: "azure:container-name:/prefix/directory/", Cfg: Config{ Container: "container-name", Prefix: "prefix/directory", Connections: 5, diff --git a/internal/backend/b2/config_test.go b/internal/backend/b2/config_test.go index 157dfc085..f62972005 100644 --- a/internal/backend/b2/config_test.go +++ b/internal/backend/b2/config_test.go @@ -7,32 +7,32 @@ import ( ) var configTests = []test.ConfigTestData[Config]{ - {"b2:bucketname", Config{ + {S: "b2:bucketname", Cfg: Config{ Bucket: "bucketname", Prefix: "", Connections: 5, }}, - {"b2:bucketname:", Config{ + {S: "b2:bucketname:", Cfg: Config{ Bucket: "bucketname", Prefix: "", Connections: 5, }}, - {"b2:bucketname:/prefix/directory", Config{ + {S: "b2:bucketname:/prefix/directory", Cfg: Config{ Bucket: "bucketname", Prefix: "prefix/directory", Connections: 5, }}, - {"b2:foobar", Config{ + {S: "b2:foobar", Cfg: Config{ Bucket: "foobar", Prefix: "", Connections: 5, }}, - {"b2:foobar:", Config{ + {S: "b2:foobar:", Cfg: Config{ Bucket: "foobar", Prefix: "", Connections: 5, }}, - {"b2:foobar:/", Config{ + {S: "b2:foobar:/", Cfg: Config{ Bucket: "foobar", Prefix: "", Connections: 5, diff --git a/internal/backend/gs/config_test.go b/internal/backend/gs/config_test.go index 927be5788..890de577f 100644 --- a/internal/backend/gs/config_test.go +++ b/internal/backend/gs/config_test.go @@ -7,19 +7,19 @@ import ( ) var configTests = []test.ConfigTestData[Config]{ - {"gs:bucketname:/", Config{ + {S: "gs:bucketname:/", Cfg: Config{ Bucket: "bucketname", Prefix: "", Connections: 5, Region: "us", }}, - {"gs:bucketname:/prefix/directory", Config{ + {S: "gs:bucketname:/prefix/directory", Cfg: Config{ Bucket: "bucketname", Prefix: "prefix/directory", Connections: 5, Region: "us", }}, - {"gs:bucketname:/prefix/directory/", Config{ + {S: "gs:bucketname:/prefix/directory/", Cfg: Config{ Bucket: "bucketname", Prefix: "prefix/directory", Connections: 5, diff --git a/internal/backend/rclone/config_test.go b/internal/backend/rclone/config_test.go index ada9df293..67b983f66 100644 --- a/internal/backend/rclone/config_test.go +++ b/internal/backend/rclone/config_test.go @@ -8,8 +8,8 @@ import ( var configTests = []test.ConfigTestData[Config]{ { - "rclone:local:foo:/bar", - Config{ + S: "rclone:local:foo:/bar", + Cfg: Config{ Remote: "local:foo:/bar", Program: defaultConfig.Program, Args: defaultConfig.Args, diff --git a/internal/backend/s3/config_test.go b/internal/backend/s3/config_test.go index 24315d159..21fbb27b9 100644 --- a/internal/backend/s3/config_test.go +++ b/internal/backend/s3/config_test.go @@ -8,88 +8,88 @@ import ( ) var configTests = []test.ConfigTestData[Config]{ - {"s3://eu-central-1/bucketname", Config{ + {S: "s3://eu-central-1/bucketname", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "bucketname", Prefix: "", Connections: 5, }}, - {"s3://eu-central-1/bucketname/", Config{ + {S: "s3://eu-central-1/bucketname/", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "bucketname", Prefix: "", Connections: 5, }}, - {"s3://eu-central-1/bucketname/prefix/directory", Config{ + {S: "s3://eu-central-1/bucketname/prefix/directory", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "bucketname", Prefix: "prefix/directory", Connections: 5, }}, - {"s3://eu-central-1/bucketname/prefix/directory/", Config{ + {S: "s3://eu-central-1/bucketname/prefix/directory/", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "bucketname", Prefix: "prefix/directory", Connections: 5, }}, - {"s3:eu-central-1/foobar", Config{ + {S: "s3:eu-central-1/foobar", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "foobar", Prefix: "", Connections: 5, }}, - {"s3:eu-central-1/foobar/", Config{ + {S: "s3:eu-central-1/foobar/", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "foobar", Prefix: "", Connections: 5, }}, - {"s3:eu-central-1/foobar/prefix/directory", Config{ + {S: "s3:eu-central-1/foobar/prefix/directory", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "foobar", Prefix: "prefix/directory", Connections: 5, }}, - {"s3:eu-central-1/foobar/prefix/directory/", Config{ + {S: "s3:eu-central-1/foobar/prefix/directory/", Cfg: Config{ Endpoint: "eu-central-1", Bucket: "foobar", Prefix: "prefix/directory", Connections: 5, }}, - {"s3:https://hostname:9999/foobar", Config{ + {S: "s3:https://hostname:9999/foobar", Cfg: Config{ Endpoint: "hostname:9999", Bucket: "foobar", Prefix: "", Connections: 5, }}, - {"s3:https://hostname:9999/foobar/", Config{ + {S: "s3:https://hostname:9999/foobar/", Cfg: Config{ Endpoint: "hostname:9999", Bucket: "foobar", Prefix: "", Connections: 5, }}, - {"s3:http://hostname:9999/foobar", Config{ + {S: "s3:http://hostname:9999/foobar", Cfg: Config{ Endpoint: "hostname:9999", Bucket: "foobar", Prefix: "", UseHTTP: true, Connections: 5, }}, - {"s3:http://hostname:9999/foobar/", Config{ + {S: "s3:http://hostname:9999/foobar/", Cfg: Config{ Endpoint: "hostname:9999", Bucket: "foobar", Prefix: "", UseHTTP: true, Connections: 5, }}, - {"s3:http://hostname:9999/bucket/prefix/directory", Config{ + {S: "s3:http://hostname:9999/bucket/prefix/directory", Cfg: Config{ Endpoint: "hostname:9999", Bucket: "bucket", Prefix: "prefix/directory", UseHTTP: true, Connections: 5, }}, - {"s3:http://hostname:9999/bucket/prefix/directory/", Config{ + {S: "s3:http://hostname:9999/bucket/prefix/directory/", Cfg: Config{ Endpoint: "hostname:9999", Bucket: "bucket", Prefix: "prefix/directory", diff --git a/internal/backend/sftp/config_test.go b/internal/backend/sftp/config_test.go index ae2494791..bf7fa9653 100644 --- a/internal/backend/sftp/config_test.go +++ b/internal/backend/sftp/config_test.go @@ -9,69 +9,69 @@ import ( var configTests = []test.ConfigTestData[Config]{ // first form, user specified sftp://user@host/dir { - "sftp://user@host/dir/subdir", - Config{User: "user", Host: "host", Path: "dir/subdir", Connections: 5}, + S: "sftp://user@host/dir/subdir", + Cfg: Config{User: "user", Host: "host", Path: "dir/subdir", Connections: 5}, }, { - "sftp://host/dir/subdir", - Config{Host: "host", Path: "dir/subdir", Connections: 5}, + S: "sftp://host/dir/subdir", + Cfg: Config{Host: "host", Path: "dir/subdir", Connections: 5}, }, { - "sftp://host//dir/subdir", - Config{Host: "host", Path: "/dir/subdir", Connections: 5}, + S: "sftp://host//dir/subdir", + Cfg: Config{Host: "host", Path: "/dir/subdir", Connections: 5}, }, { - "sftp://host:10022//dir/subdir", - Config{Host: "host", Port: "10022", Path: "/dir/subdir", Connections: 5}, + S: "sftp://host:10022//dir/subdir", + Cfg: Config{Host: "host", Port: "10022", Path: "/dir/subdir", Connections: 5}, }, { - "sftp://user@host:10022//dir/subdir", - Config{User: "user", Host: "host", Port: "10022", Path: "/dir/subdir", Connections: 5}, + S: "sftp://user@host:10022//dir/subdir", + Cfg: Config{User: "user", Host: "host", Port: "10022", Path: "/dir/subdir", Connections: 5}, }, { - "sftp://user@host/dir/subdir/../other", - Config{User: "user", Host: "host", Path: "dir/other", Connections: 5}, + S: "sftp://user@host/dir/subdir/../other", + Cfg: Config{User: "user", Host: "host", Path: "dir/other", Connections: 5}, }, { - "sftp://user@host/dir///subdir", - Config{User: "user", Host: "host", Path: "dir/subdir", Connections: 5}, + S: "sftp://user@host/dir///subdir", + Cfg: Config{User: "user", Host: "host", Path: "dir/subdir", Connections: 5}, }, // IPv6 address. { - "sftp://user@[::1]/dir", - Config{User: "user", Host: "::1", Path: "dir", Connections: 5}, + S: "sftp://user@[::1]/dir", + Cfg: Config{User: "user", Host: "::1", Path: "dir", Connections: 5}, }, // IPv6 address with port. { - "sftp://user@[::1]:22/dir", - Config{User: "user", Host: "::1", Port: "22", Path: "dir", Connections: 5}, + S: "sftp://user@[::1]:22/dir", + Cfg: Config{User: "user", Host: "::1", Port: "22", Path: "dir", Connections: 5}, }, // second form, user specified sftp:user@host:/dir { - "sftp:user@host:/dir/subdir", - Config{User: "user", Host: "host", Path: "/dir/subdir", Connections: 5}, + S: "sftp:user@host:/dir/subdir", + Cfg: Config{User: "user", Host: "host", Path: "/dir/subdir", Connections: 5}, }, { - "sftp:user@domain@host:/dir/subdir", - Config{User: "user@domain", Host: "host", Path: "/dir/subdir", Connections: 5}, + S: "sftp:user@domain@host:/dir/subdir", + Cfg: Config{User: "user@domain", Host: "host", Path: "/dir/subdir", Connections: 5}, }, { - "sftp:host:../dir/subdir", - Config{Host: "host", Path: "../dir/subdir", Connections: 5}, + S: "sftp:host:../dir/subdir", + Cfg: Config{Host: "host", Path: "../dir/subdir", Connections: 5}, }, { - "sftp:user@host:dir/subdir:suffix", - Config{User: "user", Host: "host", Path: "dir/subdir:suffix", Connections: 5}, + S: "sftp:user@host:dir/subdir:suffix", + Cfg: Config{User: "user", Host: "host", Path: "dir/subdir:suffix", Connections: 5}, }, { - "sftp:user@host:dir/subdir/../other", - Config{User: "user", Host: "host", Path: "dir/other", Connections: 5}, + S: "sftp:user@host:dir/subdir/../other", + Cfg: Config{User: "user", Host: "host", Path: "dir/other", Connections: 5}, }, { - "sftp:user@host:dir///subdir", - Config{User: "user", Host: "host", Path: "dir/subdir", Connections: 5}, + S: "sftp:user@host:dir///subdir", + Cfg: Config{User: "user", Host: "host", Path: "dir/subdir", Connections: 5}, }, } diff --git a/internal/backend/swift/config_test.go b/internal/backend/swift/config_test.go index 57551efa5..3e094f9ea 100644 --- a/internal/backend/swift/config_test.go +++ b/internal/backend/swift/config_test.go @@ -8,23 +8,23 @@ import ( var configTests = []test.ConfigTestData[Config]{ { - "swift:cnt1:/", - Config{ + S: "swift:cnt1:/", + Cfg: Config{ Container: "cnt1", Prefix: "", Connections: 5, }, }, { - "swift:cnt2:/prefix", - Config{Container: "cnt2", + S: "swift:cnt2:/prefix", + Cfg: Config{Container: "cnt2", Prefix: "prefix", Connections: 5, }, }, { - "swift:cnt3:/prefix/longer", - Config{Container: "cnt3", + S: "swift:cnt3:/prefix/longer", + Cfg: Config{Container: "cnt3", Prefix: "prefix/longer", Connections: 5, },