Merge remote-tracking branch 'upstream/main' into feat/issue-4450-pr3-api-types

Author: NETIZEN-11

CONTRIBUTING.md

@@ -57,6 +57,14 @@ All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult [GitHub Help] for more
 information on using pull requests.
 
+Process for code reviews. Before requesting human review, a PR must:
+
+* All tests passing
+* All linting passing
+* Meeting project code quality requirements, including passing all configured static analysis / SonarCloud quality gates and not reducing automated test coverage for the affected components
+* The comments from the first run of automatically generated comments (AI generated comments, SonarCloud comments, bot generated comments, etc.) of the PR are addressed (addressing further re-runs of AI are optional)
+* If it is not possible to resolve an automatic comment, please add a sub-comment indicating why the automated comment cannot be resolved or ask for help in resolving the comment
+
 ## Community Guidelines
 
 This project follows a [Code of Conduct].
@@ -126,7 +134,7 @@ It's usually a good idea to test locally for the following:
 
 #### Update docs
 
-Docs are under [documentation/]. Refer to (the README,md)[documentation/README.md] in the folder to details about
+Docs are under [documentation/](documentation/). Refer to the [README.md](documentation/README.md) in the folder for details about
 documentation contributions. 
 
 

commands/fn/doc/cmdfndoc.go

@@ -58,15 +58,12 @@ type Runner struct {
 	Ctx     context.Context
 }
 
