Skip to content

Commit e8fba78

Browse files
authored
Merge pull request #177 from shiftstack/gofmt
Run gofmt with Go v1.19
2 parents 9852be6 + 5b64bd9 commit e8fba78

14 files changed

Lines changed: 144 additions & 139 deletions

File tree

acceptance/gnocchi/metric/v1/archivepolicies_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build acceptance || metric || archivepolicies
12
// +build acceptance metric archivepolicies
23

34
package v1

acceptance/gnocchi/metric/v1/measures_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build acceptance || metric || measures
12
// +build acceptance metric measures
23

34
package v1

acceptance/gnocchi/metric/v1/metrics_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build acceptance || metric || metrics
12
// +build acceptance metric metrics
23

34
package v1

acceptance/gnocchi/metric/v1/resources_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build acceptance || metric || resources
12
// +build acceptance metric resources
23

34
package v1

acceptance/gnocchi/metric/v1/resourcetypes_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build acceptance || metric || resourcetypes
12
// +build acceptance metric resourcetypes
23

34
package v1

acceptance/openstack/objectstorage/v1/objects_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build acceptance
12
// +build acceptance
23

34
package v1

client/doc.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,5 @@ Example usage with additinal headers:
142142
Region: os.Getenv("OS_REGION_NAME"),
143143
})
144144
}
145-
146145
*/
147146
package client

env/env.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package env

gnocchi/metric/v1/archivepolicies/doc.go

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,54 @@ Example of Getting an archive policy
2828
2929
Example of Creating an archive policy
3030
31-
createOpts := archivepolicies.CreateOpts{
32-
BackWindow: 31,
33-
AggregationMethods: []string{
34-
"sum",
35-
"mean",
36-
"count",
37-
},
38-
Definition: []archivepolicies.ArchivePolicyDefinitionOpts{
39-
{
40-
Granularity: "1:00:00",
41-
TimeSpan: "90 days, 0:00:00",
42-
},
43-
{
44-
Granularity: "1 day, 0:00:00",
45-
TimeSpan: "100 days, 0:00:00",
46-
},
47-
},
48-
Name: "test_policy",
49-
}
50-
archivePolicy, err := archivepolicies.Create(gnocchiClient, createOpts).Extract()
51-
if err != nil {
52-
panic(err)
53-
}
31+
createOpts := archivepolicies.CreateOpts{
32+
BackWindow: 31,
33+
AggregationMethods: []string{
34+
"sum",
35+
"mean",
36+
"count",
37+
},
38+
Definition: []archivepolicies.ArchivePolicyDefinitionOpts{
39+
{
40+
Granularity: "1:00:00",
41+
TimeSpan: "90 days, 0:00:00",
42+
},
43+
{
44+
Granularity: "1 day, 0:00:00",
45+
TimeSpan: "100 days, 0:00:00",
46+
},
47+
},
48+
Name: "test_policy",
49+
}
50+
archivePolicy, err := archivepolicies.Create(gnocchiClient, createOpts).Extract()
51+
if err != nil {
52+
panic(err)
53+
}
5454
5555
Example of Updating an archive policy
5656
57-
updateOpts := archivepolicies.UpdateOpts{
58-
Definition: []archivepolicies.ArchivePolicyDefinitionOpts{
59-
{
60-
Granularity: "12:00:00",
61-
TimeSpan: "30 days, 0:00:00",
62-
},
63-
{
64-
Granularity: "1 day, 0:00:00",
65-
TimeSpan: "90 days, 0:00:00",
66-
},
67-
},
68-
}
69-
archivePolicy, err := archivepolicies.Update(gnocchiClient, "test_policy", updateOpts).Extract()
70-
if err != nil {
71-
panic(err)
72-
}
57+
updateOpts := archivepolicies.UpdateOpts{
58+
Definition: []archivepolicies.ArchivePolicyDefinitionOpts{
59+
{
60+
Granularity: "12:00:00",
61+
TimeSpan: "30 days, 0:00:00",
62+
},
63+
{
64+
Granularity: "1 day, 0:00:00",
65+
TimeSpan: "90 days, 0:00:00",
66+
},
67+
},
68+
}
69+
archivePolicy, err := archivepolicies.Update(gnocchiClient, "test_policy", updateOpts).Extract()
70+
if err != nil {
71+
panic(err)
72+
}
7373
7474
Example of Deleting a Gnocchi archive policy
7575
76-
err := archivepolicies.Delete(gnocchiClient, "test_policy").ExtractErr()
77-
if err != nil {
78-
panic(err)
79-
}
76+
err := archivepolicies.Delete(gnocchiClient, "test_policy").ExtractErr()
77+
if err != nil {
78+
panic(err)
79+
}
8080
*/
8181
package archivepolicies

gnocchi/metric/v1/measures/results.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,18 @@ UnmarshalJSON helps to unmarshal response from reading Gnocchi measures.
4747
Gnocchi APIv1 returns measures in a such format:
4848
4949
[
50-
[
51-
"2017-01-08T10:00:00+00:00",
52-
300.0,
53-
146.0
54-
],
55-
[
56-
"2017-01-08T10:05:00+00:00",
57-
300.0,
58-
58.0
59-
]
50+
51+
[
52+
"2017-01-08T10:00:00+00:00",
53+
300.0,
54+
146.0
55+
],
56+
[
57+
"2017-01-08T10:05:00+00:00",
58+
300.0,
59+
58.0
60+
]
61+
6062
]
6163
6264
Helper unmarshals every nested array into the Measure type.

0 commit comments

Comments
 (0)