From 0fdf0f825fc26a7024807e21cdc1eb73af01d5d9 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Wed, 12 May 2021 14:48:03 -0700 Subject: [PATCH 1/3] TemplateProcessor can add custom resource schemas to openapi --- kyaml/fn/framework/example_test.go | 3 +- kyaml/fn/framework/framework.go | 2 +- kyaml/fn/framework/processors.go | 123 +++++++++++++++--- kyaml/fn/framework/processors_test.go | 79 ++++++++++- .../patches/{ => basic}/patch.template.yaml | 0 .../custom-resource/patch.template.yaml | 10 ++ .../template-processor/schemas/foo.json | 58 +++++++++ .../{ => basic}/deploy.template.yaml | 0 .../templates/custom-resource/foo.yaml | 14 ++ 9 files changed, 270 insertions(+), 19 deletions(-) rename kyaml/fn/framework/testdata/template-processor/patches/{ => basic}/patch.template.yaml (100%) create mode 100644 kyaml/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml create mode 100644 kyaml/fn/framework/testdata/template-processor/schemas/foo.json rename kyaml/fn/framework/testdata/template-processor/templates/{ => basic}/deploy.template.yaml (100%) create mode 100644 kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml diff --git a/kyaml/fn/framework/example_test.go b/kyaml/fn/framework/example_test.go index 1fa536a69..aa284cc46 100644 --- a/kyaml/fn/framework/example_test.go +++ b/kyaml/fn/framework/example_test.go @@ -9,6 +9,7 @@ import ( "log" "path/filepath" + "github.com/markbates/pkger" "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework/command" @@ -221,7 +222,7 @@ func ExampleTemplateProcessor_generate_files() { // Templates ResourceTemplates: []framework.ResourceTemplate{{ Templates: framework.TemplatesFromFile( - filepath.Join("testdata", "example", "templatefiles", "deployment.template"), + pkger.Include("/fn/framework/testdata/example/templatefiles/deployment.template"), ), }}, } diff --git a/kyaml/fn/framework/framework.go b/kyaml/fn/framework/framework.go index 5902926c4..12c30a2c2 100644 --- a/kyaml/fn/framework/framework.go +++ b/kyaml/fn/framework/framework.go @@ -111,7 +111,7 @@ func Execute(p ResourceListProcessor, rlSource *kio.ByteReadWriter) error { rl := ResourceList{} var err error if rl.Items, err = rlSource.Read(); err != nil { - return errors.Wrap(err) + return errors.WrapPrefixf(err, "failed to read ResourceList input") } rl.FunctionConfig = rlSource.FunctionConfig diff --git a/kyaml/fn/framework/processors.go b/kyaml/fn/framework/processors.go index 14e787581..7f684519a 100644 --- a/kyaml/fn/framework/processors.go +++ b/kyaml/fn/framework/processors.go @@ -13,10 +13,11 @@ import ( "text/template" "github.com/markbates/pkger" - + "k8s.io/kube-openapi/pkg/validation/spec" "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/kio/filters" + "sigs.k8s.io/kustomize/kyaml/openapi" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -204,12 +205,30 @@ type TemplateProcessor struct { // PostProcessFilters provides a hook to manipulate the ResourceList's items after template // filters are applied. PostProcessFilters []kio.Filter + + // AdditionalSchemas is a function that returns a list of schema definitions to add to openapi. + // This enables correct merging of custom resource fields. + AdditionalSchemas SchemaDefinitionFunc } +// SchemaDefinitionFunc is a function that provides a list of schema definitions. +// TemplateProcessor uses this to defer loading of schemas to the point where they are used. +type SchemaDefinitionFunc func() ([]*spec.Definitions, error) + // Filter implements the kio.Filter interface, enabling you to use TemplateProcessor // as part of a higher-level ResourceListProcessor like VersionedAPIProcessor. // It sets up all the features of TemplateProcessors as a pipeline of filters and executes them. func (tp TemplateProcessor) Filter(items []*yaml.RNode) ([]*yaml.RNode, error) { + if tp.AdditionalSchemas != nil { + defs, err := tp.AdditionalSchemas() + if err != nil { + return nil, errors.WrapPrefixf(err, "parsing AdditionalSchemas") + } + for i := range defs { + openapi.AddDefinitions(*defs[i]) + } + } + buf := &kio.PackageBuffer{Nodes: items} pipeline := kio.Pipeline{ Inputs: []kio.Reader{buf}, @@ -355,8 +374,7 @@ func TemplatesFromFile(files ...string) TemplatesFunc { return func() ([]*template.Template, error) { var templates []*template.Template for i := range files { - n := filepath.Base(files[i]) - t, err := template.New(n).ParseFiles(files[i]) + t, err := parseTemplate(files[i]) if err != nil { return nil, err } @@ -366,6 +384,24 @@ func TemplatesFromFile(files ...string) TemplatesFunc { } } +func parseTemplate(filename string) (*template.Template, error) { + f, err := pkger.Open(filename) + if err != nil { + return nil, err + } + defer f.Close() + bs, err := ioutil.ReadAll(f) + if err != nil { + return nil, err + } + + t, err := template.New(filepath.Base(filename)).Parse(string(bs)) + if err != nil { + return nil, err + } + return t, nil +} + // TemplatesFromDir returns a TemplatesFunc that will generate templates from the provided // directories. Only files suffixed with .template.yaml will be included. // This is a helper to facilitate providing ResourceTemplates, PatchTemplates and @@ -382,18 +418,7 @@ func TemplatesFromDir(dirs ...pkger.Dir) TemplatesFunc { if !strings.HasSuffix(info.Name(), ".template.yaml") { return nil } - name := path.Join(dir, info.Name()) - f, err := pkger.Open(name) - if err != nil { - return err - } - defer f.Close() - - b, err := ioutil.ReadAll(f) - if err != nil { - return err - } - t, err := template.New(info.Name()).Parse(string(b)) + t, err := parseTemplate(path.Join(dir, info.Name())) if err != nil { return err } @@ -408,3 +433,71 @@ func TemplatesFromDir(dirs ...pkger.Dir) TemplatesFunc { return pt, nil } } + +// SchemaDefinitionsFromFile returns a SchemaDefinitionFunc that will load schemas from the provided files. +// This is a helper to facilitate providing custom resource schemas to a TemplateProcessor. +func SchemaDefinitionsFromFile(files ...string) SchemaDefinitionFunc { + return func() ([]*spec.Definitions, error) { + var defs []*spec.Definitions + for _, filename := range files { + def, err := readSchemaJSON(filename) + if err != nil { + return nil, err + } + defs = append(defs, &def) + } + return defs, nil + } +} + +// SchemaDefinitionsFromDir returns a SchemaDefinitionFunc that will load schemas from the provided directories. +// This is a helper to facilitate providing custom resource schemas to a TemplateProcessor. +func SchemaDefinitionsFromDir(dirs ...pkger.Dir) SchemaDefinitionFunc { + return func() ([]*spec.Definitions, error) { + var defs []*spec.Definitions + for i := range dirs { + dir := string(dirs[i]) + err := pkger.Walk(dir, func(p string, info os.FileInfo, err error) error { + if err != nil { + return err + } + if !strings.HasSuffix(info.Name(), ".json") { + return nil + } + def, err := readSchemaJSON(path.Join(dir, info.Name())) + if err != nil { + return err + } + defs = append(defs, &def) + return nil + }) + if err != nil { + return nil, err + } + } + return defs, nil + } +} + +func readSchemaJSON(filename string) (spec.Definitions, error) { + f, err := pkger.Open(filename) + if err != nil { + return nil, err + } + defer f.Close() + b, err := ioutil.ReadAll(f) + if err != nil { + return nil, err + } + + var schema spec.Schema + err = schema.UnmarshalJSON(b) + if err != nil { + return nil, err + } + + if schema.Definitions != nil { + return schema.Definitions, nil + } + return nil, errors.Errorf("schema did not contain any definitions") +} diff --git a/kyaml/fn/framework/processors_test.go b/kyaml/fn/framework/processors_test.go index 458168a36..fa8adb1dd 100644 --- a/kyaml/fn/framework/processors_test.go +++ b/kyaml/fn/framework/processors_test.go @@ -11,7 +11,9 @@ import ( "github.com/markbates/pkger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/kube-openapi/pkg/validation/spec" "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/openapi" "sigs.k8s.io/kustomize/kyaml/yaml" "sigs.k8s.io/kustomize/kyaml/fn/framework" @@ -27,7 +29,7 @@ func TestTemplateProcessor_ResourceTemplates(t *testing.T) { TemplateData: &API{}, ResourceTemplates: []framework.ResourceTemplate{{ Templates: framework.TemplatesFromDir(pkger.Dir( - "/fn/framework/testdata/template-processor/templates")), + "/fn/framework/testdata/template-processor/templates/basic")), }}, } @@ -81,7 +83,7 @@ func TestTemplateProcessor_PatchTemplates(t *testing.T) { // Patch from dir with no selector templating &framework.ResourcePatchTemplate{ Templates: framework.TemplatesFromDir(pkger.Dir( - "/fn/framework/testdata/template-processor/patches")), + "/fn/framework/testdata/template-processor/patches/basic")), Selector: &framework.Selector{Names: []string{"foo"}}, }, // Patch from string with selector templating @@ -525,3 +527,76 @@ spec: }) } } + +func TestTemplateProcessor_AdditionalSchemas(t *testing.T) { + p := framework.TemplateProcessor{ + AdditionalSchemas: func() ([]*spec.Definitions, error) { + // This adds the same thing twice, just to exercise both the ...FromDir and the ...FromFile helpers + c1, err := framework.SchemaDefinitionsFromDir("/fn/framework/testdata/template-processor/schemas")() + if err != nil { + return nil, errors.WrapPrefixf(err, "schema from dir") + } + c2, err := framework.SchemaDefinitionsFromFile("/fn/framework/testdata/template-processor/schemas/foo.json")() + if err != nil { + return nil, errors.WrapPrefixf(err, "schema from file") + } + return append(c1, c2...), nil + }, + ResourceTemplates: []framework.ResourceTemplate{{ + Templates: framework.TemplatesFromFile("/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml"), + }}, + PatchTemplates: []framework.PatchTemplate{ + &framework.ResourcePatchTemplate{ + Templates: framework.TemplatesFromFile("/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml")}, + }, + } + out := new(bytes.Buffer) + + rw := &kio.ByteReadWriter{Reader: bytes.NewBufferString(` +apiVersion: config.kubernetes.io/v1alpha1 +kind: ResourceList +items: +- apiVersion: example.com/v1 + kind: Foo + metadata: + name: source + spec: + targets: + - app: C + size: medium +`), + Writer: out} + defer openapi.ResetOpenAPI() + require.NoError(t, framework.Execute(p, rw)) + require.Equal(t, strings.TrimSpace(` +apiVersion: config.kubernetes.io/v1alpha1 +kind: ResourceList +items: +- apiVersion: example.com/v1 + kind: Foo + metadata: + name: source + spec: + targets: + - app: C + size: large + type: Ruby + - app: B + size: small +- apiVersion: example.com/v1 + kind: Foo + metadata: + name: example + spec: + targets: + - app: A + type: Go + size: small + - app: B + type: Go + size: small + - app: C + type: Ruby + size: large +`), strings.TrimSpace(out.String())) +} diff --git a/kyaml/fn/framework/testdata/template-processor/patches/patch.template.yaml b/kyaml/fn/framework/testdata/template-processor/patches/basic/patch.template.yaml similarity index 100% rename from kyaml/fn/framework/testdata/template-processor/patches/patch.template.yaml rename to kyaml/fn/framework/testdata/template-processor/patches/basic/patch.template.yaml diff --git a/kyaml/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml b/kyaml/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml new file mode 100644 index 000000000..c17b03fe3 --- /dev/null +++ b/kyaml/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml @@ -0,0 +1,10 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +spec: + targets: + - app: B + size: small + - app: C + type: Ruby + size: large diff --git a/kyaml/fn/framework/testdata/template-processor/schemas/foo.json b/kyaml/fn/framework/testdata/template-processor/schemas/foo.json new file mode 100644 index 000000000..fdf53675e --- /dev/null +++ b/kyaml/fn/framework/testdata/template-processor/schemas/foo.json @@ -0,0 +1,58 @@ +{ + "definitions": { + "com.example.v1.Foo": { + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "type": "object", + "required": [ + "targets" + ], + "properties": { + "targets": { + "type": "array", + "x-kubernetes-patch-merge-key": "app", + "x-kubernetes-patch-strategy": "merge", + "items": { + "type": "object", + "required": [ + "app" + ], + "properties": { + "app": { + "type": "string" + }, + "size": { + "type": "string" + }, + "type": { + "type": "string" + } + } + } + } + } + } + }, + "x-kubernetes-group-version-kind": [ + { + "group": "example.com", + "kind": "Foo", + "version": "v1" + } + ] + } + } +} diff --git a/kyaml/fn/framework/testdata/template-processor/templates/deploy.template.yaml b/kyaml/fn/framework/testdata/template-processor/templates/basic/deploy.template.yaml similarity index 100% rename from kyaml/fn/framework/testdata/template-processor/templates/deploy.template.yaml rename to kyaml/fn/framework/testdata/template-processor/templates/basic/deploy.template.yaml diff --git a/kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml b/kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml new file mode 100644 index 000000000..fdce207fd --- /dev/null +++ b/kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml @@ -0,0 +1,14 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: example.com/v1 +kind: Foo +metadata: + name: example +spec: + targets: + - app: A + type: Go + size: small + - app: B + type: Go From 53c87a32e9cf84528da9c77d409938cd57729a37 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Thu, 13 May 2021 14:46:34 -0700 Subject: [PATCH 2/3] Reset openapi in Filter and show use of pkger with filepath --- kyaml/fn/framework/example_test.go | 3 +-- kyaml/fn/framework/processors.go | 27 +++++++++++++++++++++------ kyaml/fn/framework/processors_test.go | 24 ++++++++++++++---------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/kyaml/fn/framework/example_test.go b/kyaml/fn/framework/example_test.go index aa284cc46..c0776d6fd 100644 --- a/kyaml/fn/framework/example_test.go +++ b/kyaml/fn/framework/example_test.go @@ -9,7 +9,6 @@ import ( "log" "path/filepath" - "github.com/markbates/pkger" "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework/command" @@ -222,7 +221,7 @@ func ExampleTemplateProcessor_generate_files() { // Templates ResourceTemplates: []framework.ResourceTemplate{{ Templates: framework.TemplatesFromFile( - pkger.Include("/fn/framework/testdata/example/templatefiles/deployment.template"), + filepath.FromSlash("/fn/framework/testdata/example/templatefiles/deployment.template"), ), }}, } diff --git a/kyaml/fn/framework/processors.go b/kyaml/fn/framework/processors.go index 7f684519a..1fa861ece 100644 --- a/kyaml/fn/framework/processors.go +++ b/kyaml/fn/framework/processors.go @@ -224,6 +224,7 @@ func (tp TemplateProcessor) Filter(items []*yaml.RNode) ([]*yaml.RNode, error) { if err != nil { return nil, errors.WrapPrefixf(err, "parsing AdditionalSchemas") } + defer openapi.ResetOpenAPI() for i := range defs { openapi.AddDefinitions(*defs[i]) } @@ -368,6 +369,10 @@ func StringTemplates(data ...string) TemplatesFunc { } // TemplatesFromFile returns a TemplatesFunc that will generate templates from the provided files. +// Paths must be absolute using the module root as the filesystem root: +// TemplatesFromFile(filepath.FromSlash("/kyaml/fn/framework/templates/foo.template.yaml")). +// This function works with pkger-embedded static files. To use pkger's auto-detection feature: +// TemplatesFromFile(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/templates/foo.template.yaml"))) // This is a helper to facilitate providing ResourceTemplates, PatchTemplates and // ContainerPatchTemplates to a TemplateProcessor. func TemplatesFromFile(files ...string) TemplatesFunc { @@ -404,13 +409,16 @@ func parseTemplate(filename string) (*template.Template, error) { // TemplatesFromDir returns a TemplatesFunc that will generate templates from the provided // directories. Only files suffixed with .template.yaml will be included. +// Paths must be absolute using the module root as the filesystem root: +// TemplatesFromDir(filepath.FromSlash("/kyaml/fn/framework/templates")). +// This function works with pkger-embedded static dirs. To use pkger's auto-detection feature: +// TemplatesFromDir(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/templates"))) // This is a helper to facilitate providing ResourceTemplates, PatchTemplates and // ContainerPatchTemplates to a TemplateProcessor. -func TemplatesFromDir(dirs ...pkger.Dir) TemplatesFunc { +func TemplatesFromDir(dirs ...string) TemplatesFunc { return func() ([]*template.Template, error) { var pt []*template.Template - for i := range dirs { - dir := string(dirs[i]) + for _, dir := range dirs { err := pkger.Walk(dir, func(p string, info os.FileInfo, err error) error { if err != nil { return err @@ -435,6 +443,10 @@ func TemplatesFromDir(dirs ...pkger.Dir) TemplatesFunc { } // SchemaDefinitionsFromFile returns a SchemaDefinitionFunc that will load schemas from the provided files. +// Paths must be absolute using the module root as the filesystem root: +// SchemaDefinitionsFromFile(filepath.FromSlash("/kyaml/fn/framework/foo/schema.json")). +// This function works with pkger-embedded static files. To use pkger's auto-detection feature: +// SchemaDefinitionsFromFile(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/foo/schema.json"))) // This is a helper to facilitate providing custom resource schemas to a TemplateProcessor. func SchemaDefinitionsFromFile(files ...string) SchemaDefinitionFunc { return func() ([]*spec.Definitions, error) { @@ -451,12 +463,15 @@ func SchemaDefinitionsFromFile(files ...string) SchemaDefinitionFunc { } // SchemaDefinitionsFromDir returns a SchemaDefinitionFunc that will load schemas from the provided directories. +// Paths must be absolute using the module root as the filesystem root: +// SchemaDefinitionsFromDir(filepath.FromSlash("/kyaml/fn/framework/schemas")). +// This function works with pkger-embedded static dirs. To use pkger's auto-detection feature: +// SchemaDefinitionsFromDir(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/schemas"))) // This is a helper to facilitate providing custom resource schemas to a TemplateProcessor. -func SchemaDefinitionsFromDir(dirs ...pkger.Dir) SchemaDefinitionFunc { +func SchemaDefinitionsFromDir(dirs ...string) SchemaDefinitionFunc { return func() ([]*spec.Definitions, error) { var defs []*spec.Definitions - for i := range dirs { - dir := string(dirs[i]) + for _, dir := range dirs { err := pkger.Walk(dir, func(p string, info os.FileInfo, err error) error { if err != nil { return err diff --git a/kyaml/fn/framework/processors_test.go b/kyaml/fn/framework/processors_test.go index fa8adb1dd..d010ec66a 100644 --- a/kyaml/fn/framework/processors_test.go +++ b/kyaml/fn/framework/processors_test.go @@ -5,10 +5,10 @@ package framework_test import ( "bytes" + "path/filepath" "strings" "testing" - "github.com/markbates/pkger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/kube-openapi/pkg/validation/spec" @@ -28,8 +28,8 @@ func TestTemplateProcessor_ResourceTemplates(t *testing.T) { p := framework.TemplateProcessor{ TemplateData: &API{}, ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.TemplatesFromDir(pkger.Dir( - "/fn/framework/testdata/template-processor/templates/basic")), + Templates: framework.TemplatesFromDir( + filepath.FromSlash("/fn/framework/testdata/template-processor/templates/basic")), }}, } @@ -82,7 +82,7 @@ func TestTemplateProcessor_PatchTemplates(t *testing.T) { PatchTemplates: []framework.PatchTemplate{ // Patch from dir with no selector templating &framework.ResourcePatchTemplate{ - Templates: framework.TemplatesFromDir(pkger.Dir( + Templates: framework.TemplatesFromDir(filepath.FromSlash( "/fn/framework/testdata/template-processor/patches/basic")), Selector: &framework.Selector{Names: []string{"foo"}}, }, @@ -179,7 +179,7 @@ func TestTemplateProcessor_ContainerPatchTemplates(t *testing.T) { PatchTemplates: []framework.PatchTemplate{ // patch from dir with no selector templating &framework.ContainerPatchTemplate{ - Templates: framework.TemplatesFromDir(pkger.Dir( + Templates: framework.TemplatesFromDir(filepath.FromSlash( "/fn/framework/testdata/template-processor/container-patches")), Selector: &framework.Selector{Names: []string{"foo"}}, }, @@ -532,22 +532,22 @@ func TestTemplateProcessor_AdditionalSchemas(t *testing.T) { p := framework.TemplateProcessor{ AdditionalSchemas: func() ([]*spec.Definitions, error) { // This adds the same thing twice, just to exercise both the ...FromDir and the ...FromFile helpers - c1, err := framework.SchemaDefinitionsFromDir("/fn/framework/testdata/template-processor/schemas")() + c1, err := framework.SchemaDefinitionsFromDir(filepath.FromSlash("/fn/framework/testdata/template-processor/schemas"))() if err != nil { return nil, errors.WrapPrefixf(err, "schema from dir") } - c2, err := framework.SchemaDefinitionsFromFile("/fn/framework/testdata/template-processor/schemas/foo.json")() + c2, err := framework.SchemaDefinitionsFromFile(filepath.FromSlash("/fn/framework/testdata/template-processor/schemas/foo.json"))() if err != nil { return nil, errors.WrapPrefixf(err, "schema from file") } return append(c1, c2...), nil }, ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.TemplatesFromFile("/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml"), + Templates: framework.TemplatesFromFile(filepath.FromSlash("/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml")), }}, PatchTemplates: []framework.PatchTemplate{ &framework.ResourcePatchTemplate{ - Templates: framework.TemplatesFromFile("/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml")}, + Templates: framework.TemplatesFromFile(filepath.FromSlash("/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml"))}, }, } out := new(bytes.Buffer) @@ -566,7 +566,6 @@ items: size: medium `), Writer: out} - defer openapi.ResetOpenAPI() require.NoError(t, framework.Execute(p, rw)) require.Equal(t, strings.TrimSpace(` apiVersion: config.kubernetes.io/v1alpha1 @@ -599,4 +598,9 @@ items: type: Ruby size: large `), strings.TrimSpace(out.String())) + found := openapi.SchemaForResourceType(yaml.TypeMeta{ + APIVersion: "example.com/v1", + Kind: "Foo", + }) + require.Nil(t, found, "openAPI schema was not reset") } From 3f3d3b17a4f080feab99734395562d7f73e5e1a5 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Mon, 17 May 2021 09:26:30 -0700 Subject: [PATCH 3/3] Replace pkger with embed.FS compatibility --- api/go.sum | 3 - cmd/config/go.sum | 3 - cmd/pluginator/go.sum | 5 - kustomize/go.sum | 3 - kyaml/fn/framework/example/doc.go | 9 +- kyaml/fn/framework/example/main.go | 50 +++-- kyaml/fn/framework/example/main_test.go | 17 ++ .../templates/service_account.template.yaml | 7 + .../example/testdata/basic/config.yaml | 6 + .../example/testdata/basic/expected.yaml | 21 ++ .../cm.yaml => testdata/basic/input.yaml} | 0 kyaml/fn/framework/example_test.go | 26 +-- kyaml/fn/framework/parser/doc.go | 43 ++++ kyaml/fn/framework/parser/parser.go | 95 +++++++++ kyaml/fn/framework/parser/schema.go | 95 +++++++++ kyaml/fn/framework/parser/schema_test.go | 100 +++++++++ kyaml/fn/framework/parser/template.go | 97 +++++++++ kyaml/fn/framework/parser/template_test.go | 155 ++++++++++++++ .../parser/testdata/cm1.template.yaml | 11 + .../parser/testdata/cm2.template.yaml | 11 + .../fn/framework/parser/testdata/ignore.yaml | 4 + .../fn/framework/parser/testdata/schema1.json | 58 ++++++ .../fn/framework/parser/testdata/schema2.json | 58 ++++++ kyaml/fn/framework/patch.go | 15 +- kyaml/fn/framework/patch_test.go | 5 +- kyaml/fn/framework/processors.go | 193 +----------------- kyaml/fn/framework/processors_test.go | 49 ++--- kyaml/fn/framework/template.go | 16 +- ...ment.template => deployment.template.yaml} | 3 + .../{foo.yaml => foo.template.yaml} | 0 kyaml/go.mod | 1 - kyaml/go.sum | 5 - plugin/builtin/annotationstransformer/go.sum | 3 - plugin/builtin/configmapgenerator/go.sum | 3 - plugin/builtin/hashtransformer/go.sum | 3 - .../helmchartinflationgenerator/go.sum | 3 - plugin/builtin/imagetagtransformer/go.sum | 3 - plugin/builtin/labeltransformer/go.sum | 3 - plugin/builtin/legacyordertransformer/go.sum | 3 - plugin/builtin/namespacetransformer/go.sum | 3 - .../builtin/patchjson6902transformer/go.sum | 3 - .../patchstrategicmergetransformer/go.sum | 3 - plugin/builtin/patchtransformer/go.sum | 3 - plugin/builtin/prefixsuffixtransformer/go.sum | 3 - plugin/builtin/replacementtransformer/go.sum | 3 - plugin/builtin/replicacounttransformer/go.sum | 3 - plugin/builtin/secretgenerator/go.sum | 3 - plugin/builtin/valueaddtransformer/go.sum | 3 - .../v1/bashedconfigmap/go.sum | 3 - .../v1/calvinduplicator/go.sum | 3 - .../v1/dateprefixer/go.sum | 3 - .../v1/printpluginenv/go.sum | 3 - .../v1/secretsfromdatabase/go.sum | 3 - .../v1/sedtransformer/go.sum | 3 - .../v1/someservicegenerator/go.sum | 3 - .../v1/starlarkmixer/go.sum | 3 - .../v1/stringprefixer/go.sum | 3 - .../someteam.example.com/v1/validator/go.sum | 3 - plugin/untested/v1/gogetter/go.sum | 3 - 59 files changed, 888 insertions(+), 357 deletions(-) create mode 100644 kyaml/fn/framework/example/main_test.go create mode 100644 kyaml/fn/framework/example/templates/service_account.template.yaml create mode 100644 kyaml/fn/framework/example/testdata/basic/config.yaml create mode 100644 kyaml/fn/framework/example/testdata/basic/expected.yaml rename kyaml/fn/framework/example/{input/cm.yaml => testdata/basic/input.yaml} (100%) create mode 100644 kyaml/fn/framework/parser/doc.go create mode 100644 kyaml/fn/framework/parser/parser.go create mode 100644 kyaml/fn/framework/parser/schema.go create mode 100644 kyaml/fn/framework/parser/schema_test.go create mode 100644 kyaml/fn/framework/parser/template.go create mode 100644 kyaml/fn/framework/parser/template_test.go create mode 100644 kyaml/fn/framework/parser/testdata/cm1.template.yaml create mode 100644 kyaml/fn/framework/parser/testdata/cm2.template.yaml create mode 100644 kyaml/fn/framework/parser/testdata/ignore.yaml create mode 100644 kyaml/fn/framework/parser/testdata/schema1.json create mode 100644 kyaml/fn/framework/parser/testdata/schema2.json rename kyaml/fn/framework/testdata/example/templatefiles/{deployment.template => deployment.template.yaml} (60%) rename kyaml/fn/framework/testdata/template-processor/templates/custom-resource/{foo.yaml => foo.template.yaml} (100%) diff --git a/api/go.sum b/api/go.sum index 5fef24d60..37df0fd6c 100644 --- a/api/go.sum +++ b/api/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/cmd/config/go.sum b/cmd/config/go.sum index ab1fdf4b2..8fc6cbf50 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -236,7 +234,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/cmd/pluginator/go.sum b/cmd/pluginator/go.sum index 051120cf7..1af985dfb 100644 --- a/cmd/pluginator/go.sum +++ b/cmd/pluginator/go.sum @@ -47,8 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -100,8 +98,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -223,7 +219,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/kustomize/go.sum b/kustomize/go.sum index 1a3c8bc25..528d2e771 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -49,7 +49,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -104,7 +103,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -244,7 +242,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/kyaml/fn/framework/example/doc.go b/kyaml/fn/framework/example/doc.go index 5f5500182..a88333744 100644 --- a/kyaml/fn/framework/example/doc.go +++ b/kyaml/fn/framework/example/doc.go @@ -2,11 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 // Package main contains an example using the the framework. -// The example annotates all resources in the input with the value provided as a flag. +// The example annotates all resources in the input with the value provided as a flag, +// and adds all resources in the templates/ directory to the list. // // To execute the function, run: // -// $ cat input/cm.yaml | go run ./main.go --value=foo +// $ cat testdata/basic/input.yaml | go run ./main.go --value=foo +// +// Alternatively, you can provide the value via a config file instead of a flag: +// +// $ go run ./main.go testdata/basic/config.yaml testdata/basic/input.yaml // // To generate the Dockerfile for the function image run: // diff --git a/kyaml/fn/framework/example/main.go b/kyaml/fn/framework/example/main.go index 24cb430d7..3288698db 100644 --- a/kyaml/fn/framework/example/main.go +++ b/kyaml/fn/framework/example/main.go @@ -4,29 +4,49 @@ package main import ( + "embed" "fmt" "os" + "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework/command" - "sigs.k8s.io/kustomize/kyaml/yaml" + "sigs.k8s.io/kustomize/kyaml/fn/framework/parser" ) -func main() { - var value string - fn := func(rl *framework.ResourceList) error { - for i := range rl.Items { - // set the annotation on each resource item - if err := rl.Items[i].PipeE(yaml.SetAnnotation("value", value)); err != nil { - return err - } - } - return nil - } - cmd := command.Build(framework.ResourceListProcessorFunc(fn), command.StandaloneEnabled, false) - cmd.Flags().StringVar(&value, "value", "", "annotation value") +//go:embed templates/* +var templateFS embed.FS - if err := cmd.Execute(); err != nil { +var annotationTemplate = ` +metadata: + annotations: + value: {{ .Value }} +` + +func buildProcessor(value *string) framework.ResourceListProcessor { + return framework.TemplateProcessor{ + ResourceTemplates: []framework.ResourceTemplate{{ + Templates: parser.TemplateFiles("templates").FromFS(templateFS), + }}, + PatchTemplates: []framework.PatchTemplate{&framework.ResourcePatchTemplate{ + Templates: parser.TemplateStrings(annotationTemplate), + }}, + // This will be populated from the --value flag if provided, + // or the config file's `value` field if provided, with the latter taking precedence. + TemplateData: struct { + Value *string `yaml:"value"` + }{Value: value}} +} + +func buildCmd() *cobra.Command { + var value string + cmd := command.Build(buildProcessor(&value), command.StandaloneEnabled, false) + cmd.Flags().StringVar(&value, "value", "", "annotation value") + return cmd +} + +func main() { + if err := buildCmd().Execute(); err != nil { fmt.Println(err) os.Exit(1) } diff --git a/kyaml/fn/framework/example/main_test.go b/kyaml/fn/framework/example/main_test.go new file mode 100644 index 000000000..98824d548 --- /dev/null +++ b/kyaml/fn/framework/example/main_test.go @@ -0,0 +1,17 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package main + +import ( + "testing" + + "sigs.k8s.io/kustomize/kyaml/fn/framework/frameworktestutil" +) + +func TestRun(t *testing.T) { + prc := frameworktestutil.CommandResultsChecker{ + Command: buildCmd, + } + prc.Assert(t) +} diff --git a/kyaml/fn/framework/example/templates/service_account.template.yaml b/kyaml/fn/framework/example/templates/service_account.template.yaml new file mode 100644 index 000000000..8c5def1ba --- /dev/null +++ b/kyaml/fn/framework/example/templates/service_account.template.yaml @@ -0,0 +1,7 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Value }} diff --git a/kyaml/fn/framework/example/testdata/basic/config.yaml b/kyaml/fn/framework/example/testdata/basic/config.yaml new file mode 100644 index 000000000..35f401146 --- /dev/null +++ b/kyaml/fn/framework/example/testdata/basic/config.yaml @@ -0,0 +1,6 @@ +# Copyright 2019 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: example.com/v1alpha1 +kind: Tester +value: foo diff --git a/kyaml/fn/framework/example/testdata/basic/expected.yaml b/kyaml/fn/framework/example/testdata/basic/expected.yaml new file mode 100644 index 000000000..be1c86cb8 --- /dev/null +++ b/kyaml/fn/framework/example/testdata/basic/expected.yaml @@ -0,0 +1,21 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +kind: ConfigMap +apiVersion: v1 +metadata: + name: tester + annotations: + value: foo +data: + some: data +--- +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: foo + annotations: + value: foo diff --git a/kyaml/fn/framework/example/input/cm.yaml b/kyaml/fn/framework/example/testdata/basic/input.yaml similarity index 100% rename from kyaml/fn/framework/example/input/cm.yaml rename to kyaml/fn/framework/example/testdata/basic/input.yaml diff --git a/kyaml/fn/framework/example_test.go b/kyaml/fn/framework/example_test.go index c0776d6fd..9b7e4d8da 100644 --- a/kyaml/fn/framework/example_test.go +++ b/kyaml/fn/framework/example_test.go @@ -12,6 +12,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework/command" + "sigs.k8s.io/kustomize/kyaml/fn/framework/parser" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -179,7 +180,7 @@ func ExampleTemplateProcessor_generate_inline() { TemplateData: api, // Templates ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` apiVersion: apps/v1 kind: Deployment metadata: @@ -220,9 +221,7 @@ func ExampleTemplateProcessor_generate_files() { TemplateData: api, // Templates ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.TemplatesFromFile( - filepath.FromSlash("/fn/framework/testdata/example/templatefiles/deployment.template"), - ), + Templates: parser.TemplateFiles("testdata/example/templatefiles/deployment.template.yaml"), }}, } cmd := command.Build(templateFn, command.StandaloneEnabled, false) @@ -233,6 +232,9 @@ func ExampleTemplateProcessor_generate_files() { } // Output: + // # Copyright 2021 The Kubernetes Authors. + // # SPDX-License-Identifier: Apache-2.0 + // // apiVersion: apps/v1 // kind: Deployment // metadata: @@ -263,7 +265,7 @@ func ExampleTemplateProcessor_preprocess() { }, // Templates ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` apiVersion: apps/v1 kind: Deployment metadata: @@ -329,7 +331,7 @@ func ExampleTemplateProcessor_postprocess() { // Templates input TemplateData: config, ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` apiVersion: apps/v1 kind: Deployment metadata: @@ -380,7 +382,7 @@ func ExampleTemplateProcessor_patch() { Value string `json:"value" yaml:"value"` }), ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` apiVersion: apps/v1 kind: Deployment metadata: @@ -403,7 +405,7 @@ metadata: &framework.ResourcePatchTemplate{ // patch the foo resource only Selector: &framework.Selector{Names: []string{"foo"}}, - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` metadata: annotations: patched: 'true' @@ -446,7 +448,7 @@ func ExampleTemplateProcessor_MergeResources() { }), ResourceTemplates: []framework.ResourceTemplate{{ // This is the generated resource the input will patch - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` apiVersion: apps/v1 kind: Deployment metadata: @@ -689,7 +691,7 @@ spec: p := framework.TemplateProcessor{ PatchTemplates: []framework.PatchTemplate{ &framework.ContainerPatchTemplate{ - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` env: - name: KEY value: {{ .Value }} @@ -813,7 +815,7 @@ spec: &framework.ContainerPatchTemplate{ // Only patch containers named "foo" ContainerMatcher: framework.ContainerNameMatcher("foo"), - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` env: - name: KEY value: {{ .Value }} @@ -897,7 +899,7 @@ func (a v1alpha1JavaSpringBoot) Filter(items []*yaml.RNode) ([]*yaml.RNode, erro filter := framework.TemplateProcessor{ ResourceTemplates: []framework.ResourceTemplate{{ TemplateData: &a, - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` apiVersion: apps/v1 kind: Deployment metadata: diff --git a/kyaml/fn/framework/parser/doc.go b/kyaml/fn/framework/parser/doc.go new file mode 100644 index 000000000..20662842a --- /dev/null +++ b/kyaml/fn/framework/parser/doc.go @@ -0,0 +1,43 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +// Package parser contains implementations of the framework.TemplateParser and framework.SchemaParser interfaces. +// Typically, you would use these in a framework.TemplateProcessor. +// +// Example: +// +// processor := framework.TemplateProcessor{ +// ResourceTemplates: []framework.ResourceTemplate{{ +// Templates: parser.TemplateFiles("path/to/templates"), +// }}, +// PatchTemplates: []framework.PatchTemplate{ +// &framework.ResourcePatchTemplate{ +// Templates: parser.TemplateFiles("path/to/patches/ingress.template.yaml"), +// }, +// }, +// AdditionalSchemas: parser.SchemaFiles("path/to/crd-schemas"), +// } +// +// +// All the parser in this file are compatible with embed.FS filesystems. To load from an embed.FS +// instead of local disk, use `.FromFS`. For example, if you embed filesystems as follows: +// +// //go:embed resources/* patches/* +// var templateFS embed.FS +// //go:embed schemas/* +// var schemaFS embed.FS +// +// Then you can use them like so: +// +// processor := framework.TemplateProcessor{ +// ResourceTemplates: []framework.ResourceTemplate{{ +// Templates: parser.TemplateFiles("resources").FromFS(templateFS), +// }}, +// PatchTemplates: []framework.PatchTemplate{ +// &framework.ResourcePatchTemplate{ +// Templates: parser.TemplateFiles("patches/ingress.template.yaml").FromFS(templateFS), +// }, +// }, +// AdditionalSchemas: parser.SchemaFiles("schemas").FromFS(schemaFS), +// } +package parser diff --git a/kyaml/fn/framework/parser/parser.go b/kyaml/fn/framework/parser/parser.go new file mode 100644 index 000000000..748964486 --- /dev/null +++ b/kyaml/fn/framework/parser/parser.go @@ -0,0 +1,95 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package parser + +import ( + iofs "io/fs" + "io/ioutil" + "path" + "strings" + + "sigs.k8s.io/kustomize/kyaml/errors" +) + +type parser struct { + fs iofs.FS + paths []string + extension string +} + +type contentProcessor func(content []byte, name string) error + +func (l parser) parse(processContent contentProcessor) error { + for _, path := range l.paths { + if err := l.readPath(path, processContent); err != nil { + return err + } + } + return nil +} + +func (l parser) readPath(path string, processContent contentProcessor) error { + f, err := l.fs.Open(path) + if err != nil { + return err + } + defer f.Close() + + info, err := f.Stat() + if err != nil { + return err + } + + // File is directory -- read templates among its immediate children + if info.IsDir() { + dir, ok := f.(iofs.ReadDirFile) + if !ok { + return errors.Errorf("%s is a directory but could not be opened as one", path) + } + return l.readDir(dir, path, processContent) + } + + // Path is a file -- check extension and read it + if !strings.HasSuffix(path, l.extension) { + return errors.Errorf("file %s did not have required extension %s", path, l.extension) + } + b, err := ioutil.ReadAll(f) + if err != nil { + return err + } + return processContent(b, path) +} + +func (l parser) readDir(dir iofs.ReadDirFile, dirname string, processContent contentProcessor) error { + entries, err := dir.ReadDir(0) + if err != nil { + return err + } + + for _, entry := range entries { + if entry.IsDir() || !strings.HasSuffix(entry.Name(), l.extension) { + continue + } + // Note: using filepath.Join will break Windows, because io/fs.FS implementations require slashes on all OS. + // See https://golang.org/pkg/io/fs/#ValidPath + b, err := l.readFile(path.Join(dirname, entry.Name())) + if err != nil { + return err + } + if err := processContent(b, entry.Name()); err != nil { + return err + } + } + return nil +} + +func (l parser) readFile(path string) ([]byte, error) { + f, err := l.fs.Open(path) + if err != nil { + return nil, err + } + defer f.Close() + + return ioutil.ReadAll(f) +} diff --git a/kyaml/fn/framework/parser/schema.go b/kyaml/fn/framework/parser/schema.go new file mode 100644 index 000000000..2160178a9 --- /dev/null +++ b/kyaml/fn/framework/parser/schema.go @@ -0,0 +1,95 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package parser + +import ( + iofs "io/fs" + "os" + + "k8s.io/kube-openapi/pkg/validation/spec" + "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/fn/framework" +) + +const ( + // SchemaExtension is the file extension this package requires schema files to have + SchemaExtension = ".json" +) + +// SchemaStrings returns a SchemaParser that will parse the schemas in the given strings. +// +// This is a helper for use with framework.TemplateProcessor#AdditionalSchemas. Example: +// +// processor := framework.TemplateProcessor{ +// //... +// AdditionalSchemas: parser.SchemaStrings(` +// { +// "definitions": { +// "com.example.v1.Foo": { +// ... +// } +// } +// } +// `), +// +func SchemaStrings(data ...string) framework.SchemaParser { + return framework.SchemaParserFunc(func() ([]*spec.Definitions, error) { + var defs []*spec.Definitions + for _, content := range data { + var schema spec.Schema + if err := schema.UnmarshalJSON([]byte(content)); err != nil { + return nil, err + } else if schema.Definitions == nil { + return nil, errors.Errorf("inline schema did not contain any definitions") + } + defs = append(defs, &schema.Definitions) + } + return defs, nil + }) +} + +// SchemaFiles returns a SchemaParser that will parse the schemas in the given files. +// This is a helper for use with framework.TemplateProcessor#AdditionalSchemas. +// processor := framework.TemplateProcessor{ +// //... +// AdditionalSchemas: parser.SchemaFiles("path/to/crd-schemas", "path/to/special-schema.json), +// } +func SchemaFiles(paths ...string) SchemaParser { + return SchemaParser{parser{paths: paths, extension: SchemaExtension}} +} + +// SchemaParser is a framework.SchemaParser that can parse files or directories containing openapi schemas. +type SchemaParser struct { + parser +} + +// Parse implements framework.SchemaParser +func (l SchemaParser) Parse() ([]*spec.Definitions, error) { + if l.fs == nil { + l.fs = os.DirFS(".") + } + + var defs []*spec.Definitions + err := l.parse(func(content []byte, name string) error { + var schema spec.Schema + if err := schema.UnmarshalJSON(content); err != nil { + return err + } else if schema.Definitions == nil { + return errors.Errorf("schema %s did not contain any definitions", name) + } + defs = append(defs, &schema.Definitions) + return nil + }) + if err != nil { + return nil, err + } + return defs, nil +} + +// FromFS allows you to replace the filesystem in which the parser will look up the given paths. +// For example, you can use an embed.FS. +func (l SchemaParser) FromFS(fs iofs.FS) SchemaParser { + l.parser.fs = fs + return l +} diff --git a/kyaml/fn/framework/parser/schema_test.go b/kyaml/fn/framework/parser/schema_test.go new file mode 100644 index 000000000..a51801a95 --- /dev/null +++ b/kyaml/fn/framework/parser/schema_test.go @@ -0,0 +1,100 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package parser_test + +import ( + _ "embed" + iofs "io/fs" + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "sigs.k8s.io/kustomize/kyaml/fn/framework/parser" +) + +//go:embed testdata/schema1.json +var schema1String string + +//go:embed testdata/schema2.json +var schema2String string + +func TestSchemaFiles(t *testing.T) { + tests := []struct { + name string + paths []string + fs iofs.FS + expectedCount int + wantErr string + }{ + { + name: "parses schema from file", + paths: []string{"testdata/schema1.json"}, + expectedCount: 1, + }, + { + name: "accepts multiple inputs", + paths: []string{"testdata/schema1.json", "testdata/schema2.json"}, + expectedCount: 2, + }, + { + name: "parses templates from directory", + paths: []string{"testdata"}, + expectedCount: 2, + }, + { + name: "can be configured with an alternative FS", + fs: os.DirFS("testdata"), // changes the root of the input paths + paths: []string{"schema1.json"}, + expectedCount: 1, + }, + { + name: "rejects non-.template.yaml files", + paths: []string{"testdata/ignore.yaml"}, + wantErr: "file testdata/ignore.yaml did not have required extension .json", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + p := parser.SchemaFiles(tt.paths...) + if tt.fs != nil { + p = p.FromFS(tt.fs) + } + schemas, err := p.Parse() + if tt.wantErr != "" { + require.EqualError(t, err, tt.wantErr) + return + } + require.NoError(t, err) + assert.Equal(t, tt.expectedCount, len(schemas)) + }) + } +} + +func TestSchemaStrings(t *testing.T) { + tests := []struct { + name string + data []string + expectedCount int + }{ + { + name: "parses templates from strings", + data: []string{schema1String}, + expectedCount: 1, + }, + { + name: "accepts multiple inputs", + data: []string{schema1String, schema2String}, + expectedCount: 2, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + p := parser.SchemaStrings(tt.data...) + schemas, err := p.Parse() + require.NoError(t, err) + assert.Equal(t, tt.expectedCount, len(schemas)) + }) + } +} diff --git a/kyaml/fn/framework/parser/template.go b/kyaml/fn/framework/parser/template.go new file mode 100644 index 000000000..44a6db436 --- /dev/null +++ b/kyaml/fn/framework/parser/template.go @@ -0,0 +1,97 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package parser + +import ( + "fmt" + iofs "io/fs" + "os" + "path/filepath" + "text/template" + + "sigs.k8s.io/kustomize/kyaml/fn/framework" +) + +const ( + // TemplateExtension is the file extension this package requires template files to have + TemplateExtension = ".template.yaml" +) + +// TemplateStrings returns a TemplateParser that will parse the templates from the given strings. +// +// This is a helper for use with framework.TemplateProcessor's template subfields. Example: +// +// processor := framework.TemplateProcessor{ +// ResourceTemplates: []framework.ResourceTemplate{{ +// Templates: parser.TemplateStrings(` +// apiVersion: apps/v1 +// kind: Deployment +// metadata: +// name: foo +// namespace: default +// annotations: +// {{ .Key }}: {{ .Value }} +// `) +// }}, +// } +func TemplateStrings(data ...string) framework.TemplateParser { + return framework.TemplateParserFunc(func() ([]*template.Template, error) { + var templates []*template.Template + for i := range data { + t, err := template.New(fmt.Sprintf("inline%d", i)).Parse(data[i]) + if err != nil { + return nil, err + } + templates = append(templates, t) + } + return templates, nil + }) +} + +// TemplateFiles returns a TemplateParser that will parse the templates from the given files or directories. +// Only immediate children of any given directories will be parsed. +// All files must end in .template.yaml. +// +// This is a helper for use with framework.TemplateProcessor's template subfields. Example: +// +// processor := framework.TemplateProcessor{ +// ResourceTemplates: []framework.ResourceTemplate{{ +// Templates: parser.TemplateFiles("path/to/templates", "path/to/special.template.yaml") +// }}, +// } +func TemplateFiles(paths ...string) TemplateParser { + return TemplateParser{parser{paths: paths, extension: TemplateExtension}} +} + +// TemplateParser is a framework.TemplateParser that can parse files or directories containing Go templated YAML. +type TemplateParser struct { + parser +} + +// Parse implements framework.TemplateParser +func (l TemplateParser) Parse() ([]*template.Template, error) { + if l.fs == nil { + l.fs = os.DirFS(".") + } + + var templates []*template.Template + err := l.parse(func(content []byte, file string) error { + t, err := template.New(filepath.Base(file)).Parse(string(content)) + if err == nil { + templates = append(templates, t) + } + return err + }) + if err != nil { + return nil, err + } + return templates, nil +} + +// FromFS allows you to replace the filesystem in which the parser will look up the given paths. +// For example, you can use an embed.FS. +func (l TemplateParser) FromFS(fs iofs.FS) TemplateParser { + l.parser.fs = fs + return l +} diff --git a/kyaml/fn/framework/parser/template_test.go b/kyaml/fn/framework/parser/template_test.go new file mode 100644 index 000000000..1b0e14605 --- /dev/null +++ b/kyaml/fn/framework/parser/template_test.go @@ -0,0 +1,155 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +package parser_test + +import ( + "bytes" + _ "embed" + iofs "io/fs" + "os" + "sort" + "strings" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "sigs.k8s.io/kustomize/kyaml/fn/framework/parser" +) + +//go:embed testdata/cm1.template.yaml +var cm1String string + +//go:embed testdata/cm2.template.yaml +var cm2String string + +var templateData = struct { + Name string `yaml:"name"` +}{Name: "tester"} + +var cm1Success = strings.TrimSpace(` +apiVersion: v1 +kind: ConfigMap +metadata: + name: appconfig + labels: + app: tester +data: + app: tester +`) + +var cm2Success = strings.TrimSpace(` +apiVersion: v1 +kind: ConfigMap +metadata: + name: env + labels: + app: tester +data: + env: production +`) + +func TestTemplateFiles(t *testing.T) { + tests := []struct { + name string + paths []string + fs iofs.FS + expected []string + wantErr string + }{ + { + name: "parses templates from file", + paths: []string{"testdata/cm1.template.yaml"}, + expected: []string{cm1Success}, + }, + { + name: "accepts multiple inputs", + paths: []string{"testdata/cm1.template.yaml", "testdata/cm2.template.yaml"}, + expected: []string{cm1Success, cm2Success}, + }, + { + name: "parses templates from directory", + paths: []string{"testdata"}, + expected: []string{cm1Success, cm2Success}, + }, + { + name: "can be configured with an alternative FS", + fs: os.DirFS("testdata"), // changes the root of the input paths + paths: []string{"cm1.template.yaml"}, + expected: []string{cm1Success}, + }, + { + name: "rejects non-.template.yaml files", + paths: []string{"testdata/ignore.yaml"}, + wantErr: "file testdata/ignore.yaml did not have required extension .template.yaml", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + p := parser.TemplateFiles(tt.paths...) + if tt.fs != nil { + p = p.FromFS(tt.fs) + } + templates, err := p.Parse() + if tt.wantErr != "" { + require.EqualError(t, err, tt.wantErr) + return + } + require.NoError(t, err) + + result := []string{} + for _, template := range templates { + w := bytes.NewBuffer([]byte{}) + err := template.Execute(w, templateData) + require.NoError(t, err) + result = append(result, strings.TrimSpace(w.String())) + } + sort.Strings(tt.expected) + sort.Strings(result) + assert.Equal(t, len(result), len(tt.expected)) + for i := range tt.expected { + assert.YAMLEq(t, tt.expected[i], result[i]) + } + }) + } +} + +func TestTemplateStrings(t *testing.T) { + tests := []struct { + name string + data []string + expected []string + }{ + { + name: "parses templates from strings", + data: []string{cm1String}, + expected: []string{cm1Success}, + }, + { + name: "accepts multiple inputs", + data: []string{cm1String, cm2String}, + expected: []string{cm1Success, cm2Success}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + p := parser.TemplateStrings(tt.data...) + templates, err := p.Parse() + require.NoError(t, err) + + result := []string{} + for _, template := range templates { + w := bytes.NewBuffer([]byte{}) + err := template.Execute(w, templateData) + require.NoError(t, err) + result = append(result, strings.TrimSpace(w.String())) + } + sort.Strings(tt.expected) + sort.Strings(result) + assert.Equal(t, len(result), len(tt.expected)) + for i := range tt.expected { + assert.YAMLEq(t, tt.expected[i], result[i]) + } + }) + } +} diff --git a/kyaml/fn/framework/parser/testdata/cm1.template.yaml b/kyaml/fn/framework/parser/testdata/cm1.template.yaml new file mode 100644 index 000000000..ab6cf4dae --- /dev/null +++ b/kyaml/fn/framework/parser/testdata/cm1.template.yaml @@ -0,0 +1,11 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: appconfig + labels: + app: {{ .Name }} +data: + app: {{ .Name }} diff --git a/kyaml/fn/framework/parser/testdata/cm2.template.yaml b/kyaml/fn/framework/parser/testdata/cm2.template.yaml new file mode 100644 index 000000000..e02a40f34 --- /dev/null +++ b/kyaml/fn/framework/parser/testdata/cm2.template.yaml @@ -0,0 +1,11 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: env + labels: + app: {{ .Name }} +data: + env: production diff --git a/kyaml/fn/framework/parser/testdata/ignore.yaml b/kyaml/fn/framework/parser/testdata/ignore.yaml new file mode 100644 index 000000000..450759479 --- /dev/null +++ b/kyaml/fn/framework/parser/testdata/ignore.yaml @@ -0,0 +1,4 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +not: a_resource diff --git a/kyaml/fn/framework/parser/testdata/schema1.json b/kyaml/fn/framework/parser/testdata/schema1.json new file mode 100644 index 000000000..fdf53675e --- /dev/null +++ b/kyaml/fn/framework/parser/testdata/schema1.json @@ -0,0 +1,58 @@ +{ + "definitions": { + "com.example.v1.Foo": { + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "type": "object", + "required": [ + "targets" + ], + "properties": { + "targets": { + "type": "array", + "x-kubernetes-patch-merge-key": "app", + "x-kubernetes-patch-strategy": "merge", + "items": { + "type": "object", + "required": [ + "app" + ], + "properties": { + "app": { + "type": "string" + }, + "size": { + "type": "string" + }, + "type": { + "type": "string" + } + } + } + } + } + } + }, + "x-kubernetes-group-version-kind": [ + { + "group": "example.com", + "kind": "Foo", + "version": "v1" + } + ] + } + } +} diff --git a/kyaml/fn/framework/parser/testdata/schema2.json b/kyaml/fn/framework/parser/testdata/schema2.json new file mode 100644 index 000000000..6daa2c177 --- /dev/null +++ b/kyaml/fn/framework/parser/testdata/schema2.json @@ -0,0 +1,58 @@ +{ + "definitions": { + "com.example.v1.Bar": { + "type": "object", + "properties": { + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "description": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "spec": { + "type": "object", + "required": [ + "targets" + ], + "properties": { + "targets": { + "type": "array", + "x-kubernetes-patch-merge-key": "app", + "x-kubernetes-patch-strategy": "merge", + "items": { + "type": "object", + "required": [ + "app" + ], + "properties": { + "app": { + "type": "string" + }, + "size": { + "type": "string" + }, + "type": { + "type": "string" + } + } + } + } + } + } + }, + "x-kubernetes-group-version-kind": [ + { + "group": "example.com", + "kind": "Bar", + "version": "v1" + } + ] + } + } +} diff --git a/kyaml/fn/framework/patch.go b/kyaml/fn/framework/patch.go index 0ca7529c5..5b0b3b098 100644 --- a/kyaml/fn/framework/patch.go +++ b/kyaml/fn/framework/patch.go @@ -19,8 +19,8 @@ import ( // ResourcePatchTemplate applies a patch to a collection of resources type ResourcePatchTemplate struct { - // Templates is a function that returns a list of templates to render into one or more patches. - Templates TemplatesFunc + // Templates provides a list of templates to render into one or more patches. + Templates TemplateParser // Selector targets the rendered patches to specific resources. If no Selector is provided, // all resources will be patched. @@ -66,7 +66,7 @@ func (t ResourcePatchTemplate) Filter(items []*yaml.RNode) ([]*yaml.RNode, error } func (t *ResourcePatchTemplate) apply(matches []*yaml.RNode) error { - templates, err := t.Templates() + templates, err := t.Templates.Parse() if err != nil { return errors.Wrap(err) } @@ -93,10 +93,9 @@ func (t *ResourcePatchTemplate) apply(matches []*yaml.RNode) error { // ContainerPatchTemplate defines a patch to be applied to containers type ContainerPatchTemplate struct { - // Templates is a function that returns a list of templates to render into one or more - // patches that apply at the container level. For example, "name", "env" and "image" would be - // top-level fields in container patches. - Templates TemplatesFunc + // Templates provides a list of templates to render into one or more patches that apply at the container level. + // For example, "name", "env" and "image" would be top-level fields in container patches. + Templates TemplateParser // Selector targets the rendered patches to containers within specific resources. // If no Selector is provided, all resources with containers will be patched (subject to @@ -155,7 +154,7 @@ func (cpt ContainerPatchTemplate) Filter(items []*yaml.RNode) ([]*yaml.RNode, er // PatchContainers applies the patch to each matching container in each resource. func (cpt ContainerPatchTemplate) apply(matches []*yaml.RNode) error { - templates, err := cpt.Templates() + templates, err := cpt.Templates.Parse() if err != nil { return errors.Wrap(err) } diff --git a/kyaml/fn/framework/patch_test.go b/kyaml/fn/framework/patch_test.go index 8dd63f542..22854a406 100644 --- a/kyaml/fn/framework/patch_test.go +++ b/kyaml/fn/framework/patch_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/spf13/cobra" + "sigs.k8s.io/kustomize/kyaml/fn/framework/parser" "sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework/command" @@ -35,7 +36,7 @@ func TestResourcePatchTemplate_ComplexSelectors(t *testing.T) { } pt1 := framework.ResourcePatchTemplate{ // Apply these rendered patches - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` spec: template: spec: @@ -56,7 +57,7 @@ metadata: pt2 := framework.ResourcePatchTemplate{ // Apply these rendered patches - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` metadata: annotations: filterPatched: '{{ .A }}' diff --git a/kyaml/fn/framework/processors.go b/kyaml/fn/framework/processors.go index 1fa861ece..eedff8ffe 100644 --- a/kyaml/fn/framework/processors.go +++ b/kyaml/fn/framework/processors.go @@ -4,15 +4,8 @@ package framework import ( - "fmt" - "io/ioutil" - "os" - "path" - "path/filepath" "strings" - "text/template" - "github.com/markbates/pkger" "k8s.io/kube-openapi/pkg/validation/spec" "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/kio" @@ -208,19 +201,25 @@ type TemplateProcessor struct { // AdditionalSchemas is a function that returns a list of schema definitions to add to openapi. // This enables correct merging of custom resource fields. - AdditionalSchemas SchemaDefinitionFunc + AdditionalSchemas SchemaParser } -// SchemaDefinitionFunc is a function that provides a list of schema definitions. -// TemplateProcessor uses this to defer loading of schemas to the point where they are used. -type SchemaDefinitionFunc func() ([]*spec.Definitions, error) +type SchemaParser interface { + Parse() ([]*spec.Definitions, error) +} + +type SchemaParserFunc func() ([]*spec.Definitions, error) + +func (s SchemaParserFunc) Parse() ([]*spec.Definitions, error) { + return s() +} // Filter implements the kio.Filter interface, enabling you to use TemplateProcessor // as part of a higher-level ResourceListProcessor like VersionedAPIProcessor. // It sets up all the features of TemplateProcessors as a pipeline of filters and executes them. func (tp TemplateProcessor) Filter(items []*yaml.RNode) ([]*yaml.RNode, error) { if tp.AdditionalSchemas != nil { - defs, err := tp.AdditionalSchemas() + defs, err := tp.AdditionalSchemas.Parse() if err != nil { return nil, errors.WrapPrefixf(err, "parsing AdditionalSchemas") } @@ -260,10 +259,6 @@ func (tp TemplateProcessor) Process(rl *ResourceList) error { return errors.Wrap(rl.Filter(tp)) } -// TemplatesFunc is a function that provides a list of templates. -// TemplateProcessor uses this to defer loading of templates to the point where they are used. -type TemplatesFunc func() ([]*template.Template, error) - // PatchTemplate is implemented by kio.Filters that work by rendering patches and applying them to // the given resource nodes. type PatchTemplate interface { @@ -350,169 +345,3 @@ func (tp *TemplateProcessor) doPatchTemplates(items []*yaml.RNode) ([]*yaml.RNod } return items, nil } - -// StringTemplates returns a TemplatesFunc that will generate templates from the provided strings. -// This is a helper to facilitate providing ResourceTemplates, PatchTemplates and -// ContainerPatchTemplates to a TemplateProcessor. -func StringTemplates(data ...string) TemplatesFunc { - return func() ([]*template.Template, error) { - var templates []*template.Template - for i := range data { - t, err := template.New(fmt.Sprintf("inline%d", i)).Parse(data[i]) - if err != nil { - return nil, err - } - templates = append(templates, t) - } - return templates, nil - } -} - -// TemplatesFromFile returns a TemplatesFunc that will generate templates from the provided files. -// Paths must be absolute using the module root as the filesystem root: -// TemplatesFromFile(filepath.FromSlash("/kyaml/fn/framework/templates/foo.template.yaml")). -// This function works with pkger-embedded static files. To use pkger's auto-detection feature: -// TemplatesFromFile(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/templates/foo.template.yaml"))) -// This is a helper to facilitate providing ResourceTemplates, PatchTemplates and -// ContainerPatchTemplates to a TemplateProcessor. -func TemplatesFromFile(files ...string) TemplatesFunc { - return func() ([]*template.Template, error) { - var templates []*template.Template - for i := range files { - t, err := parseTemplate(files[i]) - if err != nil { - return nil, err - } - templates = append(templates, t) - } - return templates, nil - } -} - -func parseTemplate(filename string) (*template.Template, error) { - f, err := pkger.Open(filename) - if err != nil { - return nil, err - } - defer f.Close() - bs, err := ioutil.ReadAll(f) - if err != nil { - return nil, err - } - - t, err := template.New(filepath.Base(filename)).Parse(string(bs)) - if err != nil { - return nil, err - } - return t, nil -} - -// TemplatesFromDir returns a TemplatesFunc that will generate templates from the provided -// directories. Only files suffixed with .template.yaml will be included. -// Paths must be absolute using the module root as the filesystem root: -// TemplatesFromDir(filepath.FromSlash("/kyaml/fn/framework/templates")). -// This function works with pkger-embedded static dirs. To use pkger's auto-detection feature: -// TemplatesFromDir(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/templates"))) -// This is a helper to facilitate providing ResourceTemplates, PatchTemplates and -// ContainerPatchTemplates to a TemplateProcessor. -func TemplatesFromDir(dirs ...string) TemplatesFunc { - return func() ([]*template.Template, error) { - var pt []*template.Template - for _, dir := range dirs { - err := pkger.Walk(dir, func(p string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if !strings.HasSuffix(info.Name(), ".template.yaml") { - return nil - } - t, err := parseTemplate(path.Join(dir, info.Name())) - if err != nil { - return err - } - - pt = append(pt, t) - return nil - }) - if err != nil { - return nil, err - } - } - return pt, nil - } -} - -// SchemaDefinitionsFromFile returns a SchemaDefinitionFunc that will load schemas from the provided files. -// Paths must be absolute using the module root as the filesystem root: -// SchemaDefinitionsFromFile(filepath.FromSlash("/kyaml/fn/framework/foo/schema.json")). -// This function works with pkger-embedded static files. To use pkger's auto-detection feature: -// SchemaDefinitionsFromFile(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/foo/schema.json"))) -// This is a helper to facilitate providing custom resource schemas to a TemplateProcessor. -func SchemaDefinitionsFromFile(files ...string) SchemaDefinitionFunc { - return func() ([]*spec.Definitions, error) { - var defs []*spec.Definitions - for _, filename := range files { - def, err := readSchemaJSON(filename) - if err != nil { - return nil, err - } - defs = append(defs, &def) - } - return defs, nil - } -} - -// SchemaDefinitionsFromDir returns a SchemaDefinitionFunc that will load schemas from the provided directories. -// Paths must be absolute using the module root as the filesystem root: -// SchemaDefinitionsFromDir(filepath.FromSlash("/kyaml/fn/framework/schemas")). -// This function works with pkger-embedded static dirs. To use pkger's auto-detection feature: -// SchemaDefinitionsFromDir(filepath.FromSlash(pkger.Include("/kyaml/fn/framework/schemas"))) -// This is a helper to facilitate providing custom resource schemas to a TemplateProcessor. -func SchemaDefinitionsFromDir(dirs ...string) SchemaDefinitionFunc { - return func() ([]*spec.Definitions, error) { - var defs []*spec.Definitions - for _, dir := range dirs { - err := pkger.Walk(dir, func(p string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if !strings.HasSuffix(info.Name(), ".json") { - return nil - } - def, err := readSchemaJSON(path.Join(dir, info.Name())) - if err != nil { - return err - } - defs = append(defs, &def) - return nil - }) - if err != nil { - return nil, err - } - } - return defs, nil - } -} - -func readSchemaJSON(filename string) (spec.Definitions, error) { - f, err := pkger.Open(filename) - if err != nil { - return nil, err - } - defer f.Close() - b, err := ioutil.ReadAll(f) - if err != nil { - return nil, err - } - - var schema spec.Schema - err = schema.UnmarshalJSON(b) - if err != nil { - return nil, err - } - - if schema.Definitions != nil { - return schema.Definitions, nil - } - return nil, errors.Errorf("schema did not contain any definitions") -} diff --git a/kyaml/fn/framework/processors_test.go b/kyaml/fn/framework/processors_test.go index d010ec66a..950b725fa 100644 --- a/kyaml/fn/framework/processors_test.go +++ b/kyaml/fn/framework/processors_test.go @@ -5,14 +5,13 @@ package framework_test import ( "bytes" - "path/filepath" "strings" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/kube-openapi/pkg/validation/spec" "sigs.k8s.io/kustomize/kyaml/errors" + "sigs.k8s.io/kustomize/kyaml/fn/framework/parser" "sigs.k8s.io/kustomize/kyaml/openapi" "sigs.k8s.io/kustomize/kyaml/yaml" @@ -28,8 +27,7 @@ func TestTemplateProcessor_ResourceTemplates(t *testing.T) { p := framework.TemplateProcessor{ TemplateData: &API{}, ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.TemplatesFromDir( - filepath.FromSlash("/fn/framework/testdata/template-processor/templates/basic")), + Templates: parser.TemplateFiles("testdata/template-processor/templates/basic"), }}, } @@ -82,14 +80,13 @@ func TestTemplateProcessor_PatchTemplates(t *testing.T) { PatchTemplates: []framework.PatchTemplate{ // Patch from dir with no selector templating &framework.ResourcePatchTemplate{ - Templates: framework.TemplatesFromDir(filepath.FromSlash( - "/fn/framework/testdata/template-processor/patches/basic")), - Selector: &framework.Selector{Names: []string{"foo"}}, + Templates: parser.TemplateFiles("testdata/template-processor/patches/basic"), + Selector: &framework.Selector{Names: []string{"foo"}}, }, // Patch from string with selector templating &framework.ResourcePatchTemplate{ Selector: &framework.Selector{Names: []string{"{{.Spec.A}}"}, TemplateData: &config}, - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` metadata: annotations: baz: buz @@ -179,14 +176,13 @@ func TestTemplateProcessor_ContainerPatchTemplates(t *testing.T) { PatchTemplates: []framework.PatchTemplate{ // patch from dir with no selector templating &framework.ContainerPatchTemplate{ - Templates: framework.TemplatesFromDir(filepath.FromSlash( - "/fn/framework/testdata/template-processor/container-patches")), - Selector: &framework.Selector{Names: []string{"foo"}}, + Templates: parser.TemplateFiles("testdata/template-processor/container-patches"), + Selector: &framework.Selector{Names: []string{"foo"}}, }, // patch from string with selector templating &framework.ContainerPatchTemplate{ Selector: &framework.Selector{Names: []string{"{{.Spec.A}}"}, TemplateData: &config}, - Templates: framework.StringTemplates(` + Templates: parser.TemplateStrings(` env: - name: Foo value: Bar @@ -430,7 +426,7 @@ func TestTemplateProcessor_Process_Error(t *testing.T) { processor: framework.TemplateProcessor{ PatchTemplates: []framework.PatchTemplate{ &framework.ResourcePatchTemplate{ - Templates: framework.StringTemplates(`aString + Templates: parser.TemplateStrings(`aString another`), }}, }, @@ -444,7 +440,7 @@ another`), processor: framework.TemplateProcessor{ PatchTemplates: []framework.PatchTemplate{ &framework.ResourcePatchTemplate{ - Templates: framework.StringTemplates("foo: {{ .OOPS }}"), + Templates: parser.TemplateStrings("foo: {{ .OOPS }}"), }}, }, wantErr: "can't evaluate field OOPS", @@ -454,7 +450,7 @@ another`), processor: framework.TemplateProcessor{ PatchTemplates: []framework.PatchTemplate{ &framework.ContainerPatchTemplate{ - Templates: framework.StringTemplates(`aString + Templates: parser.TemplateStrings(`aString another`), }}, }, @@ -468,7 +464,7 @@ another`), processor: framework.TemplateProcessor{ PatchTemplates: []framework.PatchTemplate{ &framework.ContainerPatchTemplate{ - Templates: framework.StringTemplates("foo: {{ .OOPS }}"), + Templates: parser.TemplateStrings("foo: {{ .OOPS }}"), }}, }, wantErr: "can't evaluate field OOPS", @@ -477,7 +473,7 @@ another`), name: "ResourceTemplate is not a resource", processor: framework.TemplateProcessor{ ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.StringTemplates(`aString + Templates: parser.TemplateStrings(`aString another`), }}, }, @@ -490,7 +486,7 @@ another`), name: "ResourceTemplate is invalid template", processor: framework.TemplateProcessor{ ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.StringTemplates("foo: {{ .OOPS }}"), + Templates: parser.TemplateStrings("foo: {{ .OOPS }}"), }}, }, wantErr: "can't evaluate field OOPS", @@ -530,24 +526,13 @@ spec: func TestTemplateProcessor_AdditionalSchemas(t *testing.T) { p := framework.TemplateProcessor{ - AdditionalSchemas: func() ([]*spec.Definitions, error) { - // This adds the same thing twice, just to exercise both the ...FromDir and the ...FromFile helpers - c1, err := framework.SchemaDefinitionsFromDir(filepath.FromSlash("/fn/framework/testdata/template-processor/schemas"))() - if err != nil { - return nil, errors.WrapPrefixf(err, "schema from dir") - } - c2, err := framework.SchemaDefinitionsFromFile(filepath.FromSlash("/fn/framework/testdata/template-processor/schemas/foo.json"))() - if err != nil { - return nil, errors.WrapPrefixf(err, "schema from file") - } - return append(c1, c2...), nil - }, + AdditionalSchemas: parser.SchemaFiles("testdata/template-processor/schemas"), ResourceTemplates: []framework.ResourceTemplate{{ - Templates: framework.TemplatesFromFile(filepath.FromSlash("/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml")), + Templates: parser.TemplateFiles("testdata/template-processor/templates/custom-resource/foo.template.yaml"), }}, PatchTemplates: []framework.PatchTemplate{ &framework.ResourcePatchTemplate{ - Templates: framework.TemplatesFromFile(filepath.FromSlash("/fn/framework/testdata/template-processor/patches/custom-resource/patch.template.yaml"))}, + Templates: parser.TemplateFiles("testdata/template-processor/patches/custom-resource/patch.template.yaml")}, }, } out := new(bytes.Buffer) diff --git a/kyaml/fn/framework/template.go b/kyaml/fn/framework/template.go index ee7546d9d..6416b3a5c 100644 --- a/kyaml/fn/framework/template.go +++ b/kyaml/fn/framework/template.go @@ -15,13 +15,23 @@ import ( // ResourceTemplate generates resources from templates. type ResourceTemplate struct { - // Templates is a function that returns a list of templates to render into one or more resources. - Templates TemplatesFunc + // Templates provides a list of templates to render into one or more resources. + Templates TemplateParser // TemplateData is the data to use when rendering the templates provided by the Templates field. TemplateData interface{} } +type TemplateParser interface { + Parse() ([]*template.Template, error) +} + +type TemplateParserFunc func() ([]*template.Template, error) + +func (s TemplateParserFunc) Parse() ([]*template.Template, error) { + return s() +} + // DefaultTemplateData sets TemplateData to the provided default values if it has not already // been set. func (rt *ResourceTemplate) DefaultTemplateData(data interface{}) { @@ -38,7 +48,7 @@ func (rt *ResourceTemplate) Render() ([]*yaml.RNode, error) { return items, nil } - templates, err := rt.Templates() + templates, err := rt.Templates.Parse() if err != nil { return nil, errors.WrapPrefixf(err, "failed to retrieve ResourceTemplates") } diff --git a/kyaml/fn/framework/testdata/example/templatefiles/deployment.template b/kyaml/fn/framework/testdata/example/templatefiles/deployment.template.yaml similarity index 60% rename from kyaml/fn/framework/testdata/example/templatefiles/deployment.template rename to kyaml/fn/framework/testdata/example/templatefiles/deployment.template.yaml index cdf9df435..87a5a7ad4 100644 --- a/kyaml/fn/framework/testdata/example/templatefiles/deployment.template +++ b/kyaml/fn/framework/testdata/example/templatefiles/deployment.template.yaml @@ -1,3 +1,6 @@ +# Copyright 2021 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml b/kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.template.yaml similarity index 100% rename from kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.yaml rename to kyaml/fn/framework/testdata/template-processor/templates/custom-resource/foo.template.yaml diff --git a/kyaml/go.mod b/kyaml/go.mod index 01e74c372..d5f040200 100644 --- a/kyaml/go.mod +++ b/kyaml/go.mod @@ -7,7 +7,6 @@ require ( github.com/go-errors/errors v1.0.1 github.com/google/go-cmp v0.4.0 github.com/mailru/easyjson v0.7.0 // indirect - github.com/markbates/pkger v0.17.1 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 github.com/pkg/errors v0.9.1 github.com/sergi/go-diff v1.1.0 diff --git a/kyaml/go.sum b/kyaml/go.sum index 3a5c38cf2..6d1920b01 100644 --- a/kyaml/go.sum +++ b/kyaml/go.sum @@ -46,8 +46,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -96,8 +94,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= @@ -219,7 +215,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/annotationstransformer/go.sum b/plugin/builtin/annotationstransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/annotationstransformer/go.sum +++ b/plugin/builtin/annotationstransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/configmapgenerator/go.sum b/plugin/builtin/configmapgenerator/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/configmapgenerator/go.sum +++ b/plugin/builtin/configmapgenerator/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/hashtransformer/go.sum b/plugin/builtin/hashtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/hashtransformer/go.sum +++ b/plugin/builtin/hashtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/helmchartinflationgenerator/go.sum b/plugin/builtin/helmchartinflationgenerator/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/helmchartinflationgenerator/go.sum +++ b/plugin/builtin/helmchartinflationgenerator/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/imagetagtransformer/go.sum b/plugin/builtin/imagetagtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/imagetagtransformer/go.sum +++ b/plugin/builtin/imagetagtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/labeltransformer/go.sum b/plugin/builtin/labeltransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/labeltransformer/go.sum +++ b/plugin/builtin/labeltransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/legacyordertransformer/go.sum b/plugin/builtin/legacyordertransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/legacyordertransformer/go.sum +++ b/plugin/builtin/legacyordertransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/namespacetransformer/go.sum b/plugin/builtin/namespacetransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/namespacetransformer/go.sum +++ b/plugin/builtin/namespacetransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/patchjson6902transformer/go.sum b/plugin/builtin/patchjson6902transformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/patchjson6902transformer/go.sum +++ b/plugin/builtin/patchjson6902transformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/patchstrategicmergetransformer/go.sum b/plugin/builtin/patchstrategicmergetransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/patchstrategicmergetransformer/go.sum +++ b/plugin/builtin/patchstrategicmergetransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/patchtransformer/go.sum b/plugin/builtin/patchtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/patchtransformer/go.sum +++ b/plugin/builtin/patchtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/prefixsuffixtransformer/go.sum b/plugin/builtin/prefixsuffixtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/prefixsuffixtransformer/go.sum +++ b/plugin/builtin/prefixsuffixtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/replacementtransformer/go.sum b/plugin/builtin/replacementtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/replacementtransformer/go.sum +++ b/plugin/builtin/replacementtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/replicacounttransformer/go.sum b/plugin/builtin/replicacounttransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/replicacounttransformer/go.sum +++ b/plugin/builtin/replicacounttransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/secretgenerator/go.sum b/plugin/builtin/secretgenerator/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/secretgenerator/go.sum +++ b/plugin/builtin/secretgenerator/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/builtin/valueaddtransformer/go.sum b/plugin/builtin/valueaddtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/builtin/valueaddtransformer/go.sum +++ b/plugin/builtin/valueaddtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/go.sum b/plugin/someteam.example.com/v1/bashedconfigmap/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/go.sum +++ b/plugin/someteam.example.com/v1/bashedconfigmap/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/calvinduplicator/go.sum b/plugin/someteam.example.com/v1/calvinduplicator/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/calvinduplicator/go.sum +++ b/plugin/someteam.example.com/v1/calvinduplicator/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.sum b/plugin/someteam.example.com/v1/dateprefixer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/go.sum +++ b/plugin/someteam.example.com/v1/dateprefixer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/printpluginenv/go.sum b/plugin/someteam.example.com/v1/printpluginenv/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/printpluginenv/go.sum +++ b/plugin/someteam.example.com/v1/printpluginenv/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum b/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/sedtransformer/go.sum b/plugin/someteam.example.com/v1/sedtransformer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/go.sum +++ b/plugin/someteam.example.com/v1/sedtransformer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/someservicegenerator/go.sum b/plugin/someteam.example.com/v1/someservicegenerator/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/go.sum +++ b/plugin/someteam.example.com/v1/someservicegenerator/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/starlarkmixer/go.sum b/plugin/someteam.example.com/v1/starlarkmixer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/starlarkmixer/go.sum +++ b/plugin/someteam.example.com/v1/starlarkmixer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.sum b/plugin/someteam.example.com/v1/stringprefixer/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/go.sum +++ b/plugin/someteam.example.com/v1/stringprefixer/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/someteam.example.com/v1/validator/go.sum b/plugin/someteam.example.com/v1/validator/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/someteam.example.com/v1/validator/go.sum +++ b/plugin/someteam.example.com/v1/validator/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/plugin/untested/v1/gogetter/go.sum b/plugin/untested/v1/gogetter/go.sum index 3fefa5f4f..4e375cb8a 100644 --- a/plugin/untested/v1/gogetter/go.sum +++ b/plugin/untested/v1/gogetter/go.sum @@ -47,7 +47,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -98,7 +97,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -216,7 +214,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=