Skip to content

Commit

Permalink
Revert "cleanup: remove pulumi deplendency, use third_party instead (#68
Browse files Browse the repository at this point in the history
)" (#190)

This reverts commit f36425f.
  • Loading branch information
howieyuen committed Dec 8, 2022
1 parent 16946d2 commit ebdacc8
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 437 deletions.
4 changes: 4 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ require (
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-sql-driver/mysql v1.6.0
github.com/goccy/go-yaml v1.8.9
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/gonvenience/bunt v1.1.1
github.com/gonvenience/neat v1.3.0
github.com/gonvenience/term v1.0.0
Expand All @@ -36,11 +37,14 @@ require (
github.com/imdario/mergo v0.3.13
github.com/jinzhu/copier v0.3.2
github.com/lucasb-eyer/go-colorful v1.0.3
github.com/mattn/go-colorable v0.1.11 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/hashstructure v1.0.0
github.com/onsi/ginkgo/v2 v2.0.0
github.com/onsi/gomega v1.18.1
github.com/pkg/errors v0.9.1
github.com/pterm/pterm v0.12.42-0.20220427210824-6bb8c6e6cc77
github.com/pulumi/pulumi/sdk/v3 v3.24.0
github.com/sergi/go-diff v1.2.0
github.com/spf13/afero v1.2.2
github.com/spf13/cobra v1.1.1
Expand Down
59 changes: 56 additions & 3 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/projectstack/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"os"
"path/filepath"

"github.com/pulumi/pulumi/sdk/v3/go/common/util/fsutil"
"k8s.io/apimachinery/pkg/util/sets"

"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/util/yaml"
"kusionstack.io/kusion/third_party/pulumi/fsutil"
)

// IsProject determine whether the given path is Project directory
Expand Down
2 changes: 1 addition & 1 deletion pkg/projectstack/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"os"
"path/filepath"

"github.com/pulumi/pulumi/sdk/v3/go/common/util/fsutil"
"k8s.io/apimachinery/pkg/util/sets"

"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/util/yaml"
"kusionstack.io/kusion/third_party/pulumi/fsutil"
)

// IsStack determine whether the given path is Stack directory
Expand Down
4 changes: 2 additions & 2 deletions pkg/scaffold/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"text/template"

"github.com/pkg/errors"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/gitutil"
"github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
"github.com/spf13/afero"
"github.com/texttheater/golang-levenshtein/levenshtein"
"gopkg.in/src-d/go-git.v4"
Expand All @@ -20,8 +22,6 @@ import (
"kusionstack.io/kusion/pkg/log"
"kusionstack.io/kusion/pkg/projectstack"
"kusionstack.io/kusion/pkg/util/kfile"
"kusionstack.io/kusion/third_party/pulumi/gitutil"
"kusionstack.io/kusion/third_party/pulumi/workspace"
)

// These are variables instead of constants in order that they can be set using the `-X`
Expand Down
3 changes: 1 addition & 2 deletions pkg/scaffold/templates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ import (

"bou.ke/monkey"
"github.com/jinzhu/copier"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/gitutil"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"gopkg.in/src-d/go-git.v4/plumbing"

"kusionstack.io/kusion/third_party/pulumi/gitutil"
)

const (
Expand Down
76 changes: 0 additions & 76 deletions third_party/pulumi/fsutil/walkup.go

This file was deleted.

Loading

0 comments on commit ebdacc8

Please sign in to comment.