Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gocritic: fix structLitKeyOrder errors #99

Merged
merged 1 commit into from
Oct 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions selvpcclient/resell/v2/licenses/testing/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ var TestGetLicenseResponse = &licenses.License{
ID: 123123,
ProjectID: "49338ac045f448e294b25d013f890317",
Region: "ru-2",
Status: "ACTIVE",
Type: "license_windows_2012_standard",
Servers: []servers.Server{
{
ID: "253b680c-89f6-4c85-afbf-c9a67c92d3fe",
Expand All @@ -45,6 +43,8 @@ var TestGetLicenseResponse = &licenses.License{
Updated: licenseServerTimeStamp,
},
},
Status: "ACTIVE",
Type: "license_windows_2012_standard",
}

// TestListLicensesResponseRaw represents a raw response from the List request.
Expand Down
20 changes: 10 additions & 10 deletions selvpcclient/resell/v2/projects/testing/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ var TestGetProjectSingleQuotaResponse = &projects.Project{
ResourceQuotasEntities: []quotas.ResourceQuotaEntity{
{
Region: "ru-1",
Used: 2,
Value: 10,
Zone: "ru-1b",
Value: 10,
Used: 2,
},
},
},
Expand Down Expand Up @@ -259,9 +259,9 @@ var TestCreateProjectAutoQuotasResponse = &projects.Project{
ResourceQuotasEntities: []quotas.ResourceQuotaEntity{
{
Region: "ru-1",
Used: 2,
Value: 10,
Zone: "ru-1b",
Value: 10,
Used: 2,
},
},
},
Expand Down Expand Up @@ -309,15 +309,15 @@ const TestUpdateProjectResponseRaw = `

// TestUpdateProjectResponse represents the unmarshalled TestUpdateProjectResponseRaw response.
var TestUpdateProjectResponse = &projects.Project{
ID: "f9ede488e5f14bac8962d8c53d0af9f4",
Name: "Project3",
URL: "https://zzzzzz.selvpc.ru",
Enabled: true,
ID: "f9ede488e5f14bac8962d8c53d0af9f4",
Name: "Project3",
URL: "https://zzzzzz.selvpc.ru",
Enabled: true,
CustomURL: "",
Theme: projects.Theme{
Logo: "",
Color: "#581845",
Logo: "",
},
CustomURL: "",
}

// TestManyProjectsInvalidResponseRaw represents a raw invalid response with many projects.
Expand Down
12 changes: 6 additions & 6 deletions selvpcclient/resell/v2/subnets/testing/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ var TestGetSubnetResponse = &subnets.Subnet{
Updated: subnetServerTimeStamp,
},
},
Region: "ru-3",
CIDR: "203.0.113.0/24",
NetworkID: "8233f12e-c47e-4f1c-953a-1ecd322a7119",
ProjectID: "49338ac045f448e294b25d013f890317",
Region: "ru-3",
SubnetID: "94425a6e-19cd-412d-9710-ff40b34a78f4",
ProjectID: "49338ac045f448e294b25d013f890317",
}

// TestListSubnetsResponseRaw represents a raw response from the List request.
Expand Down Expand Up @@ -124,16 +124,16 @@ const TestCreateSubnetsOptsRaw = `
var TestCreateSubnetsOpts = subnets.SubnetOpts{
Subnets: []subnets.SubnetOpt{
{
Type: selvpcclient.IPv4,
PrefixLength: 29,
Region: "ru-2",
Quantity: 1,
},
{
Type: selvpcclient.IPv4,
PrefixLength: 29,
},
{
Region: "ru-1",
Quantity: 1,
Type: selvpcclient.IPv4,
PrefixLength: 29,
},
},
}
Expand Down
16 changes: 8 additions & 8 deletions selvpcclient/resell/v2/vrrpsubnets/testing/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,22 @@ var TestGetVRRPSubnetResponse = &vrrpsubnets.VRRPSubnet{
Updated: vrrpSubnetServerTimeStamp,
},
},
CIDR: "203.0.113.0/24",
ProjectID: "49338ac045f448e294b25d013f890317",
MasterRegion: "ru-2",
SlaveRegion: "ru-1",
CIDR: "203.0.113.0/24",
Subnets: []subnets.Subnet{
{
Region: "ru-1",
NetworkID: "8233f12e-c47e-4f1c-953a-1ecd322a7119",
SubnetID: "94425a6e-19cd-412d-9710-ff40b34a78f4",
Region: "ru-1",
},
{
Region: "ru-2",
NetworkID: "e53c5abe-8b64-4a49-83f2-a51949d9294e",
SubnetID: "649231cc-a17f-4c6b-8bf3-51a8871104c5",
Region: "ru-2",
},
},
ProjectID: "49338ac045f448e294b25d013f890317",
}

// TestListVRRPSubnetsResponseRaw represents a raw response from the List request.
Expand Down Expand Up @@ -130,14 +130,14 @@ var TestListVRRPSubnetsResponse = []*vrrpsubnets.VRRPSubnet{
SlaveRegion: "ru-1",
Subnets: []subnets.Subnet{
{
Region: "ru-1",
NetworkID: "8233f12e-c47e-4f1c-953a-1ecd322a7119",
SubnetID: "94425a6e-19cd-412d-9710-ff40b34a78f4",
Region: "ru-1",
},
{
Region: "ru-2",
NetworkID: "e53c5abe-8b64-4a49-83f2-a51949d9294e",
SubnetID: "649231cc-a17f-4c6b-8bf3-51a8871104c5",
Region: "ru-2",
},
},
},
Expand Down Expand Up @@ -214,14 +214,14 @@ var TestCreateVRRPSubnetsResponse = []*vrrpsubnets.VRRPSubnet{
SlaveRegion: "ru-1",
Subnets: []subnets.Subnet{
{
Region: "ru-1",
NetworkID: "8233f12e-c47e-4f1c-953a-1ecd322a7119",
SubnetID: "94425a6e-19cd-412d-9710-ff40b34a78f4",
Region: "ru-1",
},
{
Region: "ru-2",
NetworkID: "e53c5abe-8b64-4a49-83f2-a51949d9294e",
SubnetID: "649231cc-a17f-4c6b-8bf3-51a8871104c5",
Region: "ru-2",
},
},
},
Expand Down