0.35.x codegen link generation config

changelog/v0.35.4/add-delete-ns-snapshot.yaml

@@ -0,0 +1,8 @@
+changelog:
+- type: FIX
+  issueLink: https://github.com/solo-io/gloo/issues/9274
+  resolvesIssue: false
+  description: >-
+    Adds the `RemoveMatches` method in `snapshot_template.go` that removes all resources that match the given predicate.
+    Adds the ability for event loops to determine if the Syncer passed is a `SyncDecider` to determine if a sync is necessary.
+

changelog/v0.35.4/fix-duplicate-predicate.yaml

@@ -0,0 +1,6 @@
+changelog:
+- type: FIX
+  issueLink: https://github.com/solo-io/gloo/issues/9274
+  resolvesIssue: false
+  description: Fixes the issue of multiple declarations of Predicate when multiple snapshots are generated
+

changelog/v0.36.2/no-external-links.yaml

@@ -0,0 +1,6 @@
+changelog:
+- type: FIX
+  issueLink: https://github.com/solo-io/solo-projects/issues/6768
+  resolvesIssue: false
+  description: >-
+    Update protobuf processing to no longer render links to locally hosted external API docs, as they are being removed.

pkg/api/v1/resources/core/metadata_extensions.go

@@ -17,3 +17,5 @@ func (m *Metadata) Ref() *ResourceRef {
 func (m *Metadata) Match(ref *ResourceRef) bool {
 	return m.GetNamespace() == ref.GetNamespace() && m.GetName() == ref.GetName()
 }
+
+type Predicate func(metadata *Metadata) bool

pkg/code-generator/codegen/templates/event_loop_template.go

@@ -92,16 +92,33 @@ func (el *{{ lower_camel .GoName }}EventLoop) Run(namespaces []string, opts clie
 	go errutils.AggregateErrs(opts.Ctx, errs, emitterErrs, "{{ .Project.ProjectConfig.Version }}.emitter errors")
 	go func() {
 		var channelClosed bool
+
 		// create a new context for each loop, cancel it before each loop
 		var cancel context.CancelFunc = func() {}
+
 		// use closure to allow cancel function to be updated as context changes
 		defer func() { cancel() }()
+
+		// cache the previous snapshot for comparison
+		var previousSnapshot *{{ .GoName }}Snapshot
+
 		for {
 			select {
 			case snapshot, ok := <-watch:
 				if !ok {
 					return
 				}
+
+				if syncDecider, isDecider := el.syncer.({{ .GoName }}SyncDecider); isDecider {
+					if shouldSync := syncDecider.ShouldSync(previousSnapshot, snapshot); !shouldSync {
+						continue // skip syncing this syncer
+					}
+				} else if syncDeciderWithContext, isDecider := el.syncer.({{ .GoName }}SyncDeciderWithContext); isDecider {
+					if shouldSync := syncDeciderWithContext.ShouldSync(opts.Ctx, previousSnapshot, snapshot); !shouldSync {
+						continue // skip syncing this syncer
+					}
+				}
+
 				// cancel any open watches from previous loop
 				cancel()
 
@@ -129,6 +146,9 @@ func (el *{{ lower_camel .GoName }}EventLoop) Run(namespaces []string, opts clie
 					channelClosed = true
 					close(el.ready)
 				}
+
+				previousSnapshot = snapshot
+
 			case <-opts.Ctx.Done():
 				return
 			}

pkg/code-generator/codegen/templates/snapshot_template.go

@@ -22,6 +22,7 @@ import (
 	"github.com/rotisserie/eris"
 	"github.com/solo-io/go-utils/hashutils"
 	"go.uber.org/zap"
+	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 )
 
 type {{ .GoName }}Snapshot struct {
@@ -106,15 +107,28 @@ func (s *{{ .GoName }}Snapshot) RemoveFromResourceList(resource resources.Resour
 				break
 			}
 		}
-		return nil	
+		return nil
 {{- end }}
 	default:
 		return eris.Errorf("did not remove the resource because its type does not exist [%T]", resource)
 	}
 }
 
+func (s *{{ .GoName }}Snapshot) RemoveMatches(predicate core.Predicate) {
+{{- range .Resources }}
+	var {{ upper_camel .PluralName }} {{ .ImportPrefix }}{{ .Name }}List
+	for _, res := range s.{{ upper_camel .PluralName }} {
+		if matches := predicate(res.GetMetadata()); !matches {
+			{{ upper_camel .PluralName }} = append({{ upper_camel .PluralName }}, res)
+		}
+	}
+	s.{{ upper_camel .PluralName }} = {{ upper_camel .PluralName }}
+{{- end }}
+}
+
+
 func (s *{{ .GoName }}Snapshot) UpsertToResourceList(resource resources.Resource) error {
-	refKey := resource.GetMetadata().Ref().Key() 
+	refKey := resource.GetMetadata().Ref().Key()
 	switch typed := resource.(type) {
 {{- range .Resources }}
 	case *{{ .ImportPrefix }}{{ .Name }}:
@@ -129,7 +143,7 @@ func (s *{{ .GoName }}Snapshot) UpsertToResourceList(resource resources.Resource
 			s.{{ upper_camel .PluralName }} = append(s.{{ upper_camel .PluralName }}, typed)
 		}
 		s.{{ upper_camel .PluralName }}.Sort()
-		return nil	
+		return nil
 {{- end }}
 	default:
 		return eris.Errorf("did not add/replace the resource type because it does not exist %T", resource)
@@ -176,7 +190,7 @@ func (s {{ .GoName }}Snapshot) Stringer() {{ .GoName }}SnapshotStringer {
 var {{.GoName }}GvkToHashableResource = map[schema.GroupVersionKind]func() resources.HashableResource {
 {{- range .Resources}}
 	{{ .ImportPrefix }}{{ .Name }}GVK: {{ .ImportPrefix }}New{{ .Name }}HashableResource,
-{{- end }}	
+{{- end }}
 }
 
 `))

pkg/code-generator/docgen/funcs/template_funcs.go

@@ -318,8 +318,15 @@ func linkForField(project *model.Project, docsOptions *options.DocsOptions) func
 				linkedFile = filepath.Base(file.GetName())
 				//return "", errors.Errorf("failed to get generated file path for proto %v in list %v", file.GetName(), project.Request.FileToGenerate)
 			}
-			linkedFile = relativeFilename(forFile.GetName(), linkedFile)
 
+			// Skip links for packages that are configured to be skipped
+			for _, pkg := range docsOptions.RenderOptions.GetSkipLinksForPathPrefixes() {
+				if strings.HasPrefix(linkedFile, pkg) {
+					return typeName, nil
+				}
+			}
+
+			linkedFile = relativeFilename(forFile.GetName(), linkedFile)
 			if docsOptions.Output == options.Restructured {
 				linkText = ":ref:`message." + strings.TrimPrefix(field.GetTypeName(), ".") + "`"
 			} else {

pkg/code-generator/docgen/options/options.go

@@ -21,8 +21,23 @@ type HugoOptions struct {
 }
 
 type DocsOptions struct {
-	Output      DocsOutput
-	HugoOptions *HugoOptions
+	Output        DocsOutput
+	HugoOptions   *HugoOptions
+	RenderOptions *RenderOptions
+}
+
+// RenderOptions provides options for rendering documentation
+type RenderOptions struct {
+	// SkipLinksForPathPrefixes is a list of file path prefixes of APIs to which we should not be attempting to link
+	// For example: "github.com/solo-io/gloo/projects/gloo/api/external"
+	SkipLinksForPathPrefixes []string
+}
+
+func (o *RenderOptions) GetSkipLinksForPathPrefixes() []string {
+	if o == nil {
+		return nil
+	}
+	return o.SkipLinksForPathPrefixes
 }
 
 const (