-func (r *Runner) runE(c *cobra.Command, _ []string) error {
+func (r *Runner) runE(_ *cobra.Command, _ []string) error {
 	if r.Image == "" {
 		return errors.New("image must be specified")
 	}
-	resolveFunc := (&runneroptions.RunnerOptions{}).ResolveToImageForCLIFunc(runneroptions.GHCRImagePrefix)
-	image, err := resolveFunc(c.Context(), r.Image)
-	if err != nil {
-		return err
-	}
+	resolveFunc := runneroptions.ResolveToImageForCLIFunc(runneroptions.GHCRImagePrefix)
+	image := resolveFunc(r.Image)
 	var out, errout bytes.Buffer
 	dockerRunArgs := []string{
 		"run",

commands/pkg/diff/cmddiff_test.go

@@ -61,7 +61,7 @@ func TestCmdExecute(t *testing.T) {
 	dest := filepath.Join(w.WorkspaceDirectory, g.RepoName)
 
 	getRunner := get.NewRunner(fake.CtxWithDefaultPrinter(), "")
-	getRunner.Command.SetArgs([]string{"file://" + g.RepoDirectory + ".git/", "./"})
+	getRunner.Command.SetArgs([]string{"file://" + g.RepoDirectory + ".git/"})
 	err := getRunner.Command.Execute()
 	assert.NoError(t, err)
 

commands/pkg/get/cmdget.go

@@ -17,6 +17,7 @@ package get
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"strings"
 
 	docs "github.com/kptdev/kpt/internal/docs/generated/pkgdocs"
@@ -76,9 +77,11 @@ type Runner struct {
 
 func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
 	const op errors.Op = "cmdget.preRunE"
+	// Track if destination was explicitly provided
+	explicitDest := len(args) > 1
 	if len(args) == 1 {
 		args = append(args, pkg.CurDir)
-	} else {
+	} else if filepath.Clean(args[1]) != "." {
 		_, err := os.Lstat(args[1])
 		if err == nil || os.IsExist(err) {
 			resolvedPath, err := argutil.ResolveSymlink(r.ctx, args[1])
@@ -88,7 +91,7 @@ func (r *Runner) preRunE(_ *cobra.Command, args []string) error {
 			args[1] = resolvedPath
 		}
 	}
-	t, err := parse.GitParseArgs(r.ctx, args)
+	t, err := parse.GitParseArgs(r.ctx, args, explicitDest)
 	if err != nil {
 		return errors.E(op, err)
 	}

commands/pkg/get/cmdget_test.go

@@ -111,7 +111,7 @@ func TestCmdMainBranch_execute(t *testing.T) {
 	}
 
 	r := get.NewRunner(fake.CtxWithDefaultPrinter(), "kpt")
-	r.Command.SetArgs([]string{"file://" + g.RepoDirectory + ".git/", "./"})
+	r.Command.SetArgs([]string{"file://" + g.RepoDirectory + ".git/"})
 	err = r.Command.Execute()
 
 	assert.NoError(t, err)
@@ -159,9 +159,9 @@ func TestCmd_fail(t *testing.T) {
 	r := get.NewRunner(fake.CtxWithDefaultPrinter(), "kpt")
 	r.Command.SilenceErrors = true
 	r.Command.SilenceUsage = true
-	r.Command.SetArgs([]string{"file://" + filepath.Join("not", "real", "dir") + ".git/@master", "./"})
+	r.Command.SetArgs([]string{"file://" + filepath.Join("not", "real", "dir") + ".git/@master", "nonexistent"})
 
-	defer os.RemoveAll("dir")
+	defer os.RemoveAll("nonexistent")
 
 	err := r.Command.Execute()
 	if !assert.Error(t, err) {
@@ -234,7 +234,7 @@ func TestCmd_Execute_flagAndArgParsing(t *testing.T) {
 				assert.NoError(t, err)
 				assert.Equal(t, "master", r.Get.Git.Ref)
 				assert.Equal(t, "something://foo", r.Get.Git.Repo)
-				assert.Equal(t, filepath.Join(pathPrefix, w.WorkspaceDirectory, "foo"), r.Get.Destination)
+				assert.Equal(t, filepath.Join(pathPrefix, w.WorkspaceDirectory), r.Get.Destination)
 			},
 		},
 		"repo arg is split up correctly into ref, directory and repo": {
@@ -247,10 +247,10 @@ func TestCmd_Execute_flagAndArgParsing(t *testing.T) {
 				assert.Equal(t, fmt.Sprintf("file://%s", repo), r.Get.Git.Repo)
 				assert.Equal(t, "master", r.Get.Git.Ref)
 				assert.Equal(t, "/blueprints/java", r.Get.Git.Directory)
-				assert.Equal(t, filepath.Join(pathPrefix, w.WorkspaceDirectory, "java"), r.Get.Destination)
+				assert.Equal(t, filepath.Join(pathPrefix, w.WorkspaceDirectory), r.Get.Destination)
 			},
 		},
-		"current working dir -- should use package name": {
+		"current working dir -- should use current directory directly": {
 			argsFunc: func(repo, _ string) []string {
 				return []string{fmt.Sprintf("file://%s.git/blueprints/java", repo), "foo/../bar/../"}
 			},
@@ -260,7 +260,7 @@ func TestCmd_Execute_flagAndArgParsing(t *testing.T) {
 				assert.Equal(t, fmt.Sprintf("file://%s", repo), r.Get.Git.Repo)
 				assert.Equal(t, "master", r.Get.Git.Ref)
 				assert.Equal(t, "/blueprints/java", r.Get.Git.Directory)
-				assert.Equal(t, filepath.Join(pathPrefix, w.WorkspaceDirectory, "java"), r.Get.Destination)
+				assert.Equal(t, filepath.Join(pathPrefix, w.WorkspaceDirectory), r.Get.Destination)
 			},
 		},
 		"clean relative path": {

e2e/testdata/fn-render/all-resource-deletion/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 3c93e9e..fe0bc96 100644
+index 3c93e9e..5404a5a 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1
@@ -12,7 +12,7 @@ index 3c93e9e..fe0bc96 100644
  pipeline:
    mutators:
      - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest
-@@ -12,3 +15,8 @@ pipeline:
+@@ -12,3 +15,16 @@ pipeline:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
        configMap:
          tier: backend
@@ -21,6 +21,14 @@ index 3c93e9e..fe0bc96 100644
 +    - type: Rendered
 +      status: "True"
 +      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/starlark:latest
++        exitCode: 0
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
++        exitCode: 0
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
++        exitCode: 0
 diff --git a/delete-all.yaml b/delete-all.yaml
 index 3c86d8b..6754b0a 100644
 --- a/delete-all.yaml

e2e/testdata/fn-render/basicpipeline-semver/.expected/diff.patch

@@ -1,8 +1,8 @@
 diff --git a/Kptfile b/Kptfile
-index 2336da4..eae3be3 100644
+index 2336da4..ca2bcea 100644
 --- a/Kptfile
 +++ b/Kptfile
-@@ -2,13 +2,20 @@ apiVersion: kpt.dev/v1
+@@ -2,13 +2,34 @@ apiVersion: kpt.dev/v1
  kind: Kptfile
  metadata:
    name: app
@@ -25,6 +25,20 @@ index 2336da4..eae3be3 100644
 +    - type: Rendered
 +      status: "True"
 +      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.4.3
++        exitCode: 0
++        results:
++          - message: namespace [default] updated to "staging", 1 value(s) changed
++            severity: info
++          - message: all `depends-on` annotations are up-to-date. no `namespace` changed
++            severity: info
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.2.4
++        exitCode: 0
++        results:
++          - message: set 4 labels in total
++            severity: info
 diff --git a/resources.yaml b/resources.yaml
 index 1f15150..936d957 100644
 --- a/resources.yaml

e2e/testdata/fn-render/basicpipeline-symlink/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 1307fb5..f645d75 100644
+index 1307fb5..fee64dc 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1
@@ -12,7 +12,7 @@ index 1307fb5..f645d75 100644
  pipeline:
    mutators:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
-@@ -10,3 +13,8 @@ pipeline:
+@@ -10,3 +13,14 @@ pipeline:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
        configMap:
          tier: backend
@@ -21,6 +21,12 @@ index 1307fb5..f645d75 100644
 +    - type: Rendered
 +      status: "True"
 +      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
++        exitCode: 0
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
++        exitCode: 0
 diff --git a/resources.yaml b/resources.yaml
 index f2eec52..84cfb26 100644
 --- a/resources.yaml

e2e/testdata/fn-render/basicpipeline-wasm/.expected/diff.patch

@@ -1,8 +1,8 @@
 diff --git a/Kptfile b/Kptfile
-index 17a7822..94b6f80 100644
+index 17a7822..98fa855 100644
 --- a/Kptfile
 +++ b/Kptfile
-@@ -12,3 +12,8 @@ pipeline:
+@@ -12,3 +12,22 @@ pipeline:
      - image: ghcr.io/kptdev/krm-functions-catalog/wasm/set-labels:v0.2.4
        configMap:
          tier: backend
@@ -11,6 +11,20 @@ index 17a7822..94b6f80 100644
 +    - type: Rendered
 +      status: "True"
 +      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/wasm/set-namespace:v0.5.1
++        exitCode: 0
++        results:
++          - message: namespace [default] updated to "staging", 1 value(s) changed
++            severity: info
++          - message: all `depends-on` annotations are up-to-date. no `namespace` changed
++            severity: info
++      - image: ghcr.io/kptdev/krm-functions-catalog/wasm/set-labels:v0.2.4
++        exitCode: 0
++        results:
++          - message: set 4 labels in total
++            severity: info
 diff --git a/resources.yaml b/resources.yaml
 index eed43d6..c1de2b0 100644
 --- a/resources.yaml

e2e/testdata/fn-render/basicpipeline/.expected/diff.patch

@@ -1,5 +1,5 @@
 diff --git a/Kptfile b/Kptfile
-index 1307fb5..f645d75 100644
+index 1307fb5..fee64dc 100644
 --- a/Kptfile
 +++ b/Kptfile
 @@ -2,6 +2,9 @@ apiVersion: kpt.dev/v1
@@ -12,7 +12,7 @@ index 1307fb5..f645d75 100644
  pipeline:
    mutators:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
-@@ -10,3 +13,8 @@ pipeline:
+@@ -10,3 +13,14 @@ pipeline:
      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
        configMap:
          tier: backend
@@ -21,6 +21,12 @@ index 1307fb5..f645d75 100644
 +    - type: Rendered
 +      status: "True"
 +      reason: RenderSuccess
++  renderStatus:
++    mutationSteps:
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-namespace:v0.2.0
++        exitCode: 0
++      - image: ghcr.io/kptdev/krm-functions-catalog/set-labels:v0.1.5
++        exitCode: 0
 diff --git a/resources.yaml b/resources.yaml
 index f2eec52..84cfb26 100644
 --- a/resources.yaml