Skip to content

Commit ff3d7b5

Browse files
nxadmnxadm
committed
unexport types
1 parent bf88aa9 commit ff3d7b5

File tree

7 files changed

+102
-102
lines changed

7 files changed

+102
-102
lines changed

‎diff.go

+36-36
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Version = "v0.1.0"
1212
const Author = "Claudio Ramirez <[email protected]>"
1313
const Repo = "https://github.com/nxadm/ldifdiff"
1414

15-
type fn func(string, []string) (Entries, error)
15+
type fn func(string, []string) (entries, error)
1616

1717
var skipDnForDelete map[string]bool
1818

@@ -83,19 +83,19 @@ func arraysEqual(a, b []string) bool {
8383
}
8484

8585
// Ordering Logic:
86-
// Add: entries from source sorted S -> L. Otherwise is invalid.
86+
// actionAdd: entries from source sorted S -> L. Otherwise is invalid.
8787
// Remove: entries from target sorted L -> S. Otherwise is invalid.
88-
// Modify:
88+
// actionModify:
8989
// - Keep S -> L ordering
9090
// - If only 1 instance of attribute with different value on source and target:
9191
// update. This way we don't break the applicable LDAP schema.
92-
// - extra attribute on source: add
92+
// - extra attribute on source: actionAdd
9393
// - extra attribute on target: delete
9494

