Merge pull request #665 from monopole/convertCrd

Convert CRD tests to in-memory.

pkg/commands/build/testdata/testcase-crds/crd/bee.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1beta1
-kind: Bee
-metadata:
-  name: bee
-spec:
-  action: fly

pkg/commands/build/testdata/testcase-crds/crd/kustomization.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1beta1
-kind: Kustomization
-crds:
-- mycrd.json
-
-resources:
-- secret.yaml
-- mykind.yaml
-- bee.yaml
-
-namePrefix: test-

pkg/commands/build/testdata/testcase-crds/crd/mykind.yaml

@@ -1,9 +0,0 @@
-apiVersion: jingfang.example.com/v1beta1
-kind: MyKind
-metadata:
-  name: mykind
-spec:
-  secretRef:
-    name: crdsecret
-  beeRef:
-    name: bee

pkg/commands/build/testdata/testcase-crds/crd/secret.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: crdsecret
-data:
-  PATH: YmJiYmJiYmIK

pkg/commands/build/testdata/testcase-crds/expected.diff

@@ -1,36 +0,0 @@
-diff -u -N /tmp/noop/jingfang.example.com_v1beta1_MyKind_mykind.yaml /tmp/transformed/jingfang.example.com_v1beta1_MyKind_mykind.yaml
---- /tmp/noop/jingfang.example.com_v1beta1_MyKind_mykind.yaml	YYYY-MM-DD HH:MM:SS
-+++ /tmp/transformed/jingfang.example.com_v1beta1_MyKind_mykind.yaml	YYYY-MM-DD HH:MM:SS
-@@ -1,9 +1,9 @@
- apiVersion: jingfang.example.com/v1beta1
- kind: MyKind
- metadata:
--  name: mykind
-+  name: test-mykind
- spec:
-   beeRef:
--    name: bee
-+    name: test-bee
-   secretRef:
--    name: crdsecret
-+    name: test-crdsecret
-diff -u -N /tmp/noop/v1beta1_Bee_bee.yaml /tmp/transformed/v1beta1_Bee_bee.yaml
---- /tmp/noop/v1beta1_Bee_bee.yaml	YYYY-MM-DD HH:MM:SS
-+++ /tmp/transformed/v1beta1_Bee_bee.yaml	YYYY-MM-DD HH:MM:SS
-@@ -1,6 +1,6 @@
- apiVersion: v1beta1
- kind: Bee
- metadata:
--  name: bee
-+  name: test-bee
- spec:
-   action: fly
-diff -u -N /tmp/noop/v1_Secret_crdsecret.yaml /tmp/transformed/v1_Secret_crdsecret.yaml
---- /tmp/noop/v1_Secret_crdsecret.yaml	YYYY-MM-DD HH:MM:SS
-+++ /tmp/transformed/v1_Secret_crdsecret.yaml	YYYY-MM-DD HH:MM:SS
-@@ -3,4 +3,4 @@
-   PATH: YmJiYmJiYmIK
- kind: Secret
- metadata:
--  name: crdsecret
-+  name: test-crdsecret

pkg/commands/build/testdata/testcase-crds/expected.yaml

@@ -1,23 +0,0 @@
-apiVersion: v1
-data:
-  PATH: YmJiYmJiYmIK
-kind: Secret
-metadata:
-  name: test-crdsecret
----
-apiVersion: jingfang.example.com/v1beta1
-kind: MyKind
-metadata:
-  name: test-mykind
-spec:
-  beeRef:
-    name: test-bee
-  secretRef:
-    name: test-crdsecret
----
-apiVersion: v1beta1
-kind: Bee
-metadata:
-  name: test-bee
-spec:
-  action: fly

pkg/commands/build/testdata/testcase-crds/test.yaml

@@ -1,5 +0,0 @@
-description: name reference in CRDs
-args: []
-filename: testdata/testcase-crds/crd
-expectedStdout: testdata/testcase-crds/expected.yaml
-expectedDiff: testdata/testcase-crds/expected.diff

pkg/target/crd_test.go

