Merge pull request #134 from willthames/update-resid

Update kustomize dependencies
kbst · Oct 1, 2021 · f90ba7f · f90ba7f
2 parents 64446a3 + 0f26b21
commit f90ba7f
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 334 deletions.
diff --git a/go.mod b/go.mod
@@ -10,6 +10,6 @@ require (
 	k8s.io/apimachinery v0.20.2
 	k8s.io/client-go v0.20.2
 	k8s.io/kubectl v0.20.2
-	sigs.k8s.io/kustomize/api v0.6.9
-	sigs.k8s.io/kustomize/kyaml v0.10.7
+	sigs.k8s.io/kustomize/api v0.10.0
+	sigs.k8s.io/kustomize/kyaml v0.12.0
 )
diff --git a/go.sum b/go.sum
diff --git a/kustomize/data_source_kustomization.go b/kustomize/data_source_kustomization.go
@@ -12,9 +12,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/krusty"
-	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/resid"
 )
 
 func getIDFromResources(rm resmap.ResMap) (s string, err error) {
@@ -84,9 +84,9 @@ func runKustomizeBuild(fSys filesys.FileSystem, path string, kOpts *schema.Resou
 
 	opts := getKustomizeOptions(kOpts)
 
-	k := krusty.MakeKustomizer(fSys, opts)
+	k := krusty.MakeKustomizer(opts)
 
-	rm, err = k.Run(path)
+	rm, err = k.Run(fSys, path)
 	if err != nil {
 		return nil, fmt.Errorf("Kustomizer Run for path '%s' failed: %s", path, err)
 	}

diff --git a/kustomize/data_source_kustomization_overlay_fs.go b/kustomize/data_source_kustomization_overlay_fs.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
 var KFILENAME string = "Kustomization"
@@ -60,6 +60,10 @@ func (ofs overlayFileSystem) RemoveAll(name string) error {
 	return ofs.fs.RemoveAll(name)
 }
 
+func (ofs overlayFileSystem) ReadDir(name string) ([]string, error) {
+	return ofs.fs.ReadDir(name)
+}
+
 func (ofs overlayFileSystem) Open(name string) (filesys.File, error) {
 	return ofs.fs.Open(name)
 }

diff --git a/kustomize/data_source_kustomization_overlay_fs_test.go b/kustomize/data_source_kustomization_overlay_fs_test.go
@@ -23,8 +23,8 @@ func TestOverlayFileSystemTwoDataSources(t *testing.T) {
 			{
 				Config: testOverlayFileSystemTwoDataSourcesConfig(),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckOutput("check1", "{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"name\":\"test-overlay1\"}}\n"),
-					resource.TestCheckOutput("check2", "{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"name\":\"test-overlay2\"}}\n"),
+					resource.TestCheckOutput("check1", "{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"name\":\"test-overlay1\"}}"),
+					resource.TestCheckOutput("check2", "{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"name\":\"test-overlay2\"}}"),
 				),
 			},
 		},

diff --git a/kustomize/data_source_kustomization_overlay_test.go b/kustomize/data_source_kustomization_overlay_test.go
diff --git a/kustomize/data_source_kustomization_test.go b/kustomize/data_source_kustomization_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/kyaml/resid"
 )
 
 func TestDeterminePrefix(t *testing.T) {

diff --git a/kustomize/resource_kustomization.go b/kustomize/resource_kustomization.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 
-	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/kyaml/resid"
 
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	k8smeta "k8s.io/apimachinery/pkg/api/meta"

diff --git a/kustomize/structures_kustomization_test.go b/kustomize/structures_kustomization_test.go
@@ -11,9 +11,9 @@ import (
 func TestFlattenKustomizationIDs(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	opts := krusty.MakeDefaultOptions()
-	k := krusty.MakeKustomizer(fSys, opts)
+	k := krusty.MakeKustomizer(opts)
 
-	rm, err := k.Run("test_kustomizations/basic/initial")
+	rm, err := k.Run(fSys, "test_kustomizations/basic/initial")
 	assert.Equal(t, err, nil, nil)
 
 	ids, idsPrio := flattenKustomizationIDs(rm)