Support wildecard match; refactor code in attempt to build an authoring pattern.

Author: yuwenma

functions/go/gcp-set-project-id/fieldspec/annotation.go renamed to functions/go/gcp-set-project-id/consts/annotation.go

@@ -1,10 +1,10 @@
-package fieldspec
+package consts
 
 // annotationFieldSpecs update the KRM resources' annotations whose field spec matches the path.
 // This requires the annotation to already exist in the KRM resource, which is different from kustomize's
 // commonAnnotations that creates the annotation if not exist.
-const annotationFieldSpecs = `
-commonAnnotations:
+const AnnotationFieldSpecs = `
+annotations:
 - path: metadata/annotations
 
 - path: spec/template/metadata/annotations

functions/go/gcp-set-project-id/fieldspec/project.go renamed to functions/go/gcp-set-project-id/consts/project.go

@@ -1,25 +1,27 @@
-package fieldspec
+package consts
 
-/* projectIDFieldSpecs contains the fieldSpec paths of Google Cloud ProjectID shown in
-blueprints spanner, bucket and redis.
- */
+// ProjectFieldSpecs contains the fieldSpec paths of Google Cloud ProjectID
+const ProjectFieldSpecs = `
+projectFieldSpec:
+# Blueprint redis-bucket
+- path: spec/authorizedNetworkRef/external 
+  regexPattern: (?P<prefix>projects\/)(?P<projectID>\S+)(?P<suffix>\/global\/networks\/default)
+  group: redis.cnrm.cloud.google.com
+  version: v1beta1
+  kind: RedisInstance
 
-const (
-	ProjectIDFieldSpecs = `
-projectID:
-# Cluster blueprint
-- path: spec/resourceRef/external 
+# Blueprint cluster
+- path: spec/resourceRef/external
   group: iam.cnrm.cloud.google.com
   version: v1beta1
   kind: IAMPolicyMember
 
-# Cluster blueprint
+# Blueprint cluster
 - path: spec/projectRef/external
   group: gkehub.cnrm.cloud.google.com
   version: v1beta1
   kind: GKEHubFeatureMembership
 `
-)
 
 /*
 # Test-Only
@@ -28,7 +30,7 @@ version: v1
 group: apps
 kind: Deployment
 create: true
- */
+*/
 
 /* UNSUPPORTED Project FieldSpec due to substitution/partial-setter
 - path: metadata/annotations[cnrm.cloud.google.com/project-id]
@@ -79,4 +81,4 @@ create: true
   version: v1beta1
   kind: GKEHubFeatureMembership
   create: true
- */
+*/

functions/go/gcp-set-project-id/custom/filter.go

@@ -0,0 +1,68 @@
+package custom
+
+import (
+	"fmt"
+	"regexp"
+
+	"sigs.k8s.io/kustomize/api/filters/fieldspec"
+	"sigs.k8s.io/kustomize/api/filters/filtersutil"
+	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/kio"
+	"sigs.k8s.io/kustomize/kyaml/yaml"
+)
+
+var _ kio.Filter = Filter{}
+
+type Filter struct {
+	ProjectID string
+	FsSlice   []types.FieldSpec
+}
+
+func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
+	_, err := kio.FilterAll(yaml.FilterFunc(
+		func(node *yaml.RNode) (*yaml.RNode, error) {
+			var fns []yaml.Filter
+			for _, fs := range f.FsSlice {
+
+				fn := fieldspec.Filter{
+					SetValue:  f.updateProjectIDFn(fs.RegexPattern),
+					FieldSpec: fs,
+				}
+				fns = append(fns, fn)
+			}
+			return node.Pipe(fns...)
+		})).Filter(nodes)
+	return nodes, err
+}
+
+func (f Filter) updateProjectIDFn(regexPath string) filtersutil.SetFn {
+	return func(node *yaml.RNode) (err error) {
+		if regexPath == "" {
+			return node.PipeE(updater{ProjectID: f.ProjectID})
+		}
+		defer func() {
+			// recover from regex panic.
+			if recover() != nil {
+				err = fmt.Errorf("invalid regex pattern %v", regexPath)
+			}
+		}()
+		re := regexp.MustCompile(regexPath)
+		match := re.FindStringSubmatch(node.YNode().Value)
+		namedGroup := make(map[string]string)
+		for i, name := range re.SubexpNames() {
+			if i != 0 && name != "" {
+				namedGroup[name] = match[i]
+			}
+		}
+		newProjectID := namedGroup["prefix"] + f.ProjectID + namedGroup["suffix"]
+		return node.PipeE(updater{ProjectID: newProjectID})
+	}
+}
+
+type updater struct {
+	ProjectID string
+}
+
+func (u updater) Filter(rn *yaml.RNode) (*yaml.RNode, error) {
+	return rn.Pipe(yaml.FieldSetter{StringValue: u.ProjectID})
+}

functions/go/gcp-set-project-id/go.mod

@@ -1,11 +1,11 @@
-module github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-project-id
+module github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/gcp-set-project-id
 
 go 1.17
 
 require (
-	sigs.k8s.io/kustomize/api v0.10.2-0.20211202184144-fe551be87b8d
-	sigs.k8s.io/kustomize/kyaml v0.13.1-0.20211202184144-fe551be87b8d
-	sigs.k8s.io/yaml v1.2.0
+	sigs.k8s.io/kustomize/api v0.11.1
+	sigs.k8s.io/kustomize/kyaml v0.13.3
+	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
@@ -31,3 +31,5 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
 )
+
+replace sigs.k8s.io/kustomize/api => ./thirdparty/kustomize/api

functions/go/gcp-set-project-id/go.sum

@@ -0,0 +1,27 @@
+package plugins
+
+import (
+	"sigs.k8s.io/kustomize/api/filters/annotations"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/yaml"
+)
+
+type AnnotationPlugin struct {
+	Annotations map[string]string
+	FieldSpecs  []types.FieldSpec `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+}
+
+func (p *AnnotationPlugin) Config(
+	_ *resmap.PluginHelpers, c []byte) (err error) {
+	p.Annotations = nil
+	p.FieldSpecs = nil
+	return yaml.Unmarshal(c, p)
+}
+
+func (p *AnnotationPlugin) Transform(m resmap.ResMap) error {
+	return m.ApplyFilter(annotations.Filter{
+		Annotations: p.Annotations,
+		FsSlice:     p.FieldSpecs,
+	})
+}

