remove untested identity and reference

Author: yuwenma

apis/tags/v1beta1/tagbinding_identity.go

@@ -13,71 +13,3 @@
 // limitations under the License.
 
 package v1beta1
-
-import (
-	"context"
-	"fmt"
-
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-// TagBindingIdentity defines the resource reference to TagsTagBinding, which "External" field
-// holds the GCP identifier for the KRM object.
-type TagBindingIdentity struct {
-	parent   string
-	tagValue string
-}
-
-func (i *TagBindingIdentity) String() string {
-	return fmt.Sprintf("tagBindings/%s/%s", i.parent, i.tagValue)
-}
-
-func (i *TagBindingIdentity) Parent() string {
-	return i.parent
-}
-
-func (i *TagBindingIdentity) TagValue() string {
-	return i.tagValue
-}
-
-// New builds a TagBindingIdentity from the Config Connector TagBinding object.
-func NewTagBindingIdentity(ctx context.Context, reader client.Reader, obj *TagsTagBinding) (*TagBindingIdentity, error) {
-	parent, err := resolveParent(ctx, reader, obj)
-	if err != nil {
-		return nil, err
-	}
-
-	tagValue, err := resolveTagValue(ctx, reader, obj)
-	if err != nil {
-		return nil, err
-	}
-
-	return &TagBindingIdentity{
-		parent:   parent,
-		tagValue: tagValue,
-	}, nil
-}
-
-func resolveParent(ctx context.Context, reader client.Reader, obj *TagsTagBinding) (string, error) {
-	if obj.Spec.ParentRef.External != "" {
-		return obj.Spec.ParentRef.External, nil
-	}
-	if obj.Spec.ParentRef.Name != "" {
-		// TODO: This is not quite right, we need to resolve the project number.
-		// For now, we will just use the name.
-		return fmt.Sprintf("//cloudresourcemanager.googleapis.com/projects/%s", obj.Spec.ParentRef.Name), nil
-	}
-	return "", fmt.Errorf("parentRef is required")
-}
-
-func resolveTagValue(ctx context.Context, reader client.Reader, obj *TagsTagBinding) (string, error) {
-	if obj.Spec.TagValueRef.External != "" {
-		return obj.Spec.TagValueRef.External, nil
-	}
-	if obj.Spec.TagValueRef.Name != "" {
-		// TODO: This is not quite right, we need to resolve the tag value name.
-		// For now, we will just use the name.
-		return fmt.Sprintf("tagValues/%s", obj.Spec.TagValueRef.Name), nil
-	}
-	return "", fmt.Errorf("tagValueRef is required")
-}

apis/tags/v1beta1/tagbinding_reference.go

@@ -13,54 +13,3 @@
 // limitations under the License.
 
 package v1beta1
-
-import (
-	"context"
-	"fmt"
-
-	refsv1beta1 "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1"
-	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/k8s"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-var _ refsv1beta1.ExternalNormalizer = &TagsTagValueRef{}
-
-// NormalizedExternal provision the "External" value for other resource that depends on TagsTagValue.
-// If the "External" is given in the other resource's spec.TagsTagValueRef, the given value will be used.
-// Otherwise, the "Name" and "Namespace" will be used to query the actual TagsTagValue object from the cluster.
-func (r *TagsTagValueRef) NormalizedExternal(ctx context.Context, reader client.Reader, otherNamespace string) (string, error) {
-	if r.External != "" && r.Name != "" {
-		return "", fmt.Errorf("cannot specify both name and external on %s reference", "TagsTagValue")
-	}
-	// From given External
-	if r.External != "" {
-		return r.External, nil
-	}
-
-	// From the Config Connector object
-	if r.Namespace == "" {
-		r.Namespace = otherNamespace
-	}
-	key := types.NamespacedName{Name: r.Name, Namespace: r.Namespace}
-	u := &unstructured.Unstructured{}
-	u.SetGroupVersionKind(GroupVersion.WithKind("TagsTagValue"))
-	if err := reader.Get(ctx, key, u); err != nil {
-		if apierrors.IsNotFound(err) {
-			return "", k8s.NewReferenceNotFoundError(u.GroupVersionKind(), key)
-		}
-		return "", fmt.Errorf("reading referenced %s %s: %w", "TagsTagValue", key, err)
-	}
-	// Get external from status.selfLink. This is the most trustworthy place.
-	actualExternalRef, _, err := unstructured.NestedString(u.Object, "status", "selfLink")
-	if err != nil {
-		return "", fmt.Errorf("reading status.selfLink: %w", err)
-	}
-	if actualExternalRef == "" {
-		return "", k8s.NewReferenceNotReadyError(u.GroupVersionKind(), key)
-	}
-	r.External = actualExternalRef
-	return r.External, nil
-}