generated from kubernetes/kubernetes-template-project
-
Notifications
You must be signed in to change notification settings - Fork 83
add ability to read input file from stdin #247
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.
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
jpiper
wants to merge
3
commits into
kubernetes-sigs:main
Choose a base branch
from
jpiper:stdin
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+32
−4
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ import ( | |
"fmt" | ||
"io" | ||
"os" | ||
"sync" | ||
|
||
apiv1 "k8s.io/api/core/v1" | ||
networkingv1 "k8s.io/api/networking/v1" | ||
|
@@ -34,6 +35,12 @@ import ( | |
"sigs.k8s.io/controller-runtime/pkg/client" | ||
) | ||
|
||
var ( | ||
stdin []byte | ||
stdinOnce sync.Once | ||
stdinErr error | ||
) | ||
|
||
func ReadIngressesFromCluster(ctx context.Context, client client.Client, ingressClasses sets.Set[string]) (map[types.NamespacedName]*networkingv1.Ingress, error) { | ||
var ingressList networkingv1.IngressList | ||
err := client.List(ctx, &ingressList) | ||
|
@@ -52,11 +59,32 @@ func ReadIngressesFromCluster(ctx context.Context, client client.Client, ingress | |
return ingresses, nil | ||
} | ||
|
||
func ReadIngressesFromFile(filename, namespace string, ingressClasses sets.Set[string]) (map[types.NamespacedName]*networkingv1.Ingress, error) { | ||
// readFileOrStdin reads content from a file or stdin based on the filename. | ||
// If filename is "-", it reads from stdin, otherwise from the specified file. | ||
// Stdin content is stored in memory after the first read to allow multiple calls. | ||
func readFileOrStdin(filename string) ([]byte, error) { | ||
if filename == "-" { | ||
stdinOnce.Do(func() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not really a big deal, but probably you could simply check if the len of stdIn is > 0 :) but lgtm |
||
stdin, stdinErr = io.ReadAll(os.Stdin) | ||
if stdinErr != nil { | ||
stdinErr = fmt.Errorf("failed to read from stdin: %w", stdinErr) | ||
} | ||
}) | ||
return stdin, stdinErr | ||
} | ||
|
||
stream, err := os.ReadFile(filename) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to read file %v: %w", filename, err) | ||
} | ||
return stream, nil | ||
} | ||
|
||
func ReadIngressesFromFile(filename, namespace string, ingressClasses sets.Set[string]) (map[types.NamespacedName]*networkingv1.Ingress, error) { | ||
stream, err := readFileOrStdin(filename) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
unstructuredObjects, err := ExtractObjectsFromReader(bytes.NewReader(stream), namespace) | ||
if err != nil { | ||
|
@@ -98,9 +126,9 @@ func ReadServicesFromCluster(ctx context.Context, client client.Client) (map[typ | |
} | ||
|
||
func ReadServicesFromFile(filename, namespace string) (map[types.NamespacedName]*apiv1.Service, error) { | ||
stream, err := os.ReadFile(filename) | ||
stream, err := readFileOrStdin(filename) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to read file %v: %w", filename, err) | ||
return nil, err | ||
} | ||
|
||
unstructuredObjects, err := ExtractObjectsFromReader(bytes.NewReader(stream), namespace) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.