diff --git a/contrib/functions/ts/sops/package-lock.json b/contrib/functions/ts/sops/package-lock.json index 31910cb3f..b0054aec0 100644 --- a/contrib/functions/ts/sops/package-lock.json +++ b/contrib/functions/ts/sops/package-lock.json @@ -73,7 +73,7 @@ "tsutils": "^3.5.0" }, "peerDependencies": { - "tslint": "^5.0.0", + "tslint": "^6.1.3", "typescript": ">= 3.3.0 || >= 3.6.0-dev || >= 3.7.0-dev" } }, @@ -2466,7 +2466,7 @@ "tsutils": "^2.29.0" }, "peerDependencies": { - "tslint": "^5.0.0", + "tslint": "^6.1.3", "typescript": ">=2.1.4 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >=3.1.0-dev || >=3.2.0-dev || >=3.3.0-dev || >=3.4.0-dev" } }, diff --git a/examples/apply-replacements-simple/README.md b/examples/apply-replacements-simple/README.md index 36e55d497..4c804c159 100644 --- a/examples/apply-replacements-simple/README.md +++ b/examples/apply-replacements-simple/README.md @@ -48,7 +48,7 @@ $ kpt fn render apply-replacements-simple ### Expected result -`job.yaml` should now have the following conents: +`job.yaml` should now have the following contents: ```yaml apiVersion: batch/v1 diff --git a/functions/go/apply-replacements/generated/docs.go b/functions/go/apply-replacements/generated/docs.go index 56163be92..d27f5c26a 100644 --- a/functions/go/apply-replacements/generated/docs.go +++ b/functions/go/apply-replacements/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/apply-setters/applysetters/apply_setters.go b/functions/go/apply-setters/applysetters/apply_setters.go index ae101ff27..0bcee7a4f 100644 --- a/functions/go/apply-setters/applysetters/apply_setters.go +++ b/functions/go/apply-setters/applysetters/apply_setters.go @@ -82,7 +82,6 @@ For input ApplySetters [name: env, value: "[stage, prod]"], qthe yaml node is tr environments: # kpt-set: ${env} - stage - prod - */ func (as *ApplySetters) visitMapping(object *yaml.RNode, path string) error { return object.VisitFields(func(node *yaml.MapNode) error { @@ -180,15 +179,16 @@ e.g.for input of scalar node 'nginx:1.7.1 # kpt-set: ${image}:${tag}' in the yam apiVersion: v1 ... - image: nginx:1.7.1 # kpt-set: ${image}:${tag} + + image: nginx:1.7.1 # kpt-set: ${image}:${tag} and for input ApplySetters [[name: image, value: ubuntu], [name: tag, value: 1.8.0]] The yaml node is transformed to apiVersion: v1 ... - image: ubuntu:1.8.0 # kpt-set: ${image}:${tag} + image: ubuntu:1.8.0 # kpt-set: ${image}:${tag} */ func (as *ApplySetters) visitScalar(object *yaml.RNode, path string) error { if object.IsNil() { diff --git a/functions/go/apply-setters/applysetters/apply_setters_test.go b/functions/go/apply-setters/applysetters/apply_setters_test.go index 89a72ad2a..861adf3b6 100644 --- a/functions/go/apply-setters/applysetters/apply_setters_test.go +++ b/functions/go/apply-setters/applysetters/apply_setters_test.go @@ -1,7 +1,6 @@ package applysetters import ( - "io/ioutil" "os" "testing" @@ -438,18 +437,18 @@ roles: # kpt-set: ${roles} for i := range tests { test := tests[i] t.Run(test.name, func(t *testing.T) { - baseDir, err := ioutil.TempDir("", "") + baseDir, err := os.MkdirTemp("", "") if !assert.NoError(t, err) { t.FailNow() } defer os.RemoveAll(baseDir) - r, err := ioutil.TempFile(baseDir, "k8s-cli-*.yaml") + r, err := os.CreateTemp(baseDir, "k8s-cli-*.yaml") if !assert.NoError(t, err) { t.FailNow() } defer os.Remove(r.Name()) - err = ioutil.WriteFile(r.Name(), []byte(test.input), 0600) + err = os.WriteFile(r.Name(), []byte(test.input), 0600) if !assert.NoError(t, err) { t.FailNow() } @@ -486,7 +485,7 @@ roles: # kpt-set: ${roles} t.FailNow() } - actualResources, err := ioutil.ReadFile(r.Name()) + actualResources, err := os.ReadFile(r.Name()) if !assert.NoError(t, err) { t.FailNow() } diff --git a/functions/go/apply-setters/generated/docs.go b/functions/go/apply-setters/generated/docs.go index 181f319c6..aa93fbc28 100644 --- a/functions/go/apply-setters/generated/docs.go +++ b/functions/go/apply-setters/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated @@ -83,7 +81,7 @@ Invoke the function: Alternatively, setter values can be passed as key-value pairs in the CLI - $ kpt fn eval --image gcr.io/kpt-fn/apply-setters:unstable -- image=ubuntu replicas=3 + $ kpt fn eval --image gcr.io/kpt-fn/apply-setters:unstable -- tag=1.16.2 nginx-replicas=3 Modified resource looks like the following: diff --git a/functions/go/apply-setters/main.go b/functions/go/apply-setters/main.go index ad8fbf5d5..87b2ee1d5 100644 --- a/functions/go/apply-setters/main.go +++ b/functions/go/apply-setters/main.go @@ -11,7 +11,7 @@ import ( kyaml "sigs.k8s.io/kustomize/kyaml/yaml" ) -//nolint +// nolint func main() { asp := ApplySettersProcessor{} cmd := command.Build(&asp, command.StandaloneEnabled, false) diff --git a/functions/go/create-setters/createsetters/create_setters.go b/functions/go/create-setters/createsetters/create_setters.go index ffdf50a90..2a8328736 100644 --- a/functions/go/create-setters/createsetters/create_setters.go +++ b/functions/go/create-setters/createsetters/create_setters.go @@ -99,7 +99,8 @@ func (cs *CreateSetters) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) { return nodes, nil } -/** +/* +* preProcessScalarSetters simplifies the process of setting comments for scalar values by creating a *strings.Replacer e.g., For Scalar Setters [[name: image, value: nginx], [name: env, value: dev]]., @@ -116,7 +117,8 @@ func (cs *CreateSetters) preProcessScalarSetters() { cs.replacer = strings.NewReplacer(replacerArgs...) } -/** +/* +* visitMapping takes the mapping node and performs following steps, checks if it is a sequence node checks if all the values in the node match any of the ArraySetters @@ -217,7 +219,8 @@ func (cs *CreateSetters) visitMapping(object *yaml.RNode, path string) error { }) } -/** +/* +* visitScalar accepts the input scalar node and performs following steps, checks if it is a scalar node adds the linecomment if it's value matches with any of the setter @@ -226,16 +229,18 @@ e.g.for input of scalar node 'nginx:1.7.1' in the yaml node apiVersion: v1 ... - env: dev - image: nginx:1.7.1 + + env: dev + image: nginx:1.7.1 and for input CreateSetters [[name: image, value: nginx], [name: env, value: dev], [name: tag, value: 1.7.1]] The yaml node is transformed to apiVersion: v1 ... - env: dev # kpt-set: ${env} - image: nginx:1.7.1 # kpt-set: ${image}:${tag} + + env: dev # kpt-set: ${env} + image: nginx:1.7.1 # kpt-set: ${image}:${tag} */ func (cs *CreateSetters) visitScalar(object *yaml.RNode, path string) error { if object.YNode().Kind != yaml.ScalarNode { @@ -312,7 +317,8 @@ func hasMatchValue(nodeValues []string, setters []ScalarSetter) bool { return false } -/** +/* +* getLineComment checks if any of the setters value matches with the node value replaces that part of the node value with the ${setterName} e.g.for input of scalar node 'nginx:1.7.1' in the yaml node @@ -339,22 +345,27 @@ func getLineComment(nodeValue string, replacer *strings.Replacer) (string, bool) return output, valueMatch } -/** +/* +* Decode decodes the input yaml node into CreatSetters struct places the setter either in ScalarSetters or ArraySetters sorts the ScalarSetters using CompareSetters e.g.for input ScalarSetters - [[name: image, value: nginx], [name: ubuntu, value: nginx-abc]] + + [[name: image, value: nginx], [name: ubuntu, value: nginx-abc]] for scalar node: - spec: nginx-development + + spec: nginx-development Sorts the ScalarSetters to avoid following case of substrings - spec: nginx-abc-development # kpt-set: ${image}-abc-development + + spec: nginx-abc-development # kpt-set: ${image}-abc-development ScalarSetters array is transformed to - [[name: ubuntu, value: nginx-abc], [name: image, value: nginx]] + + [[name: ubuntu, value: nginx-abc], [name: image, value: nginx]] */ func Decode(rn *yaml.RNode, fcd *CreateSetters) error { if len(rn.GetDataMap()) == 0 { diff --git a/functions/go/create-setters/createsetters/create_setters_test.go b/functions/go/create-setters/createsetters/create_setters_test.go index 1f7b81781..04b975af1 100644 --- a/functions/go/create-setters/createsetters/create_setters_test.go +++ b/functions/go/create-setters/createsetters/create_setters_test.go @@ -2,7 +2,6 @@ package createsetters import ( "fmt" - "io/ioutil" "os" "sort" "strings" @@ -525,18 +524,18 @@ spec: for i := range tests { test := tests[i] t.Run(test.name, func(t *testing.T) { - baseDir, err := ioutil.TempDir("", "") + baseDir, err := os.MkdirTemp("", "") if !assert.NoError(t, err) { t.FailNow() } defer os.RemoveAll(baseDir) - r, err := ioutil.TempFile(baseDir, "k8s-cli-*.yaml") + r, err := os.CreateTemp(baseDir, "k8s-cli-*.yaml") if !assert.NoError(t, err) { t.FailNow() } defer os.Remove(r.Name()) - err = ioutil.WriteFile(r.Name(), []byte(test.input), 0600) + err = os.WriteFile(r.Name(), []byte(test.input), 0600) if !assert.NoError(t, err) { t.FailNow() } @@ -584,7 +583,7 @@ spec: t.FailNow() } - actualResources, err := ioutil.ReadFile(r.Name()) + actualResources, err := os.ReadFile(r.Name()) if !assert.NoError(t, err) { t.FailNow() } diff --git a/functions/go/create-setters/generated/docs.go b/functions/go/create-setters/generated/docs.go index cab15fe39..f8f526e84 100644 --- a/functions/go/create-setters/generated/docs.go +++ b/functions/go/create-setters/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/create-setters/main.go b/functions/go/create-setters/main.go index fd33172d1..232777b21 100644 --- a/functions/go/create-setters/main.go +++ b/functions/go/create-setters/main.go @@ -11,7 +11,7 @@ import ( kyaml "sigs.k8s.io/kustomize/kyaml/yaml" ) -//nolint +// nolint func main() { csp := CreateSettersProcessor{} cmd := command.Build(&csp, command.StandaloneEnabled, false) diff --git a/functions/go/enable-gcp-services/gcpservices/project_service_set_test.go b/functions/go/enable-gcp-services/gcpservices/project_service_set_test.go index afefb9f9c..7b5ca885f 100644 --- a/functions/go/enable-gcp-services/gcpservices/project_service_set_test.go +++ b/functions/go/enable-gcp-services/gcpservices/project_service_set_test.go @@ -2,7 +2,6 @@ package gcpservices import ( "bytes" - "io/ioutil" "os" "path" "testing" @@ -709,14 +708,14 @@ metadata: func setupInputs(t *testing.T, resourceMap map[string]string) string { t.Helper() require := require.New(t) - baseDir, err := ioutil.TempDir("", "") + baseDir, err := os.MkdirTemp("", "") require.NoError(err) for rpath, data := range resourceMap { filePath := path.Join(baseDir, rpath) err = os.MkdirAll(path.Dir(filePath), os.ModePerm) require.NoError(err) - err = ioutil.WriteFile(path.Join(baseDir, rpath), []byte(data), 0644) + err = os.WriteFile(path.Join(baseDir, rpath), []byte(data), 0644) require.NoError(err) } return baseDir diff --git a/functions/go/enable-gcp-services/generated/docs.go b/functions/go/enable-gcp-services/generated/docs.go index 2a24475af..161f6e753 100644 --- a/functions/go/enable-gcp-services/generated/docs.go +++ b/functions/go/enable-gcp-services/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/enable-gcp-services/main.go b/functions/go/enable-gcp-services/main.go index be83e9902..b269ea65a 100644 --- a/functions/go/enable-gcp-services/main.go +++ b/functions/go/enable-gcp-services/main.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/fn/framework/command" ) -//nolint +// nolint func main() { psf := ProjectServiceSetFunction{} cmd := command.Build(&psf, command.StandaloneEnabled, false) diff --git a/functions/go/ensure-name-substring/generated/docs.go b/functions/go/ensure-name-substring/generated/docs.go index 97706ab4c..2f4cb611f 100644 --- a/functions/go/ensure-name-substring/generated/docs.go +++ b/functions/go/ensure-name-substring/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/ensure-name-substring/nameref/nameref.go b/functions/go/ensure-name-substring/nameref/nameref.go index 8c6433d05..a96783297 100644 --- a/functions/go/ensure-name-substring/nameref/nameref.go +++ b/functions/go/ensure-name-substring/nameref/nameref.go @@ -40,7 +40,6 @@ type nameReferenceConfig struct { // // If the Deployment's name changes, e.g. a prefix is added, // then the HPA's reference to the Deployment must be fixed. -// func FixNameBackReference(m resmap.ResMap) error { c, err := getDefaultConfig() if err != nil { diff --git a/functions/go/export-terraform/generated/docs.go b/functions/go/export-terraform/generated/docs.go index 0b58d0c37..a8193ef7e 100644 --- a/functions/go/export-terraform/generated/docs.go +++ b/functions/go/export-terraform/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/export-terraform/terraformgenerator/terraform_generator_test.go b/functions/go/export-terraform/terraformgenerator/terraform_generator_test.go index 61e9d574d..0dd8289dd 100644 --- a/functions/go/export-terraform/terraformgenerator/terraform_generator_test.go +++ b/functions/go/export-terraform/terraformgenerator/terraform_generator_test.go @@ -16,7 +16,6 @@ package terraformgenerator import ( "fmt" - "io/ioutil" "os" "path" "path/filepath" @@ -95,7 +94,7 @@ func TestTerraformGeneration(t *testing.T) { require.NoError(err) // round-trip to disk to make sure all annotations are consistent - tmpDir, err := ioutil.TempDir("", "export-terraform-test-*") + tmpDir, err := os.MkdirTemp("", "export-terraform-test-*") defer os.RemoveAll(tmpDir) require.NoError(err) err = testutil.ResourceListToDirectory(tempRL, tmpDir) @@ -142,7 +141,7 @@ func TestTerraformGeneration(t *testing.T) { // diff command) to do it. This will be addressed in the next iteration. // The workaround is that we read the resource files as a ResourceList and // then compare this ResourceList with the expected ResourceList. - tmpDir, err := ioutil.TempDir("", "export-terraform-test-*") + tmpDir, err := os.MkdirTemp("", "export-terraform-test-*") defer os.RemoveAll(tmpDir) require.NoError(err) err = testutil.ResourceListToDirectory(actualRL, tmpDir) diff --git a/functions/go/fix/fixpkg/fix_test.go b/functions/go/fix/fixpkg/fix_test.go index c146f2fc5..73847f0f2 100644 --- a/functions/go/fix/fixpkg/fix_test.go +++ b/functions/go/fix/fixpkg/fix_test.go @@ -1,7 +1,6 @@ package fixpkg import ( - "io/ioutil" "os" "testing" @@ -12,7 +11,7 @@ import ( ) func TestFixV1alpha1ToV1(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") assert.NoError(t, err) defer os.RemoveAll(dir) err = copyutil.CopyDir("../../../../testdata/fix/nginx-v1alpha1", dir) @@ -57,7 +56,7 @@ func TestFixV1alpha1ToV1(t *testing.T) { } func TestFixV1alpha2ToV1(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") assert.NoError(t, err) defer os.RemoveAll(dir) err = copyutil.CopyDir("../../../../testdata/fix/nginx-v1alpha2", dir) diff --git a/functions/go/fix/generated/docs.go b/functions/go/fix/generated/docs.go index 5a6d2542a..3decd6c20 100644 --- a/functions/go/fix/generated/docs.go +++ b/functions/go/fix/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/fix/main.go b/functions/go/fix/main.go index aeb5618b9..f605e9103 100644 --- a/functions/go/fix/main.go +++ b/functions/go/fix/main.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/fn/framework/command" ) -//nolint +// nolint func main() { fp := FixProcessor{} cmd := command.Build(&fp, command.StandaloneEnabled, false) diff --git a/functions/go/format/generated/docs.go b/functions/go/format/generated/docs.go index 9a0469a9b..28f094192 100644 --- a/functions/go/format/generated/docs.go +++ b/functions/go/format/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/format/main.go b/functions/go/format/main.go index 890f31d29..acec94618 100644 --- a/functions/go/format/main.go +++ b/functions/go/format/main.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/kio/filters" ) -//nolint +// nolint func main() { asp := FormatProcessor{} cmd := command.Build(&asp, command.StandaloneEnabled, false) diff --git a/functions/go/gatekeeper/generated/docs.go b/functions/go/gatekeeper/generated/docs.go index 2a59d83f9..c128763f3 100644 --- a/functions/go/gatekeeper/generated/docs.go +++ b/functions/go/gatekeeper/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/gatekeeper/main.go b/functions/go/gatekeeper/main.go index 20037e523..d978a7f89 100644 --- a/functions/go/gatekeeper/main.go +++ b/functions/go/gatekeeper/main.go @@ -17,7 +17,6 @@ package main import ( "bytes" "fmt" - "io/ioutil" "os" "github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/gatekeeper/generated" @@ -82,7 +81,7 @@ func (gkp *GatekeeperProcessor) Process(resourceList *framework.ResourceList) er } func (gkp *GatekeeperProcessor) ProcessInput() error { - content, err := ioutil.ReadFile(gkp.input) + content, err := os.ReadFile(gkp.input) if err != nil { return fmt.Errorf("unable to process input: %w", err) } @@ -116,7 +115,7 @@ func (gkp *GatekeeperProcessor) ProcessOutput() error { } } - err = ioutil.WriteFile(gkp.output, content, 0644) + err = os.WriteFile(gkp.output, content, 0644) if err != nil { return fmt.Errorf("unable to process output: %w", err) } diff --git a/functions/go/generate-kpt-pkg-docs/generated/docs.go b/functions/go/generate-kpt-pkg-docs/generated/docs.go index 8a3b6b6c1..da063e7c3 100644 --- a/functions/go/generate-kpt-pkg-docs/generated/docs.go +++ b/functions/go/generate-kpt-pkg-docs/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/generate-kpt-pkg-docs/main.go b/functions/go/generate-kpt-pkg-docs/main.go index 5a30b8cd8..d56943c3f 100644 --- a/functions/go/generate-kpt-pkg-docs/main.go +++ b/functions/go/generate-kpt-pkg-docs/main.go @@ -3,7 +3,6 @@ package main import ( "errors" "fmt" - "io/ioutil" "os" "github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/generate-kpt-pkg-docs/docs" @@ -16,7 +15,7 @@ import ( const defaultReadmePath = "/tmp/README.md" const defaultRepoPath = "https://github.com/GoogleCloudPlatform/blueprints.git/catalog/" -//nolint +// nolint func main() { rp := ReadmeProcessor{} cmd := command.Build(&rp, command.StandaloneEnabled, false) @@ -34,7 +33,7 @@ type ReadmeProcessor struct{} func (rp *ReadmeProcessor) Process(resourceList *framework.ResourceList) error { readmePath, repoPath, pkgName := parseFnCfg(resourceList.FunctionConfig) - currentDoc, err := ioutil.ReadFile(readmePath) + currentDoc, err := os.ReadFile(readmePath) if err != nil { if errors.Is(err, os.ErrNotExist) { resourceList.Results = getResults(fmt.Sprintf("Skipping readme generation: %s", err), framework.Warning) @@ -60,7 +59,7 @@ func generateReadme(repoPath, readmePath, pkgName, currentDoc string, resourceLi if err != nil { return err } - err = ioutil.WriteFile(readmePath, []byte(readme), os.ModePerm) + err = os.WriteFile(readmePath, []byte(readme), os.ModePerm) if err != nil { return err } diff --git a/functions/go/list-setters/generated/docs.go b/functions/go/list-setters/generated/docs.go index f849c57e8..201df6e61 100644 --- a/functions/go/list-setters/generated/docs.go +++ b/functions/go/list-setters/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/list-setters/listsetters/list_setters.go b/functions/go/list-setters/listsetters/list_setters.go index 128f191cd..05d2060b5 100644 --- a/functions/go/list-setters/listsetters/list_setters.go +++ b/functions/go/list-setters/listsetters/list_setters.go @@ -148,7 +148,7 @@ func mergeSetters(a, b map[string]string) map[string]string { return merged } -//findSetterNode finds setter node from nodes +// findSetterNode finds setter node from nodes func findSetterNode(nodes []*yaml.RNode, path string) (*yaml.RNode, error) { for _, node := range nodes { np := node.GetAnnotations()[kioutil.PathAnnotation] @@ -188,7 +188,7 @@ func New() ListSetters { return ls } -//addKptfileSetters parses setters in fn config to ArraySetters or ScalarSetters +// addKptfileSetters parses setters in fn config to ArraySetters or ScalarSetters func (ls *ListSetters) addKptfileSetters(s map[string]string) { for setterName, setterValue := range s { v, err := getArraySetterValues(setterValue) diff --git a/functions/go/list-setters/listsetters/list_setters_test.go b/functions/go/list-setters/listsetters/list_setters_test.go index 3cf547df0..41793651f 100644 --- a/functions/go/list-setters/listsetters/list_setters_test.go +++ b/functions/go/list-setters/listsetters/list_setters_test.go @@ -1,7 +1,6 @@ package listsetters import ( - "io/ioutil" "os" "path" "testing" @@ -515,14 +514,14 @@ spec: func setupInputs(t *testing.T, resourceMap map[string]string) string { t.Helper() require := require.New(t) - baseDir, err := ioutil.TempDir("", "") + baseDir, err := os.MkdirTemp("", "") require.NoError(err) for rpath, data := range resourceMap { filePath := path.Join(baseDir, rpath) err = os.MkdirAll(path.Dir(filePath), os.ModePerm) require.NoError(err) - err = ioutil.WriteFile(path.Join(baseDir, rpath), []byte(data), 0644) + err = os.WriteFile(path.Join(baseDir, rpath), []byte(data), 0644) require.NoError(err) } return baseDir diff --git a/functions/go/list-setters/main.go b/functions/go/list-setters/main.go index ad397bbf6..3972b0937 100644 --- a/functions/go/list-setters/main.go +++ b/functions/go/list-setters/main.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/fn/framework/command" ) -//nolint +// nolint func main() { lsp := ListSettersProcessor{} cmd := command.Build(&lsp, command.StandaloneEnabled, false) diff --git a/functions/go/remove-local-config-resources/generated/docs.go b/functions/go/remove-local-config-resources/generated/docs.go index 338cc67f6..2a5e546ce 100644 --- a/functions/go/remove-local-config-resources/generated/docs.go +++ b/functions/go/remove-local-config-resources/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/remove-local-config-resources/main.go b/functions/go/remove-local-config-resources/main.go index 67dc43932..d24d3d0ca 100644 --- a/functions/go/remove-local-config-resources/main.go +++ b/functions/go/remove-local-config-resources/main.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/yaml" ) -//nolint +// nolint func main() { fp := RemoveLocalConfigResourcesConfigProcessor{} cmd := command.Build(&fp, command.StandaloneEnabled, false) diff --git a/functions/go/render-helm-chart/generated/docs.go b/functions/go/render-helm-chart/generated/docs.go index 9da1807ab..4803dce0c 100644 --- a/functions/go/render-helm-chart/generated/docs.go +++ b/functions/go/render-helm-chart/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/render-helm-chart/third_party/sigs.k8s.io/kustomize/api/builtins/HelmChartInflationGenerator.go b/functions/go/render-helm-chart/third_party/sigs.k8s.io/kustomize/api/builtins/HelmChartInflationGenerator.go index 7ea7d4f28..44486a53e 100644 --- a/functions/go/render-helm-chart/third_party/sigs.k8s.io/kustomize/api/builtins/HelmChartInflationGenerator.go +++ b/functions/go/render-helm-chart/third_party/sigs.k8s.io/kustomize/api/builtins/HelmChartInflationGenerator.go @@ -9,7 +9,7 @@ import ( "crypto/md5" "encoding/hex" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "os" @@ -50,7 +50,7 @@ var legalMergeOptions = []string{ valuesMergeOptionReplace, } -//noinspection GoUnusedGlobalVariable +// noinspection GoUnusedGlobalVariable var KustomizeHelmChartInflationGeneratorPlugin HelmChartInflationGeneratorPlugin func (p *HelmChartInflationGeneratorPlugin) establishTmpDir() (err error) { @@ -58,7 +58,7 @@ func (p *HelmChartInflationGeneratorPlugin) establishTmpDir() (err error) { // already done. return nil } - p.tmpDir, err = ioutil.TempDir("", "kustomize-helm-") + p.tmpDir, err = os.MkdirTemp("", "kustomize-helm-") return err } @@ -170,7 +170,7 @@ func (p *HelmChartInflationGeneratorPlugin) runHelmCommand( // createNewMergedValuesFiles replaces/merges original values file with ValuesInline. func (p *HelmChartInflationGeneratorPlugin) createNewMergedValuesFiles(path string) ( string, error) { - pValues, err := ioutil.ReadFile(path) + pValues, err := os.ReadFile(path) if err != nil { if u, urlErr := url.Parse(path); urlErr == nil { if u.Scheme == "http" || u.Scheme == "https" { @@ -179,7 +179,7 @@ func (p *HelmChartInflationGeneratorPlugin) createNewMergedValuesFiles(path stri return "", err } defer resp.Body.Close() - pValues, err = ioutil.ReadAll(resp.Body) + pValues, err = io.ReadAll(resp.Body) if err != nil { return "", err } @@ -241,7 +241,7 @@ func (p *HelmChartInflationGeneratorPlugin) writeValuesBytes( // use a hash of the provided path to generate a unique, valid filename hash := md5.Sum([]byte(path)) newPath := filepath.Join(p.tmpDir, p.Name+"-kustomize-values-"+hex.EncodeToString(hash[:])+".yaml") - return newPath, ioutil.WriteFile(newPath, b, 0644) + return newPath, os.WriteFile(newPath, b, 0644) } func (p *HelmChartInflationGeneratorPlugin) cleanup() { diff --git a/functions/go/search-replace/generated/docs.go b/functions/go/search-replace/generated/docs.go index 83147386c..0a5c4641f 100644 --- a/functions/go/search-replace/generated/docs.go +++ b/functions/go/search-replace/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/search-replace/main.go b/functions/go/search-replace/main.go index de7135e74..f14998182 100644 --- a/functions/go/search-replace/main.go +++ b/functions/go/search-replace/main.go @@ -11,7 +11,7 @@ import ( kyaml "sigs.k8s.io/kustomize/kyaml/yaml" ) -//nolint +// nolint func main() { srp := SearchReplaceProcessor{} cmd := command.Build(&srp, command.StandaloneEnabled, false) diff --git a/functions/go/search-replace/searchreplace/search_replace_test.go b/functions/go/search-replace/searchreplace/search_replace_test.go index 71fc4018a..d83882e73 100644 --- a/functions/go/search-replace/searchreplace/search_replace_test.go +++ b/functions/go/search-replace/searchreplace/search_replace_test.go @@ -1,7 +1,6 @@ package searchreplace import ( - "io/ioutil" "os" "path/filepath" "strings" @@ -26,18 +25,18 @@ func TestSearchCommand(t *testing.T) { for i := range tests { test := tests[i] t.Run(test.name, func(t *testing.T) { - baseDir, err := ioutil.TempDir("", "") + baseDir, err := os.MkdirTemp("", "") if !assert.NoError(t, err) { t.FailNow() } defer os.RemoveAll(baseDir) - r, err := ioutil.TempFile(baseDir, "k8s-cli-*.yaml") + r, err := os.CreateTemp(baseDir, "k8s-cli-*.yaml") if !assert.NoError(t, err) { t.FailNow() } defer os.Remove(r.Name()) - err = ioutil.WriteFile(r.Name(), []byte(test.input), 0600) + err = os.WriteFile(r.Name(), []byte(test.input), 0600) if !assert.NoError(t, err) { t.FailNow() } @@ -75,7 +74,7 @@ func TestSearchCommand(t *testing.T) { t.FailNow() } - actualResources, err := ioutil.ReadFile(r.Name()) + actualResources, err := os.ReadFile(r.Name()) if !assert.NoError(t, err) { t.FailNow() } diff --git a/functions/go/set-annotations/annotations_transformer.go b/functions/go/set-annotations/annotations_transformer.go index ae9d42156..d952b11a3 100644 --- a/functions/go/set-annotations/annotations_transformer.go +++ b/functions/go/set-annotations/annotations_transformer.go @@ -44,7 +44,7 @@ type AnnotationResultKey struct { // AnnotationValues represents annotation key/value pairs type AnnotationValues map[string]string -//noinspection GoUnusedGlobalVariable +// noinspection GoUnusedGlobalVariable var KustomizePlugin plugin func (p *plugin) Config( diff --git a/functions/go/set-annotations/generated/docs.go b/functions/go/set-annotations/generated/docs.go index 2fdaab9de..8cbb0f24a 100644 --- a/functions/go/set-annotations/generated/docs.go +++ b/functions/go/set-annotations/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/set-annotations/main.go b/functions/go/set-annotations/main.go index 02cd45970..cedb06c73 100644 --- a/functions/go/set-annotations/main.go +++ b/functions/go/set-annotations/main.go @@ -149,7 +149,7 @@ func newResMapFactory() *resmap.Factory { return resmap.NewFactory(resourceFactory) } -//nolint +// nolint func main() { asp := SetAnnotationsProcessor{} cmd := command.Build(&asp, command.StandaloneEnabled, false) diff --git a/functions/go/set-enforcement-action/generated/docs.go b/functions/go/set-enforcement-action/generated/docs.go index b48a4ee60..6399dbd0d 100644 --- a/functions/go/set-enforcement-action/generated/docs.go +++ b/functions/go/set-enforcement-action/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/set-enforcement-action/main.go b/functions/go/set-enforcement-action/main.go index 5254504f1..c26c48c3f 100644 --- a/functions/go/set-enforcement-action/main.go +++ b/functions/go/set-enforcement-action/main.go @@ -18,7 +18,7 @@ const ( dryRunActionValue = "dryrun" ) -//nolint +// nolint func main() { fp := SetEnforcementActionProcessor{} cmd := command.Build(&fp, command.StandaloneEnabled, false) diff --git a/functions/go/set-image/generated/docs.go b/functions/go/set-image/generated/docs.go index 9846a7283..9c805d59d 100644 --- a/functions/go/set-image/generated/docs.go +++ b/functions/go/set-image/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/set-image/third_party/sigs.k8s.io/kustomize/api/types/fieldspec.go b/functions/go/set-image/third_party/sigs.k8s.io/kustomize/api/types/fieldspec.go index 8d3579544..354216885 100644 --- a/functions/go/set-image/third_party/sigs.k8s.io/kustomize/api/types/fieldspec.go +++ b/functions/go/set-image/third_party/sigs.k8s.io/kustomize/api/types/fieldspec.go @@ -20,12 +20,13 @@ import ( // field path doesn't exist already. // // This would look like -// { -// group: apps -// kind: Deployment -// path: spec/template/metadata/labels -// create: true -// } +// +// { +// group: apps +// kind: Deployment +// path: spec/template/metadata/labels +// create: true +// } type FieldSpec struct { resid.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` Path string `json:"path,omitempty" yaml:"path,omitempty"` diff --git a/functions/go/set-labels/generated/docs.go b/functions/go/set-labels/generated/docs.go index 70f7e92fc..61be4db73 100644 --- a/functions/go/set-labels/generated/docs.go +++ b/functions/go/set-labels/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/set-labels/main.go b/functions/go/set-labels/main.go index 164f4f6c0..76a2a2593 100644 --- a/functions/go/set-labels/main.go +++ b/functions/go/set-labels/main.go @@ -18,7 +18,7 @@ import ( "os" ) -//nolint +// nolint func main() { if err := run(); err != nil { os.Exit(1) diff --git a/functions/go/set-namespace/generated/docs.go b/functions/go/set-namespace/generated/docs.go index d3cceb373..18fef1424 100644 --- a/functions/go/set-namespace/generated/docs.go +++ b/functions/go/set-namespace/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/set-namespace/main.go b/functions/go/set-namespace/main.go index 67ff57c51..c73ade963 100644 --- a/functions/go/set-namespace/main.go +++ b/functions/go/set-namespace/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/set-namespace/transformer/consts.go b/functions/go/set-namespace/transformer/consts.go index 30467136c..d9497ab34 100644 --- a/functions/go/set-namespace/transformer/consts.go +++ b/functions/go/set-namespace/transformer/consts.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/set-namespace/transformer/namespace.go b/functions/go/set-namespace/transformer/namespace.go index 8258ae7ae..18fb8bfd7 100644 --- a/functions/go/set-namespace/transformer/namespace.go +++ b/functions/go/set-namespace/transformer/namespace.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/set-project-id/generated/docs.go b/functions/go/set-project-id/generated/docs.go index ba3feb01c..631ca8b52 100644 --- a/functions/go/set-project-id/generated/docs.go +++ b/functions/go/set-project-id/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/source-gcloud-config/exec/gcloud.go b/functions/go/source-gcloud-config/exec/gcloud.go index 5c74b53fe..8624435d6 100644 --- a/functions/go/source-gcloud-config/exec/gcloud.go +++ b/functions/go/source-gcloud-config/exec/gcloud.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/source-gcloud-config/gcloudconfig/generator.go b/functions/go/source-gcloud-config/gcloudconfig/generator.go index fc0c5777c..016702c03 100644 --- a/functions/go/source-gcloud-config/gcloudconfig/generator.go +++ b/functions/go/source-gcloud-config/gcloudconfig/generator.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/source-gcloud-config/gcloudconfig/processor.go b/functions/go/source-gcloud-config/gcloudconfig/processor.go index 5bc47c212..e6394aa03 100644 --- a/functions/go/source-gcloud-config/gcloudconfig/processor.go +++ b/functions/go/source-gcloud-config/gcloudconfig/processor.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/source-gcloud-config/generated/docs.go b/functions/go/source-gcloud-config/generated/docs.go index 8b73a0312..96f043d42 100644 --- a/functions/go/source-gcloud-config/generated/docs.go +++ b/functions/go/source-gcloud-config/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/source-gcloud-config/main.go b/functions/go/source-gcloud-config/main.go index 0d10dc466..a35160871 100644 --- a/functions/go/source-gcloud-config/main.go +++ b/functions/go/source-gcloud-config/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/functions/go/starlark/generated/docs.go b/functions/go/starlark/generated/docs.go index 2d899c613..ba13be6da 100644 --- a/functions/go/starlark/generated/docs.go +++ b/functions/go/starlark/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/starlark/third_party/sigs.k8s.io/kustomize/kyaml/fn/runtime/starlark/starlark.go b/functions/go/starlark/third_party/sigs.k8s.io/kustomize/kyaml/fn/runtime/starlark/starlark.go index ef81407cd..b16f0b072 100644 --- a/functions/go/starlark/third_party/sigs.k8s.io/kustomize/kyaml/fn/runtime/starlark/starlark.go +++ b/functions/go/starlark/third_party/sigs.k8s.io/kustomize/kyaml/fn/runtime/starlark/starlark.go @@ -7,8 +7,8 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "net/http" + "os" "github.com/qri-io/starlib/util" "go.starlark.net/resolve" @@ -60,7 +60,7 @@ func (sf *Filter) setup() error { // read the program from a file if sf.Path != "" { - b, err := ioutil.ReadFile(sf.Path) + b, err := os.ReadFile(sf.Path) if err != nil { return err } @@ -75,7 +75,7 @@ func (sf *Filter) setup() error { return err } defer resp.Body.Close() - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) if err != nil { return err } diff --git a/functions/go/upsert-resource/generated/docs.go b/functions/go/upsert-resource/generated/docs.go index 42567f0d2..08d1c87b9 100644 --- a/functions/go/upsert-resource/generated/docs.go +++ b/functions/go/upsert-resource/generated/docs.go @@ -1,5 +1,3 @@ - - // Code generated by "mdtogo"; DO NOT EDIT. package generated diff --git a/functions/go/upsert-resource/main.go b/functions/go/upsert-resource/main.go index 3f52bc9b9..1cfe8f185 100644 --- a/functions/go/upsert-resource/main.go +++ b/functions/go/upsert-resource/main.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/fn/framework/command" ) -//nolint +// nolint func main() { asp := UpsertResourceProcessor{} cmd := command.Build(&asp, command.StandaloneEnabled, false) diff --git a/functions/go/upsert-resource/upsertresource/upsert_resource_test.go b/functions/go/upsert-resource/upsertresource/upsert_resource_test.go index 5e6b3429b..e9f1af64f 100644 --- a/functions/go/upsert-resource/upsertresource/upsert_resource_test.go +++ b/functions/go/upsert-resource/upsertresource/upsert_resource_test.go @@ -2,7 +2,6 @@ package upsertresource import ( "bytes" - "io/ioutil" "os" "path/filepath" "testing" @@ -537,13 +536,13 @@ spec: for i := range tests { test := tests[i] t.Run(test.name, func(t *testing.T) { - baseDir, err := ioutil.TempDir("", "") + baseDir, err := os.MkdirTemp("", "") if !assert.NoError(t, err) { t.FailNow() } defer os.RemoveAll(baseDir) - err = ioutil.WriteFile(filepath.Join(baseDir, "f1.yaml"), []byte(test.input), 0700) + err = os.WriteFile(filepath.Join(baseDir, "f1.yaml"), []byte(test.input), 0700) if !assert.NoError(t, err) { t.FailNow() } diff --git a/functions/ts/generate-folders/package-lock.json b/functions/ts/generate-folders/package-lock.json index 78724b38a..6eca40413 100644 --- a/functions/ts/generate-folders/package-lock.json +++ b/functions/ts/generate-folders/package-lock.json @@ -162,7 +162,7 @@ "tsutils": "^3.5.0" }, "peerDependencies": { - "tslint": "^5.0.0", + "tslint": "^6.1.3", "typescript": ">= 3.3.0 || >= 3.6.0-dev || >= 3.7.0-dev" } }, @@ -2583,7 +2583,7 @@ "tsutils": "^2.29.0" }, "peerDependencies": { - "tslint": "^5.0.0", + "tslint": "^6.1.3", "typescript": ">=2.1.4 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >=3.1.0-dev || >=3.2.0-dev || >=3.3.0-dev || >=3.4.0-dev" } }, diff --git a/scripts/generate_catalog/generate_catalog.go b/scripts/generate_catalog/generate_catalog.go index d3ae702eb..280025933 100644 --- a/scripts/generate_catalog/generate_catalog.go +++ b/scripts/generate_catalog/generate_catalog.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// https://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -23,7 +23,6 @@ import ( "bytes" "encoding/json" "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -312,7 +311,7 @@ func getFunctions(branches []string, source string, dest string) []function { func copyExamples(b string, exampleSources []string, versionDest, minorVersion string) error { // Copy examples for the function's version to a temporary directory. - tempDir, err := ioutil.TempDir("", "examples") + tempDir, err := os.MkdirTemp("", "examples") if err != nil { return err } @@ -357,7 +356,7 @@ func copyExamples(b string, exampleSources []string, versionDest, minorVersion s func copyReadme(b string, funcName string, relativeFuncPath string, versionDest string) error { // Copy README for the function's version to the function's directory. - tempDir, err := ioutil.TempDir("", "functions") + tempDir, err := os.MkdirTemp("", "functions") if err != nil { return err } @@ -564,11 +563,11 @@ func writeFunctionIndex(functions []function, source string, dest string) ([]fun } o := strings.Join(out, "\n") - if err := ioutil.WriteFile(filepath.Join(dest, "README.md"), []byte(o), 0744); err != nil { + if err := os.WriteFile(filepath.Join(dest, "README.md"), []byte(o), 0744); err != nil { return nil, nil, err } co := strings.Join(contribOut, "\n") - if err := ioutil.WriteFile(filepath.Join(dest, "contrib", "README.md"), []byte(co), 0744); err != nil { + if err := os.WriteFile(filepath.Join(dest, "contrib", "README.md"), []byte(co), 0744); err != nil { return nil, nil, err } return append(genericFunctions, gcp...), contribFunctions, nil @@ -605,7 +604,7 @@ func writeExampleIndex(functions []function, source string, dest string) error { return err } - err = ioutil.WriteFile(filepath.Join(dest, "catalog.json"), funcJson, 0600) + err = os.WriteFile(filepath.Join(dest, "catalog.json"), funcJson, 0600) return err } @@ -647,6 +646,6 @@ func writeExampleIndexV2(functions []function, source string, dest string) error return err } - err = ioutil.WriteFile(filepath.Join(dest, "catalog-v2.json"), funcJson, 0600) + err = os.WriteFile(filepath.Join(dest, "catalog-v2.json"), funcJson, 0600) return err } diff --git a/scripts/update_function_docs/function_release.go b/scripts/update_function_docs/function_release.go index d2c8fc7f7..1d41eefec 100644 --- a/scripts/update_function_docs/function_release.go +++ b/scripts/update_function_docs/function_release.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// https://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -15,7 +15,6 @@ package main import ( "fmt" - "io/ioutil" "os" "path/filepath" "regexp" @@ -157,7 +156,7 @@ func (fr *functionRelease) parseMetadata(examplesPath string) error { metadataPath := filepath.Join(fr.FunctionPath, "metadata.yaml") var md metadata - yamlFile, err := ioutil.ReadFile(metadataPath) + yamlFile, err := os.ReadFile(metadataPath) if err != nil { return err } @@ -224,7 +223,7 @@ func (fr *functionRelease) updateExampleDocs() error { // Perform in place search/replace operations on a documentation file func (fr *functionRelease) updateDoc(filePath string) error { - contents, err := ioutil.ReadFile(filePath) + contents, err := os.ReadFile(filePath) if err != nil { return err }