Merge branch 'main' into chore/update-cap-don-type-v2

Author: justinkaseman

pkg/capabilities/v2/protoc/pkg/template_generator.go

@@ -91,6 +91,7 @@ func (t *TemplateGenerator) Generate(
 func (t *TemplateGenerator) runTemplate(name, tmplText string, args any, partials map[string]string, importToPkg map[protogen.GoImportPath]protogen.GoPackageName) (string, error) {
 	buf := &bytes.Buffer{}
 	imports := map[string]bool{}
+	var orderedImports []string
 	if t.ExtraFns == nil {
 		t.ExtraFns = template.FuncMap{}
 	}
@@ -146,14 +147,16 @@ func (t *TemplateGenerator) runTemplate(name, tmplText string, args any, partial
 				importName = fmt.Sprintf("%s %s", importToPkg[importPath], importName)
 			}
 
-			imports[importName] = true
+			if !imports[importName] {
+				orderedImports = append(orderedImports, importName)
+				imports[importName] = true
+			}
+
 			return ""
 		},
 		"allimports": func() []string {
-			var allImports []string
-			for i := range imports {
-				allImports = append(allImports, i)
-			}
+			allImports := make([]string, len(imports))
+			copy(allImports, orderedImports)
 			return allImports
 		},
 		"name": func(ident protogen.GoIdent, ignore string) string {

pkg/chipingress/go.mod

@@ -27,4 +27,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-retract v1.0.0 // Use v0.0.1 instead
+retract [v1.0.0, v1.0.1]