Make legacy_id_format default to false

Author: willthames

kustomize/data_source_kustomization_overlay.go

@@ -10,9 +10,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 

kustomize/data_source_kustomization_overlay_fs_test.go

@@ -50,11 +50,11 @@ data "kustomization_overlay" "test2" {
 }
 
 output "check1" {
-	value = data.kustomization_overlay.test1.manifests["~G_v1_Namespace|~X|test-overlay1"]
+	value = data.kustomization_overlay.test1.manifests["_/Namespace/_/test-overlay1"]
 }
 
 output "check2" {
-	value = data.kustomization_overlay.test2.manifests["~G_v1_Namespace|~X|test-overlay2"]
+	value = data.kustomization_overlay.test2.manifests["_/Namespace/_/test-overlay2"]
 }
 
 `

kustomize/data_source_kustomization_overlay_test.go

@@ -125,7 +125,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Namespace|~X|test-basic"]
+	value = data.kustomization_overlay.test.manifests["_/Namespace/_/test-basic"]
 }
 `
 }
@@ -162,7 +162,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Namespace|~X|test-basic"]
+	value = data.kustomization_overlay.test.manifests["_/Namespace/_/test-basic"]
 }
 `
 }
@@ -195,7 +195,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_ConfigMap|~X|from-component-6ct58987ht"]
+	value = data.kustomization_overlay.test.manifests["_/ConfigMap/_/from-component-6ct58987ht"]
 }
 `
 }
@@ -252,11 +252,11 @@ data "kustomization_overlay" "test" {
 }
 
 output "check_cm1" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_ConfigMap|~X|test-configmap1"]
+	value = data.kustomization_overlay.test.manifests["_/ConfigMap/_/test-configmap1"]
 }
 
 output "check_cm2" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_ConfigMap|~X|test-configmap2-5tgmgc9cmf"]
+	value = data.kustomization_overlay.test.manifests["_/ConfigMap/_/test-configmap2-5tgmgc9cmf"]
 }
 `
 }
@@ -291,7 +291,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Namespace|~X|test-overlay-namespace"]
+	value = data.kustomization_overlay.test.manifests["_/Namespace/_/test-overlay-namespace"]
 }
 
 `
@@ -328,7 +328,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Service|test-basic|test-test-test"]
+	value = data.kustomization_overlay.test.manifests["_/Service/test-basic/test-test-test"]
 }
 
 `
@@ -362,7 +362,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Namespace|~X|test-basic"]
+	value = data.kustomization_overlay.test.manifests["_/Namespace/_/test-basic"]
 }
 
 `
@@ -398,7 +398,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["apps_v1_Deployment|test-transformer-config|test"]
+	value = data.kustomization_overlay.test.manifests["apps/Deployment/test-transformer-config/test"]
 }
 `
 }
@@ -459,7 +459,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_ConfigMap|~X|testcm-6ct58987ht"]
+	value = data.kustomization_overlay.test.manifests["_/ConfigMap/_/testcm-6ct58987ht"]
 }
 `
 }
@@ -511,11 +511,11 @@ data "kustomization_overlay" "test" {
 }
 
 output "check_configmap" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_ConfigMap|~X|test-configmap"]
+	value = data.kustomization_overlay.test.manifests["_/ConfigMap/_/test-configmap"]
 }
 
 output "check_secret" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Secret|~X|test-secret"]
+	value = data.kustomization_overlay.test.manifests["_/Secret/_/test-secret"]
 }
 `
 }
@@ -553,7 +553,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["apps_v1_Deployment|test-basic|test"]
+	value = data.kustomization_overlay.test.manifests["apps/Deployment/test-basic/test"]
 }
 `
 }
@@ -610,11 +610,11 @@ data "kustomization_overlay" "test" {
 }
 
 output "check_dep" {
-	value = data.kustomization_overlay.test.manifests["apps_v1_Deployment|test-basic|test"]
+	value = data.kustomization_overlay.test.manifests["apps/Deployment/test-basic/test"]
 }
 
 output "check_ingress" {
-	value = data.kustomization_overlay.test.manifests["networking.k8s.io_v1beta1_Ingress|test-basic|test"]
+	value = data.kustomization_overlay.test.manifests["networking.k8s.io/Ingress/test-basic/test"]
 }
 `
 }
@@ -650,7 +650,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["apps_v1_Deployment|test-basic|test"]
+	value = data.kustomization_overlay.test.manifests["apps/Deployment/test-basic/test"]
 }
 `
 }
@@ -707,11 +707,11 @@ data "kustomization_overlay" "test" {
 }
 
 output "check_cm1" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Secret|~X|test-secret1"]
