Add unit-test

Signed-off-by: zzxwill <[email protected]>

.gitignore

@@ -31,4 +31,10 @@ bin/
 tmp/
 
 # Vscode files
-.vscode
+.vscode
+
+# Webhook certificates
+csr.conf
+oam-kubernetes-runtime-webhook.csr
+oam-kubernetes-runtime-webhook.key
+oam-kubernetes-runtime-webhook.pem

pkg/oam/types.go

@@ -27,6 +27,10 @@ import (
 	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 )
 
+// DefinitionAnnotation is one automatically generated annotation of workload and trait to indicate which
+// workloadDefinition/traitDefinition it is generated by
+const DefinitionAnnotation = "definition.oam.dev/name"
+
 // ScopeKind contains the type metadata for a kind of an OAM scope resource.
 type ScopeKind schema.GroupVersionKind
 

pkg/oam/util/helper.go

@@ -39,9 +39,6 @@ var (
 const (
 	// TraitPrefixKey is prefix of trait name
 	TraitPrefixKey = "trait"
-	// DefinitionAnnotation is one automatically generated annotation of workload and trait to indicate which
-	//workloadDefinition/traitDefinition it is generated by
-	DefinitionAnnotation = "definition.oam.dev/name"
 )
 
 const (
@@ -232,7 +229,7 @@ func PassLabelAndAnnotation(parentObj oam.Object, childObj labelAnnotationObject
 // Now the CRD name of a resource could also be defined as `definition.oam.dev/name` in `metadata.annotations`
 func GetCRDName(u *unstructured.Unstructured) string {
 	if annotations := u.GetAnnotations(); annotations != nil {
-		if crdName, ok := annotations[DefinitionAnnotation]; ok {
+		if crdName, ok := annotations[oam.DefinitionAnnotation]; ok {
 			return crdName
 		}
 	}

pkg/oam/util/helper_test.go

@@ -715,6 +715,19 @@ var _ = Describe("Test unstructured related helper utils", func() {
 				}},
 				exp: "simplerollouttraits.extend.oam.dev",
 			},
+			"extended resource with annotation": {
+				u: &unstructured.Unstructured{Object: map[string]interface{}{
+					"apiVersion": "extend.oam.dev/v1alpha2",
+					"kind":       "ContainerizedWorkload",
+					"metadata": map[string]interface{}{
+						"annotations": map[string]interface{}{
+							"definition.oam.dev/name": "web-service",
+						},
+					},
+				},
+				},
+				exp: "web-service",
+			},
 		}
 		for name, ti := range tests {
 			got := util.GetCRDName(ti.u)

pkg/webhook/v1alpha2/component/component_test.go

@@ -3,6 +3,7 @@ package component_test
 import (
 	"context"
 	"fmt"
+	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -121,7 +122,7 @@ var _ = Describe("Component Admission controller Test", func() {
 			mutatedWorkload := baseWorkload.DeepCopy()
 			mutatedWorkload.SetNamespace(component.GetNamespace())
 			mutatedWorkload.SetLabels(util.MergeMap(label, map[string]string{WorkloadTypeLabel: workloadTypeName}))
-			mutatedWorkload.SetAnnotations(map[string]string{util.DefinitionAnnotation: ""})
+			mutatedWorkload.SetAnnotations(map[string]string{oam.DefinitionAnnotation: ""})
 			tests := map[string]struct {
 				client   client.Client
 				workload interface{}

pkg/webhook/v1alpha2/component/mutating_handler.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
 	"net/http"
 
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -126,7 +127,7 @@ func (h *MutatingHandler) Mutate(obj *v1alpha2.Component) error {
 		workload.SetNamespace(obj.GetNamespace())
 		workload.SetLabels(util.MergeMap(obj.GetLabels(), map[string]string{WorkloadTypeLabel: workloadType}))
 		// Add another annotation DefinitionAnnotation which can mark the name of WorkloadDefinition
-		workload.SetAnnotations(util.MergeMap(obj.GetAnnotations(), map[string]string{util.DefinitionAnnotation: workloadType}))
+		workload.SetAnnotations(util.MergeMap(obj.GetAnnotations(), map[string]string{oam.DefinitionAnnotation: workloadType}))
 		mutatelog.Info("Set annotation definition.oam.dev/name for workload", "annotation value", workloadType)
 		// copy back the object
 		rawBye, err := json.Marshal(workload.Object)