Merge pull request #919 from imjasonh/drop-logger

chainguard-dev · Jan 16, 2024 · 34a2130 · 34a2130
2 parents 085b6a7 + 1608672
commit 34a2130
Show file tree

Hide file tree

Showing 58 changed files with 639 additions and 570 deletions.
diff --git a/docs/md/melange.md b/docs/md/melange.md
@@ -14,7 +14,9 @@ toc: true
 ### Options
 
 ```
-  -h, --help   help for melange
+  -h, --help                 help for melange
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
 ```
 
 ### SEE ALSO

diff --git a/docs/md/melange_build.md b/docs/md/melange_build.md
@@ -64,6 +64,12 @@ melange build [flags]
       --workspace-dir string        directory used for the workspace at /home/build
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string   log level (e.g. debug, info, warn, error) (default "info")
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_bump.md b/docs/md/melange_bump.md
@@ -32,6 +32,13 @@ melange bump [flags]
   -h, --help                     help for bump
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_completion.md b/docs/md/melange_completion.md
@@ -54,6 +54,13 @@ melange completion [bash|zsh|fish|powershell]
   -h, --help   help for completion
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_convert.md b/docs/md/melange_convert.md
@@ -30,6 +30,13 @@ Convert is an EXPERIMENTAL COMMAND - Attempts to convert packages/gems/apkbuild
       --wolfi-defaults                        if true, adds wolfi repo, and keyring to config (default true)
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_convert_apkbuild.md b/docs/md/melange_convert_apkbuild.md
@@ -38,6 +38,8 @@ melange convert apkbuild [flags]
 ```
       --additional-keyrings stringArray       additional repositories to be added to convert environment config
       --additional-repositories stringArray   additional repositories to be added to convert environment config
+      --log-level string                      log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings                    log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
   -o, --out-dir string                        directory where convert config will be output (default ".")
       --use-github                            **experimental** if true, tries to use github to figure out the release commit details (python only for now). To prevent rate limiting, you can set the GITHUB_TOKEN env variable to a github token. (default true)
       --use-relmon                            **experimental** if true, tries to use release-monitoring to fetch release monitoring data.

diff --git a/docs/md/melange_convert_gem.md b/docs/md/melange_convert_gem.md
@@ -40,6 +40,8 @@ convert gem fluentd
 ```
       --additional-keyrings stringArray       additional repositories to be added to convert environment config
       --additional-repositories stringArray   additional repositories to be added to convert environment config
+      --log-level string                      log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings                    log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
   -o, --out-dir string                        directory where convert config will be output (default ".")
       --use-github                            **experimental** if true, tries to use github to figure out the release commit details (python only for now). To prevent rate limiting, you can set the GITHUB_TOKEN env variable to a github token. (default true)
       --use-relmon                            **experimental** if true, tries to use release-monitoring to fetch release monitoring data.

diff --git a/docs/md/melange_convert_python.md b/docs/md/melange_convert_python.md
@@ -41,6 +41,8 @@ convert python botocore
 ```
       --additional-keyrings stringArray       additional repositories to be added to convert environment config
       --additional-repositories stringArray   additional repositories to be added to convert environment config
+      --log-level string                      log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings                    log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
   -o, --out-dir string                        directory where convert config will be output (default ".")
       --use-github                            **experimental** if true, tries to use github to figure out the release commit details (python only for now). To prevent rate limiting, you can set the GITHUB_TOKEN env variable to a github token. (default true)
       --use-relmon                            **experimental** if true, tries to use release-monitoring to fetch release monitoring data.

diff --git a/docs/md/melange_index.md b/docs/md/melange_index.md
@@ -36,6 +36,13 @@ melange index [flags]
   -s, --source string        Source FILE to use for pre-existing index entries (default "APKINDEX.tar.gz")
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_keygen.md b/docs/md/melange_keygen.md
@@ -32,6 +32,13 @@ melange keygen [flags]
       --key-size int   the size of the prime to calculate (in bits) (default 4096)
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_lint.md b/docs/md/melange_lint.md
@@ -33,6 +33,13 @@ melange lint [flags]
   -h, --help                 help for lint
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_package-version.md b/docs/md/melange_package-version.md
@@ -35,6 +35,13 @@ melange package-version [flags]
   -h, --help   help for package-version
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_query.md b/docs/md/melange_query.md
@@ -32,6 +32,13 @@ melange query [flags]
   -h, --help   help for query
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_sign-index.md b/docs/md/melange_sign-index.md
@@ -39,6 +39,13 @@ melange sign-index [flags]
       --signing-key string   the signing key to use (default "melange.rsa")
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_sign.md b/docs/md/melange_sign.md
@@ -36,6 +36,13 @@ melange sign [flags]
   -k, --signing-key string   The signing key to use. (default "local-melange.rsa")
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_test.md b/docs/md/melange_test.md
@@ -41,13 +41,19 @@ melange test [flags]
       --overlay-binsh string          use specified file as /bin/sh overlay in build environment
       --pipeline-dirs strings         directories used to extend defined built-in pipelines
   -r, --repository-append strings     path to extra repositories to include in the build environment
-      --runner string                 which runner to use to enable running commands, default is based on your platform. Options are ["bubblewrap" "docker" "lima" "kubernetes"] (default "bubblewrap")
+      --runner string                 which runner to use to enable running commands, default is based on your platform. Options are ["bubblewrap" "docker" "lima" "kubernetes"]
       --source-dir string             directory used for included sources
       --test-option strings           build options to enable
       --test-package-append strings   extra packages to install for each of the test environments
       --workspace-dir string          directory used for the workspace at /home/build
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string   log level (e.g. debug, info, warn, error) (default "info")
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_update-cache.md b/docs/md/melange_update-cache.md
@@ -32,6 +32,13 @@ melange update-cache [flags]
   -h, --help               help for update-cache
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/docs/md/melange_version.md b/docs/md/melange_version.md
@@ -22,6 +22,13 @@ melange version [flags]
       --json   print JSON instead of text
 ```
 
