From 1af11ba12563be65dac1725a8cd9c7ebb987a115 Mon Sep 17 00:00:00 2001 From: George Pollard Date: Sun, 22 Nov 2020 22:33:35 +0000 Subject: [PATCH] Remove *ByName function variants --- hack/generator/pkg/astbuilder/builder.go | 2 +- hack/generator/pkg/astbuilder/calls.go | 7 ------- .../armconversion/convert_from_arm_function_builder.go | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/hack/generator/pkg/astbuilder/builder.go b/hack/generator/pkg/astbuilder/builder.go index 208d17ce7..a567159ea 100644 --- a/hack/generator/pkg/astbuilder/builder.go +++ b/hack/generator/pkg/astbuilder/builder.go @@ -249,7 +249,7 @@ func FormatError(formatString string, args ...ast.Expr) ast.Expr { callArgs, StringLiteral(formatString)) callArgs = append(callArgs, args...) - return CallQualifiedFuncByName("fmt", "Errorf", callArgs...) + return CallQualifiedFunc("fmt", "Errorf", callArgs...) } // AddrOf returns a statement that gets the address of the provided expression. diff --git a/hack/generator/pkg/astbuilder/calls.go b/hack/generator/pkg/astbuilder/calls.go index 2b0fbb59a..34ddc27d9 100644 --- a/hack/generator/pkg/astbuilder/calls.go +++ b/hack/generator/pkg/astbuilder/calls.go @@ -39,13 +39,6 @@ func CallQualifiedFunc(qualifier string, funcName string, arguments ...ast.Expr) } } -// CallQualifiedFuncByName() creates an expression to call a qualified function of the specified -// name with the given arguments, generating code like: -// .(arguments...) -func CallQualifiedFuncByName(qualifier string, funcName string, arguments ...ast.Expr) ast.Expr { - return CallQualifiedFunc(qualifier, funcName, arguments...) -} - // InvokeFunc() creates a statement to invoke a function with specified arguments, generating code // like // (arguments...) diff --git a/hack/generator/pkg/astmodel/armconversion/convert_from_arm_function_builder.go b/hack/generator/pkg/astmodel/armconversion/convert_from_arm_function_builder.go index 894680c13..6a5f73e27 100644 --- a/hack/generator/pkg/astmodel/armconversion/convert_from_arm_function_builder.go +++ b/hack/generator/pkg/astmodel/armconversion/convert_from_arm_function_builder.go @@ -162,7 +162,7 @@ func (builder *convertFromArmBuilder) namePropertyHandler( astbuilder.CallFunc( // "calling" enum name is equivalent to casting ast.NewIdent(typeName.Name()), - astbuilder.CallQualifiedFuncByName( + astbuilder.CallQualifiedFunc( astmodel.GenRuntimePackageName, "ExtractKubernetesResourceNameFromArmName", &ast.SelectorExpr{ @@ -190,7 +190,7 @@ func (builder *convertFromArmBuilder) namePropertyHandler( Sel: ast.NewIdent(string(toProp.PropertyName())), }, token.ASSIGN, - astbuilder.CallQualifiedFuncByName( + astbuilder.CallQualifiedFunc( astmodel.GenRuntimePackageName, "ExtractKubernetesResourceNameFromArmName", &ast.SelectorExpr{