Merge pull request #3389 from somtochiama/build-stdin

Push/Build artifacts from stdin

cmd/flux/build_artifact.go

@@ -17,7 +17,10 @@ limitations under the License.
 package main
 
 import (
+ "bufio"
+ "bytes"
  "fmt"
+ "io"
  "os"
  "strings"
 
@@ -54,7 +57,7 @@ var excludeOCI = append(strings.Split(sourceignore.ExcludeVCS, ","), strings.Spl
 var buildArtifactArgs buildArtifactFlags
 
 func init() {
- buildArtifactCmd.Flags().StringVar(&buildArtifactArgs.path, "path", "", "Path to the directory where the Kubernetes manifests are located.")
+ buildArtifactCmd.Flags().StringVarP(&buildArtifactArgs.path, "path", "p", "", "Path to the directory where the Kubernetes manifests are located.")
  buildArtifactCmd.Flags().StringVarP(&buildArtifactArgs.output, "output", "o", "artifact.tgz", "Path to where the artifact tgz file should be written.")
  buildArtifactCmd.Flags().StringSliceVar(&buildArtifactArgs.ignorePaths, "ignore-paths", excludeOCI, "set paths to ignore in .gitignore format")
 
@@ -66,18 +69,47 @@ func buildArtifactCmdRun(cmd *cobra.Command, args []string) error {
  return fmt.Errorf("invalid path %q", buildArtifactArgs.path)
  }
 
- if _, err := os.Stat(buildArtifactArgs.path); err != nil {
- return fmt.Errorf("invalid path '%s', must point to an existing directory or file", buildArtifactArgs.path)
+ path := buildArtifactArgs.path
+ var err error
+ if buildArtifactArgs.path == "-" {
+ path, err = saveStdinToFile()
+ if err != nil {
+ return err
+ }
+
+ defer os.Remove(path)
+ }
+
+ if _, err := os.Stat(path); err != nil {
+ return fmt.Errorf("invalid path '%s', must point to an existing directory or file", path)
  }
 
- logger.Actionf("building artifact from %s", buildArtifactArgs.path)
+ logger.Actionf("building artifact from %s", path)
 
  ociClient := oci.NewLocalClient()
- if err := ociClient.Build(buildArtifactArgs.output, buildArtifactArgs.path, buildArtifactArgs.ignorePaths); err != nil {
+ if err := ociClient.Build(buildArtifactArgs.output, path, buildArtifactArgs.ignorePaths); err != nil {
  return fmt.Errorf("bulding artifact failed, error: %w", err)
  }
 
  logger.Successf("artifact created at %s", buildArtifactArgs.output)
-
  return nil
 }
+
+func saveStdinToFile() (string, error) {
+ b, err := io.ReadAll(bufio.NewReader(os.Stdin))
+ if err != nil {
+ return "", err
+ }
+ b = bytes.TrimRight(b, "\r\n")
+ f, err := os.CreateTemp("", "*.yaml")
+ if err != nil {
+ return "", fmt.Errorf("unable to create temp dir for stdin")
+ }
+
+ _, err = f.Write(b)
+ if err != nil {
+ return "", fmt.Errorf("error writing stdin to file: %w", err)
+ }
+
+ return f.Name(), nil
+}

cmd/flux/push_artifact.go

@@ -40,6 +40,11 @@ The command can read the credentials from '~/.docker/config.json' but they can a
  --source="$(git config --get remote.origin.url)" \
  --revision="$(git branch --show-current)/$(git rev-parse HEAD)"
 
+ # Push manifests passed into stdin to GHCR
+ kustomize build . | flux push artifact oci://ghcr.io/org/config/app:$(git rev-parse --short HEAD) -p - \ 
+ --source="$(git config --get remote.origin.url)" \
+ --revision="$(git branch --show-current)/$(git rev-parse HEAD)"
+
  # Push single manifest file to GHCR using the short Git SHA as the OCI artifact tag
  echo $GITHUB_PAT | docker login ghcr.io --username flux --password-stdin
  flux push artifact oci://ghcr.io/org/config/app:$(git rev-parse --short HEAD) \
@@ -159,7 +164,17 @@ func pushArtifactCmdRun(cmd *cobra.Command, args []string) error {
 
  logger.Actionf("pushing artifact to %s", url)
 
- digest, err := ociClient.Push(ctx, url, pushArtifactArgs.path, meta, pushArtifactArgs.ignorePaths)
+ path := pushArtifactArgs.path
+ if buildArtifactArgs.path == "-" {
+ path, err = saveStdinToFile()
+ if err != nil {
+ return err
+ }
+
+ defer os.Remove(path)
+ }
+
+ digest, err := ociClient.Push(ctx, url, path, meta, pushArtifactArgs.ignorePaths)
  if err != nil {
  return fmt.Errorf("pushing artifact failed: %w", err)
  }

go.mod

@@ -18,7 +18,7 @@ require (
  github.com/fluxcd/pkg/git v0.7.0
  github.com/fluxcd/pkg/git/gogit v0.3.1
  github.com/fluxcd/pkg/kustomize v0.10.0
- github.com/fluxcd/pkg/oci v0.15.0
+ github.com/fluxcd/pkg/oci v0.16.0
  github.com/fluxcd/pkg/runtime v0.24.0
  github.com/fluxcd/pkg/sourceignore v0.3.0
  github.com/fluxcd/pkg/ssa v0.22.0
@@ -79,7 +79,11 @@ require (
  github.com/Microsoft/go-winio v0.6.0 // indirect
  github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
  github.com/acomagu/bufpipe v1.0.3 // indirect
- github.com/aws/aws-sdk-go v1.44.137 // indirect
+ github.com/aws/aws-sdk-go-v2 v1.17.1 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ecr v1.17.22 // indirect
+ github.com/aws/smithy-go v1.13.4 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
  github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd // indirect

go.sum

@@ -104,8 +104,17 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/aws/aws-sdk-go v1.44.137 h1:GH2bUPiW7/gHtB04NxQOSOrKqFNjLGKmqt5YaO+K1SE=
-github.com/aws/aws-sdk-go v1.44.137/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go-v2 v1.17.1 h1:02c72fDJr87N8RAC2s3Qu0YuvMRZKNZJ9F+lAehCazk=
+github.com/aws/aws-sdk-go-v2 v1.17.1/go.mod h1:JLnGeGONAyi2lWXI1p0PCIOIy333JMVK1U7Hf0aRFLw=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.2 h1:F/v1w0XcFDZjL0bCdi9XWJenoPKjGbzljBhDKcryzEQ=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 h1:nBO/RFxeq/IS5G9Of+ZrgucRciie2qpLy++3UGZ+q2E=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25/go.mod h1:Zb29PYkf42vVYQY6pvSyJCJcFHlPIiY+YKdPtwnvMkY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19 h1:oRHDrwCTVT8ZXi4sr9Ld+EXk7N/KGssOr2ygNeojEhw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19/go.mod h1:6Q0546uHDp421okhmmGfbxzq2hBqbXFNpi4k+Q1JnQA=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.17.22 h1:cC+NNTWWyV0DZF94k2Ugz6NFSdcBoo08oNdYtj9hg5g=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.17.22/go.mod h1:kEVGiy2tACP0cegVqx4MrjsgQMSgrtgRq1fSa+Ix6F0=
+github.com/aws/smithy-go v1.13.4 h1:/RN2z1txIJWeXeOkzX+Hk/4Uuvv7dWtCjbmVJcrskyk=
+github.com/aws/smithy-go v1.13.4/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -229,8 +238,8 @@ github.com/fluxcd/pkg/git/gogit v0.3.1/go.mod h1:5b3+lylk3oPkKazfnK5K7DWC2d6MMhY
 github.com/fluxcd/pkg/gittestserver v0.8.0 h1:YrYe63KScKlLxx0GAiQthx2XqHDx0vKitIIx4JnDtIo=
 github.com/fluxcd/pkg/kustomize v0.10.0 h1:EG5MbYrLtxeCiZxeFUgvyBhFZaXnKfeqqpg7O+J7o3s=
 github.com/fluxcd/pkg/kustomize v0.10.0/go.mod h1:awHID4OKe2/WAfTFg4u0fURXZPUkrIslSZNSPX9MEFQ=
-github.com/fluxcd/pkg/oci v0.15.0 h1:M8fiWveUPoUxZqvHc6om1/5tDYMOEdbJAURfKK7mGAA=
-github.com/fluxcd/pkg/oci v0.15.0/go.mod h1:OcLmssDP65I5OUVZQY5GpqDtgaU9VypKgQVJElbyLs8=
+github.com/fluxcd/pkg/oci v0.16.0 h1:GKCbAoRMnSi1D5BpxeU9auWHYp7v/vMC7UWT1RXYdN8=
+github.com/fluxcd/pkg/oci v0.16.0/go.mod h1:5suv5R+6X2YOTazKcaJ7dqZv0PaVs8A1KHur+wN8YPA=
 github.com/fluxcd/pkg/runtime v0.24.0 h1:rQmm5Xq8K7f8xcPj1oNOInM1x4YwmgTucZJOP51Xmr4=
 github.com/fluxcd/pkg/runtime v0.24.0/go.mod h1:I2T+HWVNzX0cxm9TgH+SVNHTwqlmEDiSke43JXsq9iY=
 github.com/fluxcd/pkg/sourceignore v0.3.0 h1:pFO3hKV9ub+2SrNZPZE7xfiRhxsycRrd7JK7qB26nVw=
@@ -364,6 +373,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.12.1 h1:W1mzdNUTx4Zla4JaixCRLhORcR7G6KxE5hHl5fkPsp8=