Skip to content

Commit 4e9c849

Browse files
authored
Removed internal/kpt/options/ and internal/kpt/types from porch and using kpt library (#396)
Signed-off-by: aravind.est <aravindhan.a@est.tech>
1 parent f72334d commit 4e9c849

29 files changed

Lines changed: 52 additions & 162 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2121
github.com/google/uuid v1.6.0
2222
github.com/jackc/pgx/v5 v5.7.6
23-
github.com/kptdev/kpt v1.0.0-beta.59
23+
github.com/kptdev/kpt v1.0.0-beta.59.1
2424
github.com/otiai10/copy v1.14.1
2525
github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f
2626
github.com/pkg/errors v0.9.1

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzh
258258
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
259259
github.com/kptdev/kpt v1.0.0-beta.59 h1:os8L0EGtgiExjmt2X3oOLVt5AHmHDTqvHOljVJney+A=
260260
github.com/kptdev/kpt v1.0.0-beta.59/go.mod h1:Cd50sUJEwm0/EiClfOse7ZDfOun9g0qWUFai7AWsMrk=
261+
github.com/kptdev/kpt v1.0.0-beta.59.1 h1:Kal5ifHexTZQiYGeDPlP3iksTDoDrHdpqOYu0+BI1Qo=
262+
github.com/kptdev/kpt v1.0.0-beta.59.1/go.mod h1:jyXC9tCyw1ret0guI03X9Iyqjwyc94aG1642jz0kmq4=
261263
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
262264
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
263265
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=

internal/kpt/errors/errors.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021,2025 The kpt and Nephio Authors
1+
// Copyright 2021,2025-2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import (
2222
goerrors "errors"
2323

2424
kyaml_errors "github.com/go-errors/errors"
25-
"github.com/nephio-project/porch/internal/kpt/types"
25+
"github.com/kptdev/kpt/pkg/lib/types"
2626
)
2727

2828
// Error is the type that implements error interface used in the kpt codebase.

internal/kpt/errors/errors_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2025 The kpt and Nephio Authors
1+
// Copyright 2025-2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
1919
"strings"
2020
"testing"
2121

22-
"github.com/nephio-project/porch/internal/kpt/types"
22+
"github.com/kptdev/kpt/pkg/lib/types"
2323
)
2424

2525
func TestErrorFormatting(t *testing.T) {

internal/kpt/fnruntime/runner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 The kpt and Nephio Authors
1+
// Copyright 2021,2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@ import (
2626
"time"
2727

2828
"github.com/google/shlex"
29+
"github.com/kptdev/kpt/pkg/lib/types"
2930
"github.com/nephio-project/porch/internal/kpt/builtins"
3031
"github.com/nephio-project/porch/internal/kpt/errors"
3132
"github.com/nephio-project/porch/internal/kpt/pkg"
32-
"github.com/nephio-project/porch/internal/kpt/types"
3333
fnresult "github.com/nephio-project/porch/pkg/kpt/api/fnresult/v1"
3434
kptfilev1 "github.com/nephio-project/porch/pkg/kpt/api/kptfile/v1"
3535
"github.com/nephio-project/porch/pkg/kpt/fn"

internal/kpt/fnruntime/runner_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 The kpt and Nephio Authors
1+
// Copyright 2019,2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525
"testing"
2626

27-
"github.com/nephio-project/porch/internal/kpt/types"
27+
"github.com/kptdev/kpt/pkg/lib/types"
2828
kptfilev1 "github.com/nephio-project/porch/pkg/kpt/api/kptfile/v1"
2929
"github.com/nephio-project/porch/pkg/kpt/printer"
3030
"github.com/stretchr/testify/assert"

internal/kpt/fnruntime/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 The kpt and Nephio Authors
1+
// Copyright 2021,2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"path/filepath"
2121

22-
"github.com/nephio-project/porch/internal/kpt/types"
22+
"github.com/kptdev/kpt/pkg/lib/types"
2323
fnresult "github.com/nephio-project/porch/pkg/kpt/api/fnresult/v1"
2424
kptfilev1 "github.com/nephio-project/porch/pkg/kpt/api/kptfile/v1"
2525
"sigs.k8s.io/kustomize/kyaml/filesys"

internal/kpt/hook/executor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 The kpt and Nephio Authors
1+
// Copyright 2022,2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ import (
1919
"fmt"
2020
"io"
2121

22+
"github.com/kptdev/kpt/pkg/lib/types"
2223
"github.com/nephio-project/porch/internal/kpt/fnruntime"
2324
"github.com/nephio-project/porch/internal/kpt/pkg"
24-
"github.com/nephio-project/porch/internal/kpt/types"
2525
fnresult "github.com/nephio-project/porch/pkg/kpt/api/fnresult/v1"
2626
kptfilev1 "github.com/nephio-project/porch/pkg/kpt/api/kptfile/v1"
2727
"github.com/nephio-project/porch/pkg/kpt/fn"

internal/kpt/options/get.go

Lines changed: 0 additions & 49 deletions
This file was deleted.

internal/kpt/pkg/pkg.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2020 The kpt and Nephio Authors
1+
// Copyright 2020,2026 The kpt and Nephio Authors
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import (
2424
"sort"
2525

2626
rgfilev1alpha1 "github.com/kptdev/kpt/pkg/api/resourcegroup/v1alpha1"
27+
"github.com/kptdev/kpt/pkg/lib/types"
2728
"github.com/nephio-project/porch/internal/kpt/errors"
28-
"github.com/nephio-project/porch/internal/kpt/types"
2929
"github.com/nephio-project/porch/internal/kpt/util/git"
3030
"github.com/nephio-project/porch/internal/kpt/util/pathutil"
3131
kptfilev1 "github.com/nephio-project/porch/pkg/kpt/api/kptfile/v1"

0 commit comments

Comments
 (0)