File tree 4 files changed +24
-15
lines changed
4 files changed +24
-15
lines changed Original file line number Diff line number Diff line change 7
7
goarch :
8
8
- amd64
9
9
- arm64
10
+ - arm
11
+ goarm :
12
+ - 6
10
13
11
14
main : ./cmd/influx/
12
15
flags :
@@ -28,6 +31,9 @@ builds:
28
31
goarch :
29
32
- amd64
30
33
- arm64
34
+ - arm
35
+ goarm :
36
+ - 6
31
37
32
38
main : ./cmd/influxd/
33
39
flags :
Original file line number Diff line number Diff line change @@ -240,7 +240,7 @@ func nonInteractive() (*influxdb.OnboardingRequest, error) {
240
240
return nil , err
241
241
}
242
242
if dur > 0 {
243
- req .RetentionPeriod = uint ( dur / time .Hour )
243
+ req .RetentionPeriod = dur / time .Hour
244
244
}
245
245
return req , nil
246
246
}
@@ -283,13 +283,13 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
283
283
}
284
284
285
285
if dur > 0 {
286
- req .RetentionPeriod = uint ( dur / time .Hour )
286
+ req .RetentionPeriod = dur / time .Hour
287
287
} else {
288
288
for {
289
289
rpStr := internal2 .GetInput (ui , "Please type your retention period in hours.\r \n Or press ENTER for infinite." , strconv .Itoa (influxdb .InfiniteRetention ))
290
290
rp , err := strconv .Atoi (rpStr )
291
291
if rp >= 0 && err == nil {
292
- req .RetentionPeriod = uint (rp ) * uint ( time .Hour )
292
+ req .RetentionPeriod = time . Duration (rp ) * time .Hour
293
293
break
294
294
}
295
295
}
@@ -299,7 +299,7 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
299
299
if confirmed := internal2 .GetConfirm (ui , func () string {
300
300
rp := "infinite"
301
301
if req .RetentionPeriod > 0 {
302
- rp = fmt .Sprintf ("%d hrs" , time . Duration ( req .RetentionPeriod ) / time .Hour )
302
+ rp = fmt .Sprintf ("%d hrs" , req .RetentionPeriod / time .Hour )
303
303
}
304
304
return fmt .Sprintf (`
305
305
You have entered:
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ func nonInteractive() (*influxdb.OnboardingRequest, error) {
54
54
return nil , err
55
55
}
56
56
if dur > 0 {
57
- req .RetentionPeriod = uint ( dur / time .Hour )
57
+ req .RetentionPeriod = dur / time .Hour
58
58
}
59
59
return req , nil
60
60
}
@@ -97,13 +97,13 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
97
97
}
98
98
99
99
if dur > 0 {
100
- req .RetentionPeriod = uint ( dur / time .Hour )
100
+ req .RetentionPeriod = dur / time .Hour
101
101
} else {
102
102
for {
103
103
rpStr := internal .GetInput (ui , "Please type your retention period in hours.\r \n Or press ENTER for infinite." , strconv .Itoa (influxdb .InfiniteRetention ))
104
104
rp , err := strconv .Atoi (rpStr )
105
105
if rp >= 0 && err == nil {
106
- req .RetentionPeriod = uint (rp ) * uint ( time .Hour )
106
+ req .RetentionPeriod = time . Duration (rp ) * time .Hour
107
107
break
108
108
}
109
109
}
@@ -113,7 +113,7 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
113
113
if confirmed := internal .GetConfirm (ui , func () string {
114
114
rp := "infinite"
115
115
if req .RetentionPeriod > 0 {
116
- rp = fmt .Sprintf ("%d hrs" , time . Duration ( req .RetentionPeriod ) / time .Hour )
116
+ rp = fmt .Sprintf ("%d hrs" , req .RetentionPeriod / time .Hour )
117
117
}
118
118
return fmt .Sprintf (`
119
119
You have entered:
Original file line number Diff line number Diff line change 1
1
package influxdb
2
2
3
- import "context"
3
+ import (
4
+ "context"
5
+ "time"
6
+ )
4
7
5
8
// OnboardingService represents a service for the first run.
6
9
type OnboardingService interface {
@@ -25,12 +28,12 @@ type OnboardingResults struct {
25
28
// OnboardingRequest is the request
26
29
// to setup defaults.
27
30
type OnboardingRequest struct {
28
- User string `json:"username"`
29
- Password string `json:"password"`
30
- Org string `json:"org"`
31
- Bucket string `json:"bucket"`
32
- RetentionPeriod uint `json:"retentionPeriodHrs,omitempty"`
33
- Token string `json:"token,omitempty"`
31
+ User string `json:"username"`
32
+ Password string `json:"password"`
33
+ Org string `json:"org"`
34
+ Bucket string `json:"bucket"`
35
+ RetentionPeriod time. Duration `json:"retentionPeriodHrs,omitempty"`
36
+ Token string `json:"token,omitempty"`
34
37
}
35
38
36
39
func (r * OnboardingRequest ) Valid () error {
You can’t perform that action at this time.
0 commit comments