chore: update to go 1.20 (#5968)

Co-authored-by: Colin Adler <colin1adler@gmail.com>
This commit is contained in:
Kyle Carberry
2023-02-02 12:36:27 -06:00
committed by GitHub
parent 4df1031f8b
commit 026b1cd2a4
24 changed files with 91 additions and 93 deletions

View File

@ -37,7 +37,7 @@ func main() {
}
// Just cat the output to a file to capture it
fmt.Println(output)
_, _ = fmt.Println(output)
}
func Generate(directory string) (string, error) {
@ -307,11 +307,11 @@ func (g *Generator) generateOne(m *Maps, obj types.Object) error {
var str strings.Builder
_, _ = str.WriteString(g.posLine(obj))
if ts.AboveTypeLine != "" {
str.WriteString(ts.AboveTypeLine)
str.WriteRune('\n')
_, _ = str.WriteString(ts.AboveTypeLine)
_, _ = str.WriteRune('\n')
}
// Use similar output syntax to enums.
str.WriteString(fmt.Sprintf("export type %s = %s\n", obj.Name(), ts.ValueType))
_, _ = str.WriteString(fmt.Sprintf("export type %s = %s\n", obj.Name(), ts.ValueType))
m.Structs[obj.Name()] = str.String()
case *types.Interface:
// Interfaces are used as generics. Non-generic interfaces are
@ -353,7 +353,7 @@ func (g *Generator) generateOne(m *Maps, obj types.Object) error {
case *types.Func:
// Noop
default:
fmt.Println(obj.Name())
_, _ = fmt.Println(obj.Name())
}
return nil
}
@ -387,7 +387,7 @@ func (g *Generator) buildUnion(obj types.Object, st *types.Union) (string, error
allTypes = slice.Unique(allTypes)
s.WriteString(fmt.Sprintf("export type %s = %s\n", obj.Name(), strings.Join(allTypes, " | ")))
_, _ = s.WriteString(fmt.Sprintf("export type %s = %s\n", obj.Name(), strings.Join(allTypes, " | ")))
return s.String(), nil
}

View File

@ -110,11 +110,11 @@ func updateAuditDoc(doc []byte, auditableResourcesMap AuditableResourcesMap) ([]
tableEndIndex := tableStartIndex + j
var buffer bytes.Buffer
buffer.Write(doc[:tableStartIndex])
buffer.WriteByte('\n')
_, _ = buffer.Write(doc[:tableStartIndex])
_ = buffer.WriteByte('\n')
buffer.WriteString("|<b>Resource<b>||\n")
buffer.WriteString("|--|-----------------|\n")
_, _ = buffer.WriteString("|<b>Resource<b>||\n")
_, _ = buffer.WriteString("|--|-----------------|\n")
for _, resourceName := range sortedResourceNames {
readableResourceName := resourceName
@ -131,21 +131,21 @@ func updateAuditDoc(doc []byte, auditableResourcesMap AuditableResourcesMap) ([]
}
auditActionsString := strings.Join(auditActions, ", ")
buffer.WriteString("|" + readableResourceName + "<br><i>" + auditActionsString + "</i>|<table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody>")
_, _ = buffer.WriteString("|" + readableResourceName + "<br><i>" + auditActionsString + "</i>|<table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody>")
// We must sort the field names to ensure sub-table ordering
sortedFieldNames := sortKeys(auditableResourcesMap[resourceName])
for _, fieldName := range sortedFieldNames {
isTracked := auditableResourcesMap[resourceName][fieldName]
buffer.WriteString("<tr><td>" + fieldName + "</td><td>" + strconv.FormatBool(isTracked) + "</td></tr>")
_, _ = buffer.WriteString("<tr><td>" + fieldName + "</td><td>" + strconv.FormatBool(isTracked) + "</td></tr>")
}
buffer.WriteString("</tbody></table>\n")
_, _ = buffer.WriteString("</tbody></table>\n")
}
buffer.WriteString("\n")
buffer.Write(doc[tableEndIndex:])
_, _ = buffer.WriteString("\n")
_, _ = buffer.Write(doc[tableEndIndex:])
return buffer.Bytes(), nil
}

View File

@ -104,21 +104,21 @@ func updatePrometheusDoc(doc []byte, metricFamilies []dto.MetricFamily) ([]byte,
tableEndIndex := tableStartIndex + j
var buffer bytes.Buffer
buffer.Write(doc[:tableStartIndex])
buffer.WriteByte('\n')
_, _ = buffer.Write(doc[:tableStartIndex])
_ = buffer.WriteByte('\n')
buffer.WriteString("| Name | Type | Description | Labels |\n")
buffer.WriteString("| - | - | - | - |\n")
_, _ = buffer.WriteString("| Name | Type | Description | Labels |\n")
_, _ = buffer.WriteString("| - | - | - | - |\n")
for _, mf := range metricFamilies {
buffer.WriteString("| ")
buffer.Write([]byte("`" + *mf.Name + "`"))
buffer.WriteString(" | ")
buffer.Write([]byte(strings.ToLower(mf.Type.String())))
buffer.WriteString(" | ")
_, _ = buffer.WriteString("| ")
_, _ = buffer.Write([]byte("`" + *mf.Name + "`"))
_, _ = buffer.WriteString(" | ")
_, _ = buffer.Write([]byte(strings.ToLower(mf.Type.String())))
_, _ = buffer.WriteString(" | ")
if mf.Help != nil {
buffer.Write([]byte(*mf.Help))
_, _ = buffer.Write([]byte(*mf.Help))
}
buffer.WriteString(" | ")
_, _ = buffer.WriteString(" | ")
labels := map[string]struct{}{}
metrics := mf.GetMetric()
@ -129,14 +129,14 @@ func updatePrometheusDoc(doc []byte, metricFamilies []dto.MetricFamily) ([]byte,
}
if len(labels) > 0 {
buffer.WriteString(strings.Join(sortedKeys(labels), " "))
_, _ = buffer.WriteString(strings.Join(sortedKeys(labels), " "))
}
buffer.WriteString(" |\n")
_, _ = buffer.WriteString(" |\n")
}
buffer.WriteByte('\n')
buffer.Write(doc[tableEndIndex:])
_ = buffer.WriteByte('\n')
_, _ = buffer.Write(doc[tableEndIndex:])
return buffer.Bytes(), nil
}