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

Merge pull request #11900 from rifelpet/tf-finish 

Remove unnecessary parameters from terraform finish methods
This commit is contained in:
Kubernetes Prow Robot 2021-07-01 05:35:54 -07:00 committed by GitHub
parent 19ffc06d3d 32c6c0db02
commit fe8c26fa15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,9 +83,9 @@ func tfGetProviderExtraConfig(c *kops.TargetSpec) map[string]string {
func (t *TerraformTarget) Finish(taskMap map[string]fi.Task) error {
var err error
if featureflag.TerraformJSON.Enabled() {
err = t.finishJSON(taskMap)
err = t.finishJSON()
} else {
err = t.finishHCL2(taskMap)
err = t.finishHCL2()
}
if err != nil {
return err

3
upup/pkg/fi/cloudup/terraform/target_hcl2.go
View File

@ -25,11 +25,10 @@ import (
"github.com/zclconf/go-cty/cty/gocty"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/terraformWriter"
)
func (t *TerraformTarget) finishHCL2(taskMap map[string]fi.Task) error {
func (t *TerraformTarget) finishHCL2() error {
f := hclwrite.NewEmptyFile()
rootBody := f.Body()

3
upup/pkg/fi/cloudup/terraform/target_json.go
View File

@ -21,10 +21,9 @@ import (
"fmt"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
)
func (t *TerraformTarget) finishJSON(taskMap map[string]fi.Task) error {
func (t *TerraformTarget) finishJSON() error {
resourcesByType, err := t.GetResourcesByType()
if err != nil {
return err