Merge branch 'master' into update-azure-sdk-libraries

.github/dependabot.yml

@@ -41,3 +41,11 @@ updates:
     open-pull-requests-limit: 3
     schedule:
       interval: daily
+    groups:
+      github-actions:
+        patterns:
+        - "^actions/*"
+        - "^github/codeql-action"
+      docker:
+        patterns:
+        - "docker/*"

build/package.sh

@@ -66,5 +66,5 @@ sed                                \
     -e "s|ARG_ARCH|${ARCH}|g"      \
     -e "s|ARG_SOURCE_BIN|${SOURCE_BIN}|g" \
     Dockerfile.in > .dockerfile-${ARCH}
-docker build --pull ${baseimagearg:-} --build-arg kanister_version=${VERSION} -t ${IMAGE}:${VERSION} -f .dockerfile-${ARCH} .
+docker buildx build --push --pull --sbom=true ${baseimagearg:-} --build-arg kanister_version=${VERSION} -t ${IMAGE}:${VERSION} -f .dockerfile-${ARCH} .
 docker images -q ${IMAGE}:${VERSION}

docs/architecture.rst

@@ -166,7 +166,7 @@ as follows:
 - ``Object`` is a required reference to the Kubernetes object on which
   the action will be performed.
 - ``Blueprint`` is a required name of the Blueprint that contains the
-   action to run.
+  action to run.
 - ``Artifacts`` are input Artifacts passed to the Blueprint. This must
   contain an Artifact for each name listed in the BlueprintAction's
   InputArtifacts.

go.mod

@@ -44,7 +44,7 @@ require (
 	github.com/prometheus/client_model v0.4.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
-	github.com/vmware/govmomi v0.30.7
+	github.com/vmware/govmomi v0.31.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/oauth2 v0.12.0
 	gonum.org/v1/gonum v0.14.0
@@ -156,7 +156,7 @@ require (
 	github.com/rs/xid v1.4.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/zeebo/blake3 v0.2.3 // indirect
 	go.mongodb.org/mongo-driver v1.11.3 // indirect
 	go.opencensus.io v0.24.0 // indirect

go.sum

@@ -461,18 +461,18 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/tg123/go-htpasswd v1.2.1 h1:i4wfsX1KvvkyoMiHZzjS0VzbAPWfxzI8INcZAKtutoU=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/vmware/govmomi v0.30.7 h1:YO8CcDpLJzmq6PK5/CBQbXyV21iCMh8SbdXt+xNkXp8=
-github.com/vmware/govmomi v0.30.7/go.mod h1:epgoslm97rLECMV4D+08ORzUBEU7boFSepKjt7AYVGg=
+github.com/vmware/govmomi v0.31.0 h1:+NC7le8yeXj7f4YUC841jgdWsehN7A3ivqLxm79eKyo=
+github.com/vmware/govmomi v0.31.0/go.mod h1:JA63Pg0SgQcSjk+LuPzjh3rJdcWBo/ZNCIwbb1qf2/0=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
-github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
-github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
+github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
+github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

pkg/kando/chronicle_pull.go

@@ -17,11 +17,14 @@ package kando
 import (
 	"context"
 	"encoding/json"
+	"io"
+	"os"
 
-	"github.com/kanisterio/kanister/pkg/chronicle"
-	"github.com/kanisterio/kanister/pkg/param"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+
+	"github.com/kanisterio/kanister/pkg/chronicle"
+	"github.com/kanisterio/kanister/pkg/param"
 )
 
 func newChroniclePullCommand() *cobra.Command {
@@ -64,3 +67,12 @@ func runChroniclePull(cmd *cobra.Command, p locationParams, arg string) error {
 	ctx := context.Background()
 	return chronicle.Pull(ctx, target, *prof, p.suffix)
 }
+
+const usePipeParam = `-`
+
+func targetWriter(target string) (io.Writer, error) {
+	if target != usePipeParam {
+		return os.OpenFile(target, os.O_RDWR|os.O_CREATE, 0755)
+	}
+	return os.Stdout, nil
+}

pkg/kando/location_delete.go

@@ -15,12 +15,7 @@
 package kando
 
 import (
-	"context"
-
 	"github.com/spf13/cobra"
-
-	"github.com/kanisterio/kanister/pkg/location"
-	"github.com/kanisterio/kanister/pkg/param"
 )
 
 func newLocationDeleteCommand() *cobra.Command {
@@ -42,7 +37,3 @@ func newLocationDeleteCommand() *cobra.Command {
 	cmd.Flags().StringP(kopiaSnapshotFlagName, "k", "", "Pass the kopia snapshot information from the location push command (optional)")
 	return cmd
 }
-
-func locationDelete(ctx context.Context, p *param.Profile, path string) error {
-	return location.Delete(ctx, *p, path)
-}

pkg/kando/location_pull.go

@@ -15,14 +15,7 @@
 package kando
 
 import (
-	"context"
-	"io"
-	"os"
-
 	"github.com/spf13/cobra"
-
-	"github.com/kanisterio/kanister/pkg/location"
-	"github.com/kanisterio/kanister/pkg/param"
 )
 
 const (
@@ -49,14 +42,3 @@ func newLocationPullCommand() *cobra.Command {
 	cmd.Flags().StringP(kopiaSnapshotFlagName, "k", "", "Pass the kopia snapshot information from the location push command (optional)")
 	return cmd
 }
-
-func targetWriter(target string) (io.Writer, error) {
-	if target != usePipeParam {
-		return os.OpenFile(target, os.O_RDWR|os.O_CREATE, 0755)
-	}
-	return os.Stdout, nil
-}
-
-func locationPull(ctx context.Context, p *param.Profile, path string, target io.Writer) error {
-	return location.Read(ctx, target, *p, path)
-}

pkg/kando/location_push.go

@@ -15,13 +15,7 @@
 package kando
 
 import (
-	"context"
-	"io"
-
 	"github.com/spf13/cobra"
-
-	"github.com/kanisterio/kanister/pkg/location"
-	"github.com/kanisterio/kanister/pkg/param"
 )
 
 const (
@@ -50,9 +44,3 @@ func newLocationPushCommand() *cobra.Command {
 
 	return cmd
 }
-
-const usePipeParam = `-`
-
-func locationPush(ctx context.Context, p *param.Profile, path string, source io.Reader) error {
-	return location.Write(ctx, source, *p, path)
-}