Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 26 additions & 3 deletions generator/parser/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -1681,25 +1681,48 @@ func new{{ $.GoName }}{{ toCamel .Name }}Cmd(ctx *registry.CLIContext) *cobra.Co
{{- if isPatchOp . }}
// PATCH: --set flags take priority; fall back to --from-file or stdin
reqCtx = registry.WithContentType(reqCtx, "application/merge-patch+json")
var normalized []byte
switch {
case len(flagSet) > 0:
data, err := buildMergePatchFromSet(flagSet)
if err != nil {
return err
}
body = bytes.NewReader(data)
normalized = data
case fromFile != "":
data, err := os.ReadFile(fromFile)
if err != nil {
return fmt.Errorf("reading input file: %w", err)
}
body = bytes.NewReader(data)
normalized = data
default:
stat, _ := os.Stdin.Stat()
if (stat.Mode() & os.ModeCharDevice) == 0 {
body = os.Stdin
raw, err := io.ReadAll(io.LimitReader(os.Stdin, 10<<20))
if err != nil {
return fmt.Errorf("reading stdin: %w", err)
}
normalized = raw
}
}
{{- if opHasFileFields . $ }}
// File-sourced fields (--{{ (index $.FileFields 0).Flag }}, etc.) overwrite
// any value the caller supplied in the body. When no other body input is
// given, injectFileFields constructs a minimal merge-patch from the file
// alone.
var fileFieldErr error
normalized, fileFieldErr = injectFileFields(normalized, []fileFieldSpec{
{{- range $.FileFields }}
{FilePath: flag{{ toCamel .Flag }}, Field: "{{ .Field }}", Encoding: "{{ .Encoding }}", CompanionField: "{{ .CompanionField }}", NameFallback: "{{ .NameFallback }}", NameField: "{{ resourceNameField $ }}"},
{{- end }}
})
if fileFieldErr != nil {
return fileFieldErr
}
{{- end }}
if len(normalized) > 0 {
body = bytes.NewReader(normalized)
}
{{- else if eq .Name "delete-multiple" }}
// Handle --ids flag for bulk operations
if len(flagIds) > 0 {
Expand Down
14 changes: 11 additions & 3 deletions internal/commands/pro/generated/account_preferences.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/activation_codes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/adcs_settings.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/cloud_distribution_points.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/computers_inventory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/digi_cert_settings.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/distribution_points.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions internal/commands/pro/generated/groups.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading