Skip to content

support custom markers with values #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewChubatiuk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support custom markers with values #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ type ProcessorConfig struct {
}

type Marker struct {
Name string
Target TargetType
Name string
Target TargetType
HasValue bool `json:"hasValue"`
}

type TargetType string
Expand Down
15 changes: 12 additions & 3 deletions processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,9 +527,19 @@ func mkRegistry(customMarkers []config.Marker) (*markers.Registry, error) {
continue
}

if err := registry.Define(marker.Name, t, struct{}{}); err != nil {
var d *markers.Definition
var err error
if marker.HasValue {
d, err = markers.MakeAnyTypeDefinition(marker.Name, t, crdmarkers.Default{})
} else {
d, err = markers.MakeDefinition(marker.Name, t, struct{}{})
}
if err != nil {
return nil, fmt.Errorf("failed to define custom marker %s: %w", marker.Name, err)
}
if err := registry.Register(d); err != nil {
return nil, fmt.Errorf("failed to register custom marker %s: %w", marker.Name, err)
}
}

return registry, nil
Expand All @@ -547,7 +557,6 @@ func parseMarkers(markers markers.MarkerValues) (string, []string) {

for _, name := range markerNames {
value := markers[name][len(markers[name])-1]

if strings.HasPrefix(name, "kubebuilder:validation:") {
name := strings.TrimPrefix(name, "kubebuilder:validation:")

Expand All @@ -569,7 +578,7 @@ func parseMarkers(markers markers.MarkerValues) (string, []string) {
defaultValue = fmt.Sprintf("%v", v.Value)
}

// Handle standalone +required and +k8s:required marker
// Handle standalone +required and +k8s:required marker
// This is equivalent to +kubebuilder:validation:Required
if name == "required" || name == "k8s:required" {
validation = append(validation, "Required: {}")
Expand Down