From f92d486197c30803b4da37d48656440c2fe48f52 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 25 Oct 2020 10:49:59 -0700 Subject: [PATCH] Remove dependency of TerraformJSON feature flag --- cmd/kops/integration_test.go | 4 ++-- upup/pkg/fi/cloudup/apply_cluster.go | 2 +- .../fi/cloudup/awstasks/launchtemplate_target_terraform.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index 0ac9b26838..b5de0b0fa2 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -194,9 +194,9 @@ func TestBastionAdditionalUserData(t *testing.T) { // TestMinimalJSON runs the test on a minimal data set and outputs JSON func TestMinimalJSON(t *testing.T) { - featureflag.ParseFlags("+TerraformJSON,-Terraform-0.12") + featureflag.ParseFlags("+TerraformJSON") unsetFeaureFlag := func() { - featureflag.ParseFlags("-TerraformJSON,+Terraform-0.12") + featureflag.ParseFlags("-TerraformJSON") } defer unsetFeaureFlag() newIntegrationTest("minimal-json.example.com", "minimal-json").withJSONOutput().runTestTerraformAWS(t) diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 8ca371e700..7e5ac2879f 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -724,7 +724,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error { checkExisting = false outDir := c.OutDir tfVersion := terraform.Version011 - if featureflag.Terraform012.Enabled() { + if featureflag.Terraform012.Enabled() && !featureflag.TerraformJSON.Enabled() { tfVersion = terraform.Version012 } tf := terraform.NewTerraformTarget(cloud, region, project, outDir, tfVersion, cluster.Spec.Target) diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go index ac2af71c09..3de3674f43 100644 --- a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go +++ b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go @@ -216,7 +216,7 @@ func (t *LaunchTemplate) RenderTerraform(target *terraform.TerraformTarget, a, e return err } if d != nil { - if featureflag.Terraform012.Enabled() { + if featureflag.Terraform012.Enabled() && !featureflag.TerraformJSON.Enabled() { userDataResource := fi.WrapResource(fi.NewBytesResource(d)) tf.UserData, err = target.AddFile("aws_launch_template", fi.StringValue(e.Name), "user_data", userDataResource, true)