kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant literal function. LiteralFromStringValue is more commonly used.

This commit is contained in:
Peter Rifel 2020-05-06 23:04:03 -05:00
parent e4ca5a000d
commit 7d845e5c38
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
View File

@ -479,9 +479,7 @@ func addNetworks(network *Network, subnet *Subnet, networkInterfaces []*compute.
for _, gac := range g.AccessConfigs { for _, gac := range g.AccessConfigs {
tac := &terraformAccessConfig{} tac := &terraformAccessConfig{}
natIP := gac.NatIP natIP := gac.NatIP
if strings.HasPrefix(natIP, "${") { if natIP != "" {
tac.NatIP = terraform.LiteralExpression(natIP)
} else if natIP != "" {
tac.NatIP = terraform.LiteralFromStringValue(natIP) tac.NatIP = terraform.LiteralFromStringValue(natIP)
} }

4
upup/pkg/fi/cloudup/terraform/literal.go
View File

@ -47,10 +47,6 @@ func (l *Literal) MarshalJSON() ([]byte, error) {
return json.Marshal(&l.Value) return json.Marshal(&l.Value)
} }
func LiteralExpression(s string) *Literal {
return &Literal{Value: s}
}
func LiteralFileExpression(modulePath string) *Literal { func LiteralFileExpression(modulePath string) *Literal {
return &Literal{ return &Literal{
Value: fmt.Sprintf("${file(%q)}", modulePath), Value: fmt.Sprintf("${file(%q)}", modulePath),