@@ -1,14 +1,78 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package target
+
+import (
+	"testing"
+)
+
+func writeBaseWithCrd(th *KustTestHarness) {
+	th.writeK("/app/base", `
+apiVersion: v1beta1
+kind: Kustomization
+crds:
+- mycrd.json
+
+resources:
+- secret.yaml
+- mykind.yaml
+- bee.yaml
+
+namePrefix: x-
+`)
+	th.writeF("/app/base/bee.yaml", `
+apiVersion: v1beta1
+kind: Bee
+metadata:
+  name: bee
+spec:
+  action: fly
+`)
+	th.writeF("/app/base/mykind.yaml", `
+apiVersion: jingfang.example.com/v1beta1
+kind: MyKind
+metadata:
+  name: mykind
+spec:
+  secretRef:
+    name: crdsecret
+  beeRef:
+    name: bee
+`)
+	th.writeF("/app/base/secret.yaml", `
+apiVersion: v1
+kind: Secret
+metadata:
+  name: crdsecret
+data:
+  PATH: yellowBrickRoad
+`)
+	th.writeF("/app/base/mycrd.json", `
 {
   "github.com/example/pkg/apis/jingfang/v1beta1.Bee": {
     "Schema": {
       "description": "Bee",
       "properties": {
         "apiVersion": {
-          "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
+          "description": "APIVersion defines the versioned schema of this representation of an object.",
           "type": "string"
         },
         "kind": {
-          "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
+          "description": "Kind is a string value representing the REST resource this object represents.",
           "type": "string"
         },
         "metadata": {
@@ -35,7 +99,7 @@
       ],
       "properties": {
         "apiVersion": {
-          "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
+          "description": "APIVersion defines the versioned schema of this representation of an object.",
           "type": "string"
         },
         "items": {
@@ -45,7 +109,7 @@
           }
         },
         "kind": {
-          "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
+          "description": "Kind is a string value representing the REST resource this object represents.",
           "type": "string"
         },
         "metadata": {
@@ -85,11 +149,11 @@
       "description": "MyKind",
       "properties": {
         "apiVersion": {
-          "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
+          "description": "APIVersion defines the versioned schema of this representation of an object.",
           "type": "string"
         },
         "kind": {
-          "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
+          "description": "Kind is a string value representing the REST resource this object represents.",
           "type": "string"
         },
         "metadata": {
@@ -116,7 +180,7 @@
       ],
       "properties": {
         "apiVersion": {
-          "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
+          "description": "APIVersion defines the versioned schema of this representation of an object.",
           "type": "string"
         },
         "items": {
@@ -126,7 +190,7 @@
           }
         },
         "kind": {
-          "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
+          "description": "Kind is a string value representing the REST resource this object represents.",
           "type": "string"
         },
         "metadata": {
@@ -149,7 +213,7 @@
           "$ref": "github.com/example/pkg/apis/jingfang/v1beta1.BeeObjectReference"
         },
         "secretRef": {
-          "description": "If defined, we use this secret for configuring the MYSQL_ROOT_PASSWORD If it is not set we generate a secret dynamically",
+          "description": "If defined, use this secret for configuring the MYSQL_ROOT_PASSWORD",
           "x-kubernetes-object-ref-api-version": "v1",
           "x-kubernetes-object-ref-kind": "Secret",
           "$ref": "k8s.io/api/core/v1.LocalObjectReference"
@@ -168,3 +232,91 @@
     "Dependencies": []
   }
 }
+`)
+}
+
+func TestCrdBase(t *testing.T) {
+	th := NewKustTestHarness(t, "/app/base")
+	writeBaseWithCrd(th)
+	m, err := th.makeKustTarget().MakeCustomizedResMap()
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	th.assertActualEqualsExpected(m, `
+apiVersion: v1
+data:
+  PATH: yellowBrickRoad
+kind: Secret
+metadata:
+  name: x-crdsecret
+---
+apiVersion: jingfang.example.com/v1beta1
+kind: MyKind
+metadata:
+  name: x-mykind
+spec:
+  beeRef:
+    name: x-bee
+  secretRef:
+    name: x-crdsecret
+---
+apiVersion: v1beta1
+kind: Bee
+metadata:
+  name: x-bee
+spec:
+  action: fly
+`)
+}
+
+func TestCrdWithOverlay(t *testing.T) {
+	th := NewKustTestHarness(t, "/app/overlay")
+	writeBaseWithCrd(th)
+	th.writeK("/app/overlay", `
+apiVersion: v1beta1
+kind: Kustomization
+namePrefix: prod-
+bases:
+- ../base
+patchesStrategicMerge:
+- bee.yaml
+`)
+	th.writeF("/app/overlay/bee.yaml", `
+apiVersion: v1beta1
+kind: Bee
+metadata:
+  name: bee
+spec:
+  action: makehoney
+`)
+	m, err := th.makeKustTarget().MakeCustomizedResMap()
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	// TODO(#605): Some output here is wrong due to #605
+	th.assertActualEqualsExpected(m, `
+apiVersion: v1
+data:
+  PATH: yellowBrickRoad
+kind: Secret
+metadata:
+  name: prod-x-crdsecret
+---
+apiVersion: jingfang.example.com/v1beta1
+kind: MyKind
+metadata:
+  name: prod-x-mykind
+spec:
+  beeRef:
+    name: bee
+  secretRef:
+    name: crdsecret
+---
+apiVersion: v1beta1
+kind: Bee
+metadata:
+  name: prod-bee
+spec:
+  action: makehoney
+`)
+}