check if line is empty or commented out after scan
parent
d0b72d0a32
commit
7b822ec534
|
@ -37,42 +37,44 @@ func (r *DriftIgnore) readIgnoreFile() error {
|
|||
scanner := bufio.NewScanner(file)
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
if line == "" || strings.HasPrefix(line, "#") {
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"line": line,
|
||||
}).Debug("Skipped comment or empty line")
|
||||
continue
|
||||
}
|
||||
typeVal := readDriftIgnoreLine(line)
|
||||
nbArgs := len(typeVal)
|
||||
if nbArgs == 0 || strings.HasPrefix(line, "#") {
|
||||
continue // skip empty or commented out lines
|
||||
} else {
|
||||
if nbArgs < 2 {
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"line": line,
|
||||
}).Warnf("unable to parse line, invalid length, got %d expected >= 2", nbArgs)
|
||||
continue
|
||||
}
|
||||
if nbArgs == 2 { // We want to ignore a resource (type.id)
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"type": typeVal[0],
|
||||
"id": typeVal[1],
|
||||
}).Debug("Found ignore resource rule in .driftignore")
|
||||
r.resExclusionList[strings.Join(typeVal, ".")] = struct{}{}
|
||||
continue
|
||||
}
|
||||
// Here we want to ignore a drift (type.id.path.to.field)
|
||||
res := strings.Join(typeVal[0:2], ".")
|
||||
ignoreSublist, exists := r.driftExclusionList[res]
|
||||
if !exists {
|
||||
ignoreSublist = make([]string, 0, 1)
|
||||
}
|
||||
path := strings.Join(typeVal[2:], ".")
|
||||
|
||||
if nbArgs < 2 {
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"line": line,
|
||||
}).Warnf("unable to parse line, invalid length, got %d expected >= 2", nbArgs)
|
||||
continue
|
||||
}
|
||||
if nbArgs == 2 { // We want to ignore a resource (type.id)
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"type": typeVal[0],
|
||||
"id": typeVal[1],
|
||||
"path": path,
|
||||
}).Debug("Found ignore resource field rule in .driftignore")
|
||||
|
||||
ignoreSublist = append(ignoreSublist, path)
|
||||
r.driftExclusionList[res] = ignoreSublist
|
||||
}).Debug("Found ignore resource rule in .driftignore")
|
||||
r.resExclusionList[strings.Join(typeVal, ".")] = struct{}{}
|
||||
continue
|
||||
}
|
||||
// Here we want to ignore a drift (type.id.path.to.field)
|
||||
res := strings.Join(typeVal[0:2], ".")
|
||||
ignoreSublist, exists := r.driftExclusionList[res]
|
||||
if !exists {
|
||||
ignoreSublist = make([]string, 0, 1)
|
||||
}
|
||||
path := strings.Join(typeVal[2:], ".")
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"type": typeVal[0],
|
||||
"id": typeVal[1],
|
||||
"path": path,
|
||||
}).Debug("Found ignore resource field rule in .driftignore")
|
||||
|
||||
ignoreSublist = append(ignoreSublist, path)
|
||||
r.driftExclusionList[res] = ignoreSublist
|
||||
}
|
||||
|
||||
if err := scanner.Err(); err != nil {
|
||||
|
|
Loading…
Reference in New Issue