+	value = data.kustomization_overlay.test.manifests["_/Secret/_/test-secret1"]
 }
 
 output "check_cm2" {
-	value = data.kustomization_overlay.test.manifests["~G_v1_Secret|~X|test-secret2-h55cfd6gfg"]
+	value = data.kustomization_overlay.test.manifests["_/Secret/_/test-secret2-h55cfd6gfg"]
 }
 `
 }
@@ -768,7 +768,7 @@ data "kustomization_overlay" "test" {
 }
 
 output "check" {
-	value = data.kustomization_overlay.test.manifests["apps_v1_Deployment|test-basic|test"]
+	value = data.kustomization_overlay.test.manifests["apps/Deployment/test-basic/test"]
 }
 `
 }
@@ -895,15 +895,15 @@ module "test" {
 }
 
 output "check_dep" {
-	value = module.test.kustomization.manifests["apps_v1_Deployment|test-module|tp-test-ts"]
+	value = module.test.kustomization.manifests["apps/Deployment/test-module/tp-test-ts"]
 }
 
 output "check_cm" {
-	value = module.test.kustomization.manifests["~G_v1_ConfigMap|test-module|tp-ocm-ts"]
+	value = module.test.kustomization.manifests["_/ConfigMap/test-module/tp-ocm-ts"]
 }
 
 output "check_s" {
-	value = module.test.kustomization.manifests["~G_v1_Secret|test-module|tp-os-ts-46f8b28mk5"]
+	value = module.test.kustomization.manifests["_/Secret/test-module/tp-os-ts-46f8b28mk5"]
 }
 `, modulePath, modulePath)
 }

kustomize/provider.go

@@ -67,14 +67,14 @@ func Provider() *schema.Provider {
 			"context": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Default:     "",
+				DefaultFunc: schema.EnvDefaultFunc("KUBECONFIG_CONTEXT", nil),
 				Description: "Context to use in kubeconfig with multiple contexts, if not specified the default context is to be used.",
 			},
 			"legacy_id_format": {
 				Type:        schema.TypeBool,
 				Optional:    true,
-				Default:     true,
-				Deprecated:  "legacy_id_format will be set to false in a future version and be removed in a further later version",
+				Default:     false,
+				Deprecated:  "legacy_id_format will be removed in a future version",
 				Description: "If legacy_id_format is true, then resource IDs will look like group_version_kind|namespace|name. If legacy_id_format is false, then resource IDs will look like group/kind/namespace/name",
 			},
 		},

kustomize/provider_test.go

@@ -8,9 +8,6 @@ import (
 var testAccProviders map[string]terraform.ResourceProvider
 var testAccProvider *schema.Provider
 
-var testAccLegacyProviders map[string]terraform.ResourceProvider
-var testAccLegacyProvider *schema.Provider
-
 func init() {
 	testAccProvider = Provider()
 	testAccProviders = map[string]terraform.ResourceProvider{

kustomize/resource_kustomization_legacy_test.go

@@ -413,57 +413,3 @@ resource "kustomization_resource" "webhook" {
 }
 `
 }
-
-//
-//
-// TransformerConfigs test
-func TestAccResourceKustomization_legacy_transformerConfigs(t *testing.T) {
-
-	resource.Test(t, resource.TestCase{
-		Providers: testAccProviders,
-		Steps: []resource.TestStep{
-			//
-			//
-			// Applying initial config without the test label
-			{
-				Config: testAccResourceKustomizationConfig_legacy_transformerConfigs("test_kustomizations/transformer_configs/initial"),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet("kustomization_resource.ns", "id"),
-					resource.TestCheckResourceAttrSet("kustomization_resource.svc", "id"),
-					resource.TestCheckResourceAttrSet("kustomization_resource.dep1", "id"),
-					testAccCheckManifestLabelAbsent("kustomization_resource.dep1", "test.example.com/test-label"),
-					testAccCheckManifestSelectorAbsent("kustomization_resource.dep1", "test.example.com/test-label"),
-				),
-			},
-			//
-			//
-			// Applying modified config adding the test label
-			{
-				Config: testAccResourceKustomizationConfig_legacy_transformerConfigs("test_kustomizations/transformer_configs/modified"),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet("kustomization_resource.ns", "id"),
-					resource.TestCheckResourceAttrSet("kustomization_resource.svc", "id"),
-					resource.TestCheckResourceAttrSet("kustomization_resource.dep1", "id"),
-					testAccCheckManifestLabel("kustomization_resource.dep1", "test.example.com/test-label", "test-value"),
-					testAccCheckManifestSelectorAbsent("kustomization_resource.dep1", "test.example.com/test-label"),
-				),
-			},
-		},
-	})
-}
-
-func testAccResourceKustomizationConfig_legacy_transformerConfigs(path string) string {
-	return testAccDataSourceKustomizationConfig_basic(path, true) + `
-resource "kustomization_resource" "ns" {
-	manifest = data.kustomization_build.test.manifests["~G_v1_Namespace|~X|test-transformer-config"]
-}
-
-resource "kustomization_resource" "svc" {
-	manifest = data.kustomization_build.test.manifests["~G_v1_Service|test-transformer-config|test"]
-}
-
-resource "kustomization_resource" "dep1" {
-	manifest = data.kustomization_build.test.manifests["apps_v1_Deployment|test-transformer-config|test"]
-}
-`
-}