diff --git a/internal/types/action.go b/internal/types/action.go index e5e93c89..120fe17a 100644 --- a/internal/types/action.go +++ b/internal/types/action.go @@ -80,7 +80,7 @@ func (a *Action) WriteDocumentation(inputTable, outputTable *strings.Builder) er var output []byte - hasInputsData, Indices := utils.HasBytesInBetween( + hasInputsData, indices := utils.HasBytesInBetween( input, []byte(internal.InputAutoDocStart), []byte(internal.InputAutoDocEnd), @@ -90,7 +90,7 @@ func (a *Action) WriteDocumentation(inputTable, outputTable *strings.Builder) er inputsStr := strings.TrimSpace(inputTable.String()) if hasInputsData { - output = utils.ReplaceBytesInBetween(output, Indices, []byte(inputsStr)) + output = utils.ReplaceBytesInBetween(output, indices, []byte(inputsStr)) } else { re := regexp.MustCompile(fmt.Sprintf("(?m)^%s", internal.InputsHeader)) output = re.ReplaceAllFunc(input, func(match []byte) []byte { @@ -101,7 +101,7 @@ func (a *Action) WriteDocumentation(inputTable, outputTable *strings.Builder) er }) } - hasOutputsData, Indices := utils.HasBytesInBetween( + hasOutputsData, indices := utils.HasBytesInBetween( output, []byte(internal.OutputAutoDocStart), []byte(internal.OutputAutoDocEnd), @@ -110,7 +110,7 @@ func (a *Action) WriteDocumentation(inputTable, outputTable *strings.Builder) er outputsStr := strings.TrimSpace(outputTable.String()) if hasOutputsData { - output = utils.ReplaceBytesInBetween(output, Indices, []byte(outputsStr)) + output = utils.ReplaceBytesInBetween(output, indices, []byte(outputsStr)) } else { re := regexp.MustCompile(fmt.Sprintf("(?m)^%s", internal.OutputsHeader)) output = re.ReplaceAllFunc(output, func(match []byte) []byte { diff --git a/internal/types/reusable.go b/internal/types/reusable.go index 5e8a3fda..93e94d5a 100644 --- a/internal/types/reusable.go +++ b/internal/types/reusable.go @@ -93,7 +93,7 @@ func (r *Reusable) WriteDocumentation(inputTable, outputTable, secretsTable *str var output []byte - hasInputsData, Indices := utils.HasBytesInBetween( + hasInputsData, indices := utils.HasBytesInBetween( input, []byte(internal.InputAutoDocStart), []byte(internal.InputAutoDocEnd), @@ -103,7 +103,7 @@ func (r *Reusable) WriteDocumentation(inputTable, outputTable, secretsTable *str inputsStr := strings.TrimSpace(inputTable.String()) if hasInputsData { - output = utils.ReplaceBytesInBetween(output, Indices, []byte(inputsStr)) + output = utils.ReplaceBytesInBetween(output, indices, []byte(inputsStr)) } else { re := regexp.MustCompile(fmt.Sprintf("(?m)^%s", internal.InputsHeader)) output = re.ReplaceAllFunc(input, func(match []byte) []byte { @@ -114,7 +114,7 @@ func (r *Reusable) WriteDocumentation(inputTable, outputTable, secretsTable *str }) } - hasOutputsData, Indices := utils.HasBytesInBetween( + hasOutputsData, indices := utils.HasBytesInBetween( output, []byte(internal.OutputAutoDocStart), []byte(internal.OutputAutoDocEnd), @@ -123,7 +123,7 @@ func (r *Reusable) WriteDocumentation(inputTable, outputTable, secretsTable *str outputsStr := strings.TrimSpace(outputTable.String()) if hasOutputsData { - output = utils.ReplaceBytesInBetween(output, Indices, []byte(outputsStr)) + output = utils.ReplaceBytesInBetween(output, indices, []byte(outputsStr)) } else { re := regexp.MustCompile(fmt.Sprintf("(?m)^%s", internal.OutputsHeader)) output = re.ReplaceAllFunc(output, func(match []byte) []byte { @@ -134,7 +134,7 @@ func (r *Reusable) WriteDocumentation(inputTable, outputTable, secretsTable *str }) } - hasSecretsData, Indices := utils.HasBytesInBetween( + hasSecretsData, indices := utils.HasBytesInBetween( output, []byte(internal.SecretsAutoDocStart), []byte(internal.SecretsAutoDocEnd), @@ -143,7 +143,7 @@ func (r *Reusable) WriteDocumentation(inputTable, outputTable, secretsTable *str secretsStr := strings.TrimSpace(secretsTable.String()) if hasSecretsData { - output = utils.ReplaceBytesInBetween(output, Indices, []byte(secretsStr)) + output = utils.ReplaceBytesInBetween(output, indices, []byte(secretsStr)) } else { re := regexp.MustCompile(fmt.Sprintf("(?m)^%s", internal.SecretsHeader)) output = re.ReplaceAllFunc(output, func(match []byte) []byte { diff --git a/internal/utils/bytes_utils.go b/internal/utils/bytes_utils.go index c5397aab..4eb9718f 100644 --- a/internal/utils/bytes_utils.go +++ b/internal/utils/bytes_utils.go @@ -22,19 +22,19 @@ import ( ) // HasBytesInBetween checks if a byte array has a start and end byte array and returns true if and all occurrences of start and end -func HasBytesInBetween(value, start, end []byte) (found bool, Indices [][]int) { +func HasBytesInBetween(value, start, end []byte) (found bool, indices [][]int) { // Multiline regex findRegex := regexp.MustCompile(fmt.Sprintf(`(?s)%s(.*?)%s`, regexp.QuoteMeta(string(start)), regexp.QuoteMeta(string(end)))) - Indices = findRegex.FindAllIndex(value, -1) + indices = findRegex.FindAllIndex(value, -1) - if len(Indices) == 0 { - return false, Indices + if len(indices) == 0 { + return false, indices } - return true, Indices + return true, indices } -// ReplaceBytesInBetween replaces a byte array between an array of start and end Indices with a new byte array +// ReplaceBytesInBetween replaces a byte array between an array of start and end indices with a new byte array func ReplaceBytesInBetween(value []byte, indices [][]int, new []byte) []byte { t := make([]byte, 0, len(value)+len(new)*len(indices)) prevIndex := 0