Skip to content

Commit

Permalink
Refactoring to use DKFM common
Browse files Browse the repository at this point in the history
  • Loading branch information
djschleen committed May 22, 2022
1 parent 303d0a3 commit c55f99a
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 285 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

.DS_Store

gardener
gardener
2 changes: 1 addition & 1 deletion cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"log"

"github.com/devops-kung-fu/common/util"
"github.com/gookit/color"
"github.com/spf13/cobra"

"github.com/devops-kung-fu/gardener/src"
"github.com/devops-kung-fu/gardener/util"
)

var (
Expand Down
3 changes: 1 addition & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import (
"log"
"os"

"github.com/devops-kung-fu/common/util"
"github.com/gookit/color"
"github.com/spf13/afero"
"github.com/spf13/cobra"

"github.com/devops-kung-fu/gardener/util"
)

var (
Expand Down
32 changes: 30 additions & 2 deletions gardener-sbom.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.4",
"serialNumber": "urn:uuid:da31ef82-1a48-441d-9e48-c7c054b35337",
"serialNumber": "urn:uuid:f5a8ce9e-f056-4a67-bdb8-d1bf6af64045",
"version": 1,
"metadata": {
"timestamp": "2022-05-22T13:37:24-06:00",
"timestamp": "2022-05-22T14:01:11-06:00",
"tools": [
{
"vendor": "CycloneDX",
Expand Down Expand Up @@ -77,6 +77,26 @@
}
},
"components": [
{
"bom-ref": "pkg:golang/github.com/devops-kung-fu/common@v0.2.0?type=module",
"type": "library",
"name": "github.com/devops-kung-fu/common",
"version": "v0.2.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
"content": "6bd1a4d5c6a8c3102b41d360c3180bc68729f0f46f4e1bbe1f34fafe66da6eae"
}
],
"purl": "pkg:golang/github.com/devops-kung-fu/common@v0.2.0?type=module",
"externalReferences": [
{
"url": "https://github.com/devops-kung-fu/common",
"type": "vcs"
}
]
},
{
"bom-ref": "pkg:golang/github.com/gookit/color@v1.5.0?type=module",
"type": "library",
Expand Down Expand Up @@ -196,11 +216,19 @@
{
"ref": "pkg:golang/github.com/devops-kung-fu/gardener@v1.0.1-0.20220419031709-11385b9e115f?type=module",
"dependsOn": [
"pkg:golang/github.com/devops-kung-fu/common@v0.2.0?type=module",
"pkg:golang/github.com/gookit/color@v1.5.0?type=module",
"pkg:golang/github.com/spf13/afero@v1.8.2?type=module",
"pkg:golang/github.com/spf13/cobra@v1.4.0?type=module"
]
},
{
"ref": "pkg:golang/github.com/devops-kung-fu/common@v0.2.0?type=module",
"dependsOn": [
"pkg:golang/github.com/gookit/color@v1.5.0?type=module",
"pkg:golang/github.com/xo/terminfo@v0.0.0-20210125001918-ca9a967f8778?type=module"
]
},
{
"ref": "pkg:golang/github.com/gookit/color@v1.5.0?type=module",
"dependsOn": [
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/devops-kung-fu/gardener
go 1.18

require (
github.com/devops-kung-fu/common v0.2.0
github.com/gookit/color v1.5.0
github.com/spf13/cobra v1.4.0
github.com/stretchr/testify v1.7.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devops-kung-fu/common v0.2.0 h1:a9Gk1caowxArQdNgwxgLxocp8PRvThu+HzT6/mbabq4=
github.com/devops-kung-fu/common v0.2.0/go.mod h1:1eupDyY9wxRUGpb/d5kdEHO2fVLGnoIPDP7pIBhyX/g=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand Down Expand Up @@ -285,8 +287,6 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
Expand Down
30 changes: 0 additions & 30 deletions util/error.go

This file was deleted.

49 changes: 0 additions & 49 deletions util/error_test.go

This file was deleted.

41 changes: 0 additions & 41 deletions util/output.go

This file was deleted.

16 changes: 0 additions & 16 deletions util/output_test.go

This file was deleted.

41 changes: 0 additions & 41 deletions util/print.go

This file was deleted.

55 changes: 0 additions & 55 deletions util/print_test.go

This file was deleted.

8 changes: 0 additions & 8 deletions util/util.go

This file was deleted.

Loading

0 comments on commit c55f99a

Please sign in to comment.