+### Options inherited from parent commands
+
+```
+      --log-level string     log level (e.g. debug, info, warn, error) (default "info")
+      --log-policy strings   log policy (e.g. builtin:stderr, /tmp/log/foo) (default [builtin:stderr])
+```
+
 ### SEE ALSO
 
 * [melange](/docs/md/melange.md)	 - 

diff --git a/go.mod b/go.mod
@@ -1,13 +1,14 @@
 module chainguard.dev/melange
 
-go 1.21
+go 1.21.2
 
-toolchain go1.21.1
+toolchain go1.21.5
 
 require (
-	chainguard.dev/apko v0.12.0
+	chainguard.dev/apko v0.13.4-0.20240116200834-c10dc551b827
 	cloud.google.com/go/storage v1.36.0
-	github.com/chainguard-dev/go-apk v0.0.0-20240115184838-1c022784a5ed
+	github.com/chainguard-dev/clog v1.2.3-0.20240116182827-04bee692f7a8
+	github.com/chainguard-dev/go-apk v0.0.0-20240116193855-4c76fbe27ad7
 	github.com/chainguard-dev/go-pkgconfig v0.0.0-20230818193557-bee0072057ce
 	github.com/chainguard-dev/kontext v0.1.0
 	github.com/chainguard-dev/yam v0.0.0-20230807153807-4de7c531f3e1
@@ -31,7 +32,6 @@ require (
 	github.com/package-url/packageurl-go v0.1.2
 	github.com/pkg/errors v0.9.1
 	github.com/psanford/memfs v0.0.0-20230130182539-4dbf7e3e865e
-	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
 	github.com/yookoala/realpath v1.0.0
@@ -114,9 +114,8 @@ require (
 	github.com/google/uuid v1.4.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-hclog v0.9.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -148,6 +147,7 @@ require (
 	github.com/sigstore/cosign/v2 v2.2.1 // indirect
 	github.com/sigstore/rekor v1.3.3 // indirect
 	github.com/sigstore/sigstore v1.7.5 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.1 // indirect
 	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-chainguard.dev/apko v0.12.0 h1:smG4DL5HMmSsbO6/Buou+GpCWpUW4whnoEWNsoz/6To=
-chainguard.dev/apko v0.12.0/go.mod h1:KNMKxHVteLL3R4lfg0ICV5NaAFY6v/+q7/nYT7B/qug=
+chainguard.dev/apko v0.13.4-0.20240116200834-c10dc551b827 h1:O5FUsm7JVXKlWGS2UrgP7A8HlEKoH0fLtuiV6rQ7KEs=
+chainguard.dev/apko v0.13.4-0.20240116200834-c10dc551b827/go.mod h1:6WRsohsp9hXU2J7LTxOmplw28L6fYEcdjZLNR6BiYKU=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -80,10 +80,12 @@ github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chainguard-dev/clog v1.2.3-0.20240116182827-04bee692f7a8 h1:E2y3L/nM7vRzwyROQgmuB+Egm/d1rHOyip0Bq4AyVow=
+github.com/chainguard-dev/clog v1.2.3-0.20240116182827-04bee692f7a8/go.mod h1:cV516KZWqYc/phZsCNwF36u/KMGS+Gj5Uqeb8Hlp95Y=
 github.com/chainguard-dev/git-urls v1.0.2 h1:pSpT7ifrpc5X55n4aTTm7FFUE+ZQHKiqpiwNkJrVcKQ=
 github.com/chainguard-dev/git-urls v1.0.2/go.mod h1:rbGgj10OS7UgZlbzdUQIQpT0k/D4+An04HJY7Ol+Y/o=
-github.com/chainguard-dev/go-apk v0.0.0-20240115184838-1c022784a5ed h1:OF2IKH/yeQXuuQKTH/66Z1AWXKQWgwxvllyDEIP1JQY=
-github.com/chainguard-dev/go-apk v0.0.0-20240115184838-1c022784a5ed/go.mod h1:tEfIMQlP1kb7KcmzvQWZsaj3MI9ZsqTz3fSvqs4iPaQ=
+github.com/chainguard-dev/go-apk v0.0.0-20240116193855-4c76fbe27ad7 h1:lzVhpylUJwoA7eQN6X18ZZXPHovjVDDBXwQkg5qFM9k=
+github.com/chainguard-dev/go-apk v0.0.0-20240116193855-4c76fbe27ad7/go.mod h1:OdsmvVJb8RNVcTVQ7x07L319LLeiRaRnnsmj8qBBgb4=
 github.com/chainguard-dev/go-pkgconfig v0.0.0-20230818193557-bee0072057ce h1:v3SY2sW8rUIxG9wXMxXlMN7sd9VNUSdZ+FnVqOrm2nI=
 github.com/chainguard-dev/go-pkgconfig v0.0.0-20230818193557-bee0072057ce/go.mod h1:obzGv2cx3tkRgkLQADSPaRl3OEsYmyfSv7t2Wu60tZw=
 github.com/chainguard-dev/kontext v0.1.0 h1:GFnDRZiqa+anUi7tzZMECXr0nwt4Eo/zMzTQPLRXUIs=
@@ -360,15 +362,10 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56
 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
 github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=