95-
func compare(source, target *Entries, dnList *[]string) (string, error) {
95+
func compare(source, target *entries, dnList *[]string) (string, error) {
9696
var buffer bytes.Buffer
9797
var err error
98-
queue := make(chan ActionEntry, 10)
98+
queue := make(chan actionEntry, 10)
9999
var wg sync.WaitGroup
100100

101101
// Find the order in which operation must happen
@@ -120,8 +120,8 @@ func compare(source, target *Entries, dnList *[]string) (string, error) {
120120
close(queue)
121121

122122
// Free some memory
123-
*source = Entries{}
124-
*target = Entries{}
123+
*source = entries{}
124+
*target = entries{}
125125

126126
// Wait for the creation of the LDIF
127127
wg.Wait()
@@ -141,17 +141,17 @@ func compare(source, target *Entries, dnList *[]string) (string, error) {
141141

142142
func genericDiff(sourceParam, targetParam string, ignoreAttr []string, fn fn, dnList *[]string) (string, error) {
143143
// Read the files in memory as a Map with sorted attributes
144-
var source, target Entries
144+
var source, target entries
145145
var sourceErr, targetErr error
146146
var wg sync.WaitGroup
147147
wg.Add(2)
148-
go func(entries *Entries, wg *sync.WaitGroup, err *error) {
148+
go func(entries *entries, wg *sync.WaitGroup, err *error) {
149149
result, e := fn(sourceParam, ignoreAttr)
150150
*entries = result
151151
*err = e
152152
wg.Done()
153153
}(&source, &wg, &sourceErr)
154-
go func(entries *Entries, wg *sync.WaitGroup, err *error) {
154+
go func(entries *entries, wg *sync.WaitGroup, err *error) {
155155
result, e := fn(targetParam, ignoreAttr)
156156
*entries = result
157157
*err = e
@@ -172,8 +172,8 @@ func genericDiff(sourceParam, targetParam string, ignoreAttr []string, fn fn, dn
172172

173173
func sendForAddition(
174174
orderedSourceShortToLong *[]string,
175-
source, target *Entries,
176-
queue chan<- ActionEntry,
175+
source, target *entries,
176+
queue chan<- actionEntry,
177177
dnList *[]string) {
178178
for _, dn := range *orderedSourceShortToLong {
179179
// Ignore equal entries
@@ -185,17 +185,17 @@ func sendForAddition(
185185
// Mark entries for addition if only on source
186186
if _, ok := (*target)[dn]; !ok {
187187
if dnList == nil {
188-
subActionAttr := make(map[SubAction][]string)
189-
subActionAttr[None] = (*source)[dn]
188+
subActionAttr := make(map[subAction][]string)
189+
subActionAttr[subActionNone] = (*source)[dn]
190190
actionEntry :=
191-
ActionEntry{
191+
actionEntry{
192192
Dn: dn,
193-
Action: Add,
194-
SubActionAttrs: []SubActionAttr{subActionAttr},
193+
Action: actionAdd,
194+
SubActionAttrs: []subActionAttrs{subActionAttr},
195195
}
196196
queue <- actionEntry
197197
} else {
198-
// Always add (attributes not relevant)
198+
// Always actionAdd (attributes not relevant)
199199
*dnList = append(*dnList, dn)
200200
}
201201
delete(*source, dn)
@@ -208,8 +208,8 @@ func sendForAddition(
208208

209209
func sendForDeletion(
210210
orderedTargetLongToShort *[]string,
211-
source, target *Entries,
212-
queue chan<- ActionEntry,
211+
source, target *entries,
212+
queue chan<- actionEntry,
213213
dnList *[]string) {
214214
for _, dn := range *orderedTargetLongToShort {
215215
if skipDnForDelete[dn] { // We know it's not a delete operation
@@ -218,13 +218,13 @@ func sendForDeletion(
218218
if _, ok := (*target)[dn]; ok { // It has not been deleted above
219219
if _, ok := (*source)[dn]; !ok { // does not exists on source
220220
if dnList == nil {
221-
subActionAttr := make(map[SubAction][]string)
222-
subActionAttr[None] = nil
221+
subActionAttr := make(map[subAction][]string)
222+
subActionAttr[subActionNone] = nil
223223
actionEntry :=
224-
ActionEntry{
224+
actionEntry{
225225
Dn: dn,
226-
Action: Delete,
227-
SubActionAttrs: []SubActionAttr{subActionAttr},
226+
Action: actionDelete,
227+
SubActionAttrs: []subActionAttrs{subActionAttr},
228228
}
229229
queue <- actionEntry
230230
} else {
@@ -244,8 +244,8 @@ func sendForDeletion(
244244

245245
func sendForModification(
246246
orderedSourceShortToLong *[]string, source,
247-
target *Entries,
248-
queue chan<- ActionEntry,
247+
target *entries,
248+
queue chan<- actionEntry,
249249
dnList *[]string) {
250250
for _, dn := range *orderedSourceShortToLong {
251251
// DN is present on source and target:
@@ -275,9 +275,9 @@ func sendForModification(
275275
if _, ok := targetAttr[attr]; !ok {
276276
// Is the attribute name (not value) unique?
277277
switch uniqueAttrName(attr, sourceAttr, targetAttr) {
278-
case true: // This is a Modify-Replace operation
278+
case true: // This is a actionModify-Replace operation
279279
attrToModifyReplace = append(attrToModifyReplace, attr)
280-
case false: // This is just a Modify Add (only on source).
280+
case false: // This is just a actionModify actionAdd (only on source).
281281
attrToModifyAdd = append(attrToModifyAdd, attr)
282282
}
283283
}
@@ -294,17 +294,17 @@ func sendForModification(
294294
}
295295

296296
// Send it
297-
actionEntry := ActionEntry{Dn: dn, Action: Modify}
298-
subActionAttrArray := []SubActionAttr{}
297+
actionEntry := actionEntry{Dn: dn, Action: actionModify}
298+
subActionAttrArray := []subActionAttrs{}
299299
switch {
300300
case len(attrToModifyAdd) > 0:
301-
subActionAttrArray = append(subActionAttrArray, SubActionAttr{ModifyAdd: attrToModifyAdd})
301+
subActionAttrArray = append(subActionAttrArray, subActionAttrs{subActionModifyAdd: attrToModifyAdd})
302302
fallthrough
303303
case len(attrToModifyDelete) > 0:
304-
subActionAttrArray = append(subActionAttrArray, SubActionAttr{ModifyDelete: attrToModifyDelete})
304+
subActionAttrArray = append(subActionAttrArray, subActionAttrs{subActionModifyDelete: attrToModifyDelete})
305305
fallthrough
306306
case len(attrToModifyReplace) > 0:
307-
subActionAttrArray = append(subActionAttrArray, SubActionAttr{ModifyReplace: attrToModifyReplace})
307+
subActionAttrArray = append(subActionAttrArray, subActionAttrs{subActionModifyReplace: attrToModifyReplace})
308308
}
309309

310310
actionEntry.SubActionAttrs = subActionAttrArray
@@ -322,7 +322,7 @@ func sendForModification(
322322
}
323323
}
324324

325-
func sortDnByDepth(entries *Entries, longToShort bool) []string {
325+
func sortDnByDepth(entries *entries, longToShort bool) []string {
326326
var sorted []string
327327

328328
dns := []string{}

‎generic_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,30 @@ var testActionEntryTestData = testGetActionEntryMap()
5050
type TestActionEntryData struct {
5151
Add, Delete, Modify, ModifyOnlyAdd,
5252
ModifyOnlyDelete, ModifyOnlyReplace,
53-
ModifyNone, ModifyReplaceAttributes ActionEntry
53+
ModifyNone, ModifyReplaceAttributes actionEntry
5454
}
5555

5656
func testGetActionEntryMap() TestActionEntryData {
5757
return TestActionEntryData{
58-
Add: ActionEntry{Dn: testDn, Action: Add,
59-
SubActionAttrs: []SubActionAttr{{None: testAttrList}}},
60-
Delete: ActionEntry{Dn: testDn, Action: Delete,
61-
SubActionAttrs: []SubActionAttr{{None: testAttrList}}},
62-
Modify: ActionEntry{Dn: testDn, Action: Modify,
63-
SubActionAttrs: []SubActionAttr{
64-
{ModifyAdd: testAttrList},
65-
{ModifyDelete: testAttrList},
66-
{ModifyReplace: testAttrListModifyReplace}}},
67-
ModifyOnlyAdd: ActionEntry{Dn: testDn, Action: Modify,
68-
SubActionAttrs: []SubActionAttr{{ModifyAdd: testAttrList}}},
69-
ModifyOnlyDelete: ActionEntry{Dn: testDn, Action: Modify,
70-
SubActionAttrs: []SubActionAttr{{ModifyDelete: testAttrList}}},
71-
ModifyOnlyReplace: ActionEntry{Dn: testDn, Action: Modify,
72-
SubActionAttrs: []SubActionAttr{{ModifyReplace: testAttrListModifyReplace}}},
73-
ModifyNone: ActionEntry{Dn: testDn, Action: Modify,
74-
SubActionAttrs: []SubActionAttr{{None: testAttrList}}},
75-
ModifyReplaceAttributes: ActionEntry{Dn: testDn, Action: Modify,
76-
SubActionAttrs: []SubActionAttr{{ModifyReplace: testAttrList}}},
58+
Add: actionEntry{Dn: testDn, Action: actionAdd,
59+
SubActionAttrs: []subActionAttrs{{subActionNone: testAttrList}}},
60+
Delete: actionEntry{Dn: testDn, Action: actionDelete,
61+
SubActionAttrs: []subActionAttrs{{subActionNone: testAttrList}}},
62+
Modify: actionEntry{Dn: testDn, Action: actionModify,
63+
SubActionAttrs: []subActionAttrs{
64+
{subActionModifyAdd: testAttrList},
65+
{subActionModifyDelete: testAttrList},
66+
{subActionModifyReplace: testAttrListModifyReplace}}},
67+
ModifyOnlyAdd: actionEntry{Dn: testDn, Action: actionModify,
68+
SubActionAttrs: []subActionAttrs{{subActionModifyAdd: testAttrList}}},
69+
ModifyOnlyDelete: actionEntry{Dn: testDn, Action: actionModify,
70+
SubActionAttrs: []subActionAttrs{{subActionModifyDelete: testAttrList}}},
71+
ModifyOnlyReplace: actionEntry{Dn: testDn, Action: actionModify,
72+
SubActionAttrs: []subActionAttrs{{subActionModifyReplace: testAttrListModifyReplace}}},
73+
ModifyNone: actionEntry{Dn: testDn, Action: actionModify,
74+
SubActionAttrs: []subActionAttrs{{subActionNone: testAttrList}}},
75+
ModifyReplaceAttributes: actionEntry{Dn: testDn, Action: actionModify,
76+
SubActionAttrs: []subActionAttrs{{subActionModifyReplace: testAttrList}}},
7777
}
7878
}
7979

‎input.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111

1212
/* Package only functions */
1313

14-
func convertLdifStr(ldifStr string, ignoreAttr []string) (Entries, error) {
14+
func convertLdifStr(ldifStr string, ignoreAttr []string) (entries, error) {
1515
return importRecords(ldifStr, "", ignoreAttr)
1616
}
1717

18-
func importLdifFile(file string, ignoreAttr []string) (Entries, error) {
18+
func importLdifFile(file string, ignoreAttr []string) (entries, error) {
1919
entries, err := importRecords("", file, ignoreAttr)
2020
if err != nil {
2121
err = errors.New(err.Error() + " [" + file + "]")
@@ -66,7 +66,7 @@ func addLineToRecord(line *string, record *[]string, ignoreAttr []string, prevAt
6666
return nil
6767
}
6868

69-
func importRecords(ldifStr, file string, ignoreAttr []string) (Entries, error) {
69+
func importRecords(ldifStr, file string, ignoreAttr []string) (entries, error) {
7070
var readErr, parseErr error
7171
queue := make(chan []string, 10)
7272
entries := make(map[string][]string)
@@ -156,7 +156,7 @@ func readStr(ldifStr string, ignoreAttr []string, queue chan<- []string, wg *syn
156156
}
157157
}
158158

159-
func parse(entries Entries, queue <-chan []string, wg *sync.WaitGroup, err *error) {
159+
func parse(entries entries, queue <-chan []string, wg *sync.WaitGroup, err *error) {
160160
defer wg.Done()
161161
for record := range queue {
162162
dn := record[0] // Find dn, should be the first line

‎input_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestConvertLdifStrBig(t *testing.T) {
4848
}
4949

5050
/* Helper test evaluation */
51-
func okLdifTests(t *testing.T, entries Entries, ignoreAttr []string, err error) {
51+
func okLdifTests(t *testing.T, entries entries, ignoreAttr []string, err error) {
5252
if err != nil {
5353
t.Error("Expected values, got error: ", err)
5454
}

‎ldifConvertor.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import (
77
"sync"
88
)
99

10-
func createModifyStr(actionEntry ActionEntry) (string, error) {
10+
func createModifyStr(actionEntry actionEntry) (string, error) {
1111
var buffer bytes.Buffer
12-
subActions := make(map[SubAction]string)
13-
subActions[ModifyAdd] = "add"
14-
subActions[ModifyDelete] = "delete"
15-
subActions[ModifyReplace] = "replace"
12+
subActions := make(map[subAction]string)
13+
subActions[subActionModifyAdd] = "add"
14+
subActions[subActionModifyDelete] = "delete"
15+
subActions[subActionModifyReplace] = "replace"
1616
for idx, subActionList := range actionEntry.SubActionAttrs {
1717
for subAction, attrList := range subActionList {
18-
if subAction == None {
19-
return "", errors.New(("Invalid Subaction None for Action Modify"))
18+
if subAction == subActionNone {
19+
return "", errors.New(("Invalid Subaction subActionNone for action actionModify"))
2020
}
2121
for idxInner, attr := range attrList {
2222
if idxInner != 0 || idx != 0 {
@@ -34,24 +34,24 @@ func createModifyStr(actionEntry ActionEntry) (string, error) {
3434
return buffer.String(), nil
3535
}
3636

37-
func writeLdif(queue <-chan ActionEntry, writer *bytes.Buffer, wg *sync.WaitGroup, err *error) {
37+
func writeLdif(queue <-chan actionEntry, writer *bytes.Buffer, wg *sync.WaitGroup, err *error) {
3838
defer wg.Done()
3939
for actionEntry := range queue {
4040
if *err != nil {
4141
continue
4242
}
4343
switch actionEntry.Action {
44-
case Add:
44+
case actionAdd:
4545
writer.WriteString(actionEntry.Dn + "\n") //dn
4646
writer.WriteString("changetype: add\n")
47-
attrList := actionEntry.SubActionAttrs[0][None]
47+
attrList := actionEntry.SubActionAttrs[0][subActionNone]
4848
for _, attr := range attrList {
4949
writer.WriteString(attr + "\n")
5050
}
51-
case Delete:
51+
case actionDelete:
5252
writer.WriteString(actionEntry.Dn + "\n") //dn
5353
writer.WriteString("changetype: delete\n")
54-
case Modify:
54+
case actionModify:
5555
writer.WriteString(actionEntry.Dn + "\n") //dn
5656
writer.WriteString("changetype: modify\n")
5757
modifyStr, modifyErr := createModifyStr(actionEntry)

‎ldifConvertor_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ func TestCreateModifyStr(t *testing.T) {
2626
// Errors
2727
_, err := createModifyStr(testActionEntryTestData.ModifyNone)
2828
if err == nil {
29-
t.Error("Invalid Subaction None for Action Modify")
29+
t.Error("Invalid Subaction subActionNone for action actionModify")
3030
}
3131
}
3232

3333
func TestWriteLdif(t *testing.T) {
3434
var buffer bytes.Buffer
3535
var wg sync.WaitGroup
3636
var err error
37-
queue := make(chan ActionEntry)
37+
queue := make(chan actionEntry)
3838
wg.Add(2)
39-
go func(queue chan ActionEntry) {
39+
go func(queue chan actionEntry) {
4040
queue <- testActionEntryTestData.Add
4141
queue <- testActionEntryTestData.Delete
4242
queue <- testActionEntryTestData.Modify
@@ -60,11 +60,11 @@ func TestWriteLdifError(t *testing.T) {
6060
var buffer bytes.Buffer
6161
var wg sync.WaitGroup
6262
var err error
63-
queue := make(chan ActionEntry)
63+
queue := make(chan actionEntry)
6464
wg.Add(2)
65-
go func(queue chan ActionEntry) {
66-
actionEntry := ActionEntry{Dn: testDn, Action: 100,
67-
SubActionAttrs: []SubActionAttr{{None: testAttrList}}}
65+
go func(queue chan actionEntry) {
66+
actionEntry := actionEntry{Dn: testDn, Action: 100,
67+
SubActionAttrs: []subActionAttrs{{subActionNone: testAttrList}}}
6868
queue <- actionEntry
6969
close(queue)
7070
wg.Done()
@@ -74,6 +74,6 @@ func TestWriteLdifError(t *testing.T) {
7474
wg.Wait()
7575

7676
if err == nil {
77-
t.Error("Error expected for invalid Action")
77+
t.Error("Error expected for invalid action")
7878
}
7979
}

0 commit comments

Comments
 (0)