functions/go/gcp-set-project-id/plugin.go

@@ -0,0 +1,25 @@
+package plugins
+
+import (
+	"github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/gcp-set-project-id/custom"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/yaml"
+)
+
+type CustomFieldSpecPlugin struct {
+	ProjectID string
+	FsSlice   []types.FieldSpec `json:"projectFieldSpec,omitempty" yaml:"projectFieldSpec,omitempty"`
+}
+
+func (f *CustomFieldSpecPlugin) Config(c []byte) error {
+	f.FsSlice = nil
+	return yaml.Unmarshal(c, f)
+}
+
+func (f *CustomFieldSpecPlugin) Transform(m resmap.ResMap) error {
+	return m.ApplyFilter(custom.Filter{
+		ProjectID: f.ProjectID,
+		FsSlice:   f.FsSlice,
+	})
+}

functions/go/gcp-set-project-id/plugins/annotation.go

@@ -0,0 +1,51 @@
+// Copyright 2021 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Deprecated: Package api/builtins will not be available in API v1.
+package builtins
+
+import (
+	internal "sigs.k8s.io/kustomize/api/internal/builtins"
+)
+
+type (
+	AnnotationsTransformerPlugin         = internal.AnnotationsTransformerPlugin
+	ConfigMapGeneratorPlugin             = internal.ConfigMapGeneratorPlugin
+	HashTransformerPlugin                = internal.HashTransformerPlugin
+	HelmChartInflationGeneratorPlugin    = internal.HelmChartInflationGeneratorPlugin
+	IAMPolicyGeneratorPlugin             = internal.IAMPolicyGeneratorPlugin
+	ImageTagTransformerPlugin            = internal.ImageTagTransformerPlugin
+	LabelTransformerPlugin               = internal.LabelTransformerPlugin
+	LegacyOrderTransformerPlugin         = internal.LegacyOrderTransformerPlugin
+	NamespaceTransformerPlugin           = internal.NamespaceTransformerPlugin
+	PatchJson6902TransformerPlugin       = internal.PatchJson6902TransformerPlugin
+	PatchStrategicMergeTransformerPlugin = internal.PatchStrategicMergeTransformerPlugin
+	PatchTransformerPlugin               = internal.PatchTransformerPlugin
+	PrefixTransformerPlugin              = internal.PrefixTransformerPlugin
+	SuffixTransformerPlugin              = internal.SuffixTransformerPlugin
+	ReplacementTransformerPlugin         = internal.ReplacementTransformerPlugin
+	ReplicaCountTransformerPlugin        = internal.ReplicaCountTransformerPlugin
+	SecretGeneratorPlugin                = internal.SecretGeneratorPlugin
+	ValueAddTransformerPlugin            = internal.ValueAddTransformerPlugin
+)
+
+var (
+	NewAnnotationsTransformerPlugin         = internal.NewAnnotationsTransformerPlugin
+	NewConfigMapGeneratorPlugin             = internal.NewConfigMapGeneratorPlugin
+	NewHashTransformerPlugin                = internal.NewHashTransformerPlugin
+	NewHelmChartInflationGeneratorPlugin    = internal.NewHelmChartInflationGeneratorPlugin
+	NewIAMPolicyGeneratorPlugin             = internal.NewIAMPolicyGeneratorPlugin
+	NewImageTagTransformerPlugin            = internal.NewImageTagTransformerPlugin
+	NewLabelTransformerPlugin               = internal.NewLabelTransformerPlugin
+	NewLegacyOrderTransformerPlugin         = internal.NewLegacyOrderTransformerPlugin
+	NewNamespaceTransformerPlugin           = internal.NewNamespaceTransformerPlugin
+	NewPatchJson6902TransformerPlugin       = internal.NewPatchJson6902TransformerPlugin
+	NewPatchStrategicMergeTransformerPlugin = internal.NewPatchStrategicMergeTransformerPlugin
+	NewPatchTransformerPlugin               = internal.NewPatchTransformerPlugin
+	NewPrefixTransformerPlugin              = internal.NewPrefixTransformerPlugin
+	NewSuffixTransformerPlugin              = internal.NewSuffixTransformerPlugin
+	NewReplacementTransformerPlugin         = internal.NewReplacementTransformerPlugin
+	NewReplicaCountTransformerPlugin        = internal.NewReplicaCountTransformerPlugin
+	NewSecretGeneratorPlugin                = internal.NewSecretGeneratorPlugin
+	NewValueAddTransformerPlugin            = internal.NewValueAddTransformerPlugin
+)