Skip to content

Commit 3b5302a

Browse files
committed
go fmt
1 parent d700f57 commit 3b5302a

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

internal/nats/nats.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func Create(conf Conf) (*natsClient, error) {
6868
return nil, errors.New("zero ttl")
6969
}
7070

71-
nc.url = conf.Url
71+
nc.url = conf.Url
7272
nc.bucket = conf.Bucket
7373
nc.subjectPrefix = strings.Trim(conf.SubjectPrefix, c_NATS_DELIM)
7474
nc.subjectSouthbound = strings.Trim(conf.SubjectSouthbound, c_NATS_DELIM)
@@ -125,7 +125,7 @@ func (nc *natsClient) WatchObservations(ctx context.Context) (<-chan common.Nats
125125
}
126126

127127
func (nc *natsClient) GetObservations(ctx context.Context, domain string) (uint32, error) {
128-
subject := nc.genKeyFilterSubject(domain)
128+
subject := nc.genKeyFilterSubject(domain)
129129
ls, err := nc.kv.ListKeysFiltered(ctx, subject)
130130
if err != nil {
131131
nc.log.Error("Couldn't list keys for %s: %s", domain, err)
@@ -134,11 +134,11 @@ func (nc *natsClient) GetObservations(ctx context.Context, domain string) (uint3
134134

135135
var obs uint32
136136
for k := range ls.Keys() {
137-
flagUint, err := nc.extractObservationFromKey(k)
138-
if err != nil {
139-
nc.log.Warning("Couldn't extract observation: %s", err)
140-
continue
141-
}
137+
flagUint, err := nc.extractObservationFromKey(k)
138+
if err != nil {
139+
nc.log.Warning("Couldn't extract observation: %s", err)
140+
continue
141+
}
142142
obs |= flagUint
143143
}
144144

@@ -153,26 +153,26 @@ func (nc *natsClient) genKeyFilterSubject(domain string) string {
153153
subjectParts := []string{nc.subjectPrefix, c_NATS_WILDCARD, domRev}
154154
subject := strings.Join(subjectParts, c_NATS_DELIM)
155155

156-
return subject
156+
return subject
157157
}
158158

159159
func (nc *natsClient) extractObservationFromKey(key string) (uint32, error) {
160-
kSplit := strings.Split(key, c_NATS_DELIM)
161-
prefixLen := len(strings.Split(nc.subjectPrefix, c_NATS_DELIM))
160+
kSplit := strings.Split(key, c_NATS_DELIM)
161+
prefixLen := len(strings.Split(nc.subjectPrefix, c_NATS_DELIM))
162162

163-
if len(kSplit)-prefixLen < c_MIN_RAW_KEY_LEN {
164-
nc.log.Error("Badly formatted key '%s'", key)
165-
return 0, common.ErrBadKey
166-
}
163+
if len(kSplit)-prefixLen < c_MIN_RAW_KEY_LEN {
164+
nc.log.Error("Badly formatted key '%s'", key)
165+
return 0, common.ErrBadKey
166+
}
167167

168-
flag := kSplit[prefixLen] /* Flag is first label after prefix */
169-
flagUint, ok := common.OBS_MAP[flag]
170-
if !ok {
171-
nc.log.Error("Unrecognized flag '%s'", flag)
172-
return 0, common.ErrBadFlag
173-
}
168+
flag := kSplit[prefixLen] /* Flag is first label after prefix */
169+
flagUint, ok := common.OBS_MAP[flag]
170+
if !ok {
171+
nc.log.Error("Unrecognized flag '%s'", flag)
172+
return 0, common.ErrBadFlag
173+
}
174174

175-
return flagUint, nil
175+
return flagUint, nil
176176
}
177177

178178
func (nc *natsClient) initNats() error {

internal/nats/nats_test.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,45 +87,45 @@ func TestRemovePrefix(t *testing.T) {
8787

8888
func TestExtractObservationFromKey(t *testing.T) {
8989
tests := map[string]struct {
90-
input1 string
91-
input2 string
92-
expect uint32
90+
input1 string
91+
input2 string
92+
expect uint32
9393
expectErr error
9494
}{
9595
"globally_new, one label prefix": {
96-
input1: "obs",
97-
input2: "obs.globally_new.xa.foo",
98-
expect: 1,
96+
input1: "obs",
97+
input2: "obs.globally_new.xa.foo",
98+
expect: 1,
9999
expectErr: nil,
100100
},
101101
"globally_new, two label prefix": {
102-
input1: "obs1.obs2",
103-
input2: "obs1.obs2.globally_new.xa.foo",
104-
expect: 1,
102+
input1: "obs1.obs2",
103+
input2: "obs1.obs2.globally_new.xa.foo",
104+
expect: 1,
105105
expectErr: nil,
106106
},
107107
"bad flag": {
108-
input1: "obs1.obs2",
109-
input2: "obs1.obs2.bad_flag.xa.foo",
110-
expect: 0,
108+
input1: "obs1.obs2",
109+
input2: "obs1.obs2.bad_flag.xa.foo",
110+
expect: 0,
111111
expectErr: common.ErrBadFlag,
112112
},
113113
"too short key": {
114-
input1: "obs1.obs2",
115-
input2: "obs1.obs2.looptest",
116-
expect: 0,
114+
input1: "obs1.obs2",
115+
input2: "obs1.obs2.looptest",
116+
expect: 0,
117117
expectErr: common.ErrBadKey,
118118
},
119119
"single-label key": {
120-
input1: "obs",
121-
input2: "obs.looptest.xa",
122-
expect: 1024,
120+
input1: "obs",
121+
input2: "obs.looptest.xa",
122+
expect: 1024,
123123
expectErr: nil,
124124
},
125125
"long prefix, short domain name": {
126-
input1: "a.b.c.d.e.f.g.h.j.k",
127-
input2: "a.b.c.d.e.f.g.h.j.k.globally_new.xa",
128-
expect: 1,
126+
input1: "a.b.c.d.e.f.g.h.j.k",
127+
input2: "a.b.c.d.e.f.g.h.j.k.globally_new.xa",
128+
expect: 1,
129129
expectErr: nil,
130130
},
131131
}
@@ -138,9 +138,9 @@ func TestExtractObservationFromKey(t *testing.T) {
138138
}
139139

140140
got, err := nh.extractObservationFromKey(test.input2)
141-
if err != test.expectErr {
141+
if err != test.expectErr {
142142
t.Fatalf("Got: '%s', Expected: '%s'", err, test.expectErr)
143-
}
143+
}
144144

145145
if got != test.expect {
146146
t.Fatalf("Got: '%d', Expected: '%d'", got, test.expect)

0 commit comments

Comments
 (0)