Merge pull request #11900 from rifelpet/tf-finish

Remove unnecessary parameters from terraform finish methods
kubernetes · Jul 1, 2021 · fe8c26f · fe8c26f
2 parents 19ffc06 + 32c6c0d
commit fe8c26f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/upup/pkg/fi/cloudup/terraform/target.go b/upup/pkg/fi/cloudup/terraform/target.go
@@ -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

diff --git a/upup/pkg/fi/cloudup/terraform/target_hcl2.go b/upup/pkg/fi/cloudup/terraform/target_hcl2.go
@@ -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()
 

diff --git a/upup/pkg/fi/cloudup/terraform/target_json.go b/upup/pkg/fi/cloudup/terraform/target_json.go
@@ -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