kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-30 01:46:23 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix some Go nits.

Browse Source
This commit is contained in:
jregan
2018-09-28 18:02:07 -07:00
parent 8f903b6e3f
commit 6d935b6a4a
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/patch/jsonpatch.go → pkg/patch/json6902.go
View File

@@ -18,9 +18,9 @@ package patch
import "sigs.k8s.io/kustomize/pkg/gvk"
// PatchJson6902 represents a json patch for an object
// Json6902 represents a json patch for an object
// with format documented https://tools.ietf.org/html/rfc6902.
type PatchJson6902 struct {
type Json6902 struct {
// Target refers to a Kubernetes object that the json patch will be
// applied to. It must refer to a Kubernetes resource under the
// purview of this kustomization. Target should use the

14
pkg/patch/strategicmergepatch.go → pkg/patch/strategicmerge.go
View File

@@ -16,23 +16,23 @@ limitations under the License.
package patch
// PatchStrategicMerge represents a relative path to a
// stategic merget patch with the format
// StrategicMerge represents a relative path to a
// stategic merge patch with the format
// https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md
type PatchStrategicMerge string
type StrategicMerge string
// Append appends a slice of patch paths to a PatchStategicMerge slice
func Append(patches []PatchStrategicMerge, paths ...string) []PatchStrategicMerge {
func Append(patches []StrategicMerge, paths ...string) []StrategicMerge {
for _, p := range paths {
patches = append(patches, PatchStrategicMerge(p))
patches = append(patches, StrategicMerge(p))
}
return patches
}
// Exist determines if a patch path exists in a slice of PatchStategicMerge
func Exist(patches []PatchStrategicMerge, path string) bool {
func Exist(patches []StrategicMerge, path string) bool {
for _, p := range patches {
if p == PatchStrategicMerge(path) {
if p == StrategicMerge(path) {
return true
}
}

6
pkg/patch/transformer/factory.go
View File

@@ -28,7 +28,7 @@ import (
"sigs.k8s.io/kustomize/pkg/transformers"
)
// PatchJson6902Factory makes PatchJson6902 transformers
// PatchJson6902Factory makes Json6902 transformers
type PatchJson6902Factory struct {
loader loader.Loader
}
@@ -39,7 +39,7 @@ func NewPatchJson6902Factory(l loader.Loader) PatchJson6902Factory {
}
// MakePatchJson6902Transformer returns a transformer for applying Json6902 patch
func (f PatchJson6902Factory) MakePatchJson6902Transformer(patches []patch.PatchJson6902) (transformers.Transformer, error) {
func (f PatchJson6902Factory) MakePatchJson6902Transformer(patches []patch.Json6902) (transformers.Transformer, error) {
var ts []transformers.Transformer
for _, p := range patches {
t, err := f.makeOnePatchJson6902Transformer(p)
@@ -53,7 +53,7 @@ func (f PatchJson6902Factory) MakePatchJson6902Transformer(patches []patch.Patch
return transformers.NewMultiTransformerWithConflictCheck(ts), nil
}
func (f PatchJson6902Factory) makeOnePatchJson6902Transformer(p patch.PatchJson6902) (transformers.Transformer, error) {
func (f PatchJson6902Factory) makeOnePatchJson6902Transformer(p patch.Json6902) (transformers.Transformer, error) {
if p.Target == nil {
return nil, fmt.Errorf("must specify the target field in patchesJson6902")
}

12
pkg/patch/transformer/factory_test.go
View File

@@ -30,7 +30,7 @@ import (
)
func TestNewPatchJson6902FactoryNoTarget(t *testing.T) {
p := patch.PatchJson6902{}
p := patch.Json6902{}
_, err := NewPatchJson6902Factory(nil).makeOnePatchJson6902Transformer(p)
if err == nil {
t.Fatal("expected error")
@@ -46,7 +46,7 @@ target:
name: some-name
kind: Deployment
`)
p := patch.PatchJson6902{}
p := patch.Json6902{}
err := yaml.Unmarshal(jsonPatch, &p)
if err != nil {
t.Fatalf("expected error %v", err)
@@ -79,7 +79,7 @@ target:
name: some-name
path: /testpath/patch.json
`)
p := patch.PatchJson6902{}
p := patch.Json6902{}
err = yaml.Unmarshal(jsonPatch, &p)
if err != nil {
t.Fatal("expected error")
@@ -117,7 +117,7 @@ target:
kind: Deployment
path: /testpath/patch.yaml
`)
p := patch.PatchJson6902{}
p := patch.Json6902{}
err = yaml.Unmarshal(jsonPatch, &p)
if err != nil {
t.Fatalf("unexpected error : %v", err)
@@ -164,7 +164,7 @@ func TestNewPatchJson6902FactoryMulti(t *testing.T) {
name: some-name
path: /testpath/patch.yaml
`)
var p []patch.PatchJson6902
var p []patch.Json6902
err = yaml.Unmarshal(jsonPatches, &p)
if err != nil {
t.Fatalf("unexpected error : %v", err)
@@ -278,7 +278,7 @@ func TestNewPatchJson6902FactoryMultiConflict(t *testing.T) {
name: some-name
path: /testpath/patch.yaml
`)
var p []patch.PatchJson6902
var p []patch.Json6902
err = yaml.Unmarshal(jsonPatches, &p)
if err != nil {
t.Fatalf("unexpected error : %v", err)