Set spec.owner on root resource of import (#4611)

* Add conversion method AsArbitraryOwnerReference

* Add conversion methods AsKnownResourceReference

* Pass owner to importer for root resources

* Use helper methods for child imports

* Tidy imports

Author: theunrepentantgeek

v2/cmd/asoctl/pkg/importresources/importable_arm_resource.go

@@ -473,11 +473,7 @@ func (i *importableARMResource) getStatus(
 
 	o := genruntime.ArbitraryOwnerReference{}
 	if i.owner != nil {
-		o = genruntime.ArbitraryOwnerReference{
-			Group: i.owner.Group,
-			Kind:  i.owner.Kind,
-			Name:  i.owner.Name,
-		}
+		o = i.owner.AsArbitraryOwnerReference()
 	}
 
 	err = s.PopulateFromARM(o, reflecthelpers.ValueOfPtr(armStatus)) // TODO: PopulateFromArm expects a value... ick
@@ -569,22 +565,14 @@ func (i *importableARMResource) SetOwner(
 
 	// If the owner is an ArbitraryOwnerReference we need to synthesize one
 	if ownerField.Type() == reflect.PointerTo(reflect.TypeOf(genruntime.ArbitraryOwnerReference{})) {
-		aor := genruntime.ArbitraryOwnerReference{
-			Group: owner.Group,
-			Kind:  owner.Kind,
-			Name:  owner.Name,
-		}
-
+		aor := owner.AsArbitraryOwnerReference()
 		ownerField.Set(reflect.ValueOf(&aor))
 		return
 	}
 
 	// if the owner is a KnownResourceReference, we need to synthesize one
 	if ownerField.Type() == reflect.PointerTo(reflect.TypeOf(genruntime.KnownResourceReference{})) {
-		krr := genruntime.KnownResourceReference{
-			Name: owner.Name,
-		}
-
+		krr := owner.AsKnownResourceReference()
 		ownerField.Set(reflect.ValueOf(&krr))
 		return
 	}

v2/cmd/asoctl/pkg/importresources/resource_importer.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/go-logr/logr"
 	"github.com/rotisserie/eris"
 	"github.com/sourcegraph/conc"
@@ -18,6 +19,7 @@ import (
 	"github.com/Azure/azure-service-operator/v2/cmd/asoctl/pkg/importreporter"
 	"github.com/Azure/azure-service-operator/v2/internal/genericarmclient"
 	"github.com/Azure/azure-service-operator/v2/internal/set"
+	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 )
 
 // ResourceImporter is the entry point for importing resources.
@@ -68,7 +70,12 @@ func (ri *ResourceImporter) Add(importer ImportableResource) {
 
 // AddARMID adds an ARM ID to the list of resources to import.
 func (ri *ResourceImporter) AddARMID(armID string) error {
-	importer, err := NewImportableARMResource(armID, nil /* no owner */, ri.client)
+	owner, err := ri.createOwnerFor(armID)
+	if err != nil {
+		return eris.Wrapf(err, "adding ARMID %s to importer", armID)
+	}
+
+	importer, err := NewImportableARMResource(armID, owner, ri.client)
 	if err != nil {
 		return eris.Wrapf(err, "failed to create importer for %q", armID)
 	}
@@ -370,3 +377,28 @@ func (ri *ResourceImporter) desiredWorkers() int {
 
 	return 4
 }
+
+func (ri *ResourceImporter) createOwnerFor(
+	id string,
+) (*genruntime.ResourceReference, error) {
+	armID, err := arm.ParseResourceID(id)
+	if err != nil {
+		// Error is already detailed, no need to wrap
+		return nil, err
+	}
+
+	if armID.Parent == nil {
+		// there is no parent, so no owner
+		return nil, nil
+	}
+
+	// Resource groups don't need owners
+	if armID.ResourceType.String() == arm.ResourceGroupResourceType.String() {
+		return nil, nil
+	}
+
+	parent := armID.Parent.String()
+	return &genruntime.ResourceReference{
+		ARMID: parent,
+	}, nil
+}

v2/pkg/genruntime/resource_reference.go

@@ -187,6 +187,38 @@ func (ref *ResourceReference) AsNamespacedRef(namespace string) NamespacedResour
 	}
 }
 
+// AsArbitraryOwnerReference creates an ArbitraryOwnerReference from this reference.
+func (ref *ResourceReference) AsArbitraryOwnerReference() ArbitraryOwnerReference {
+	// If this is a direct ARM reference, return just the ARM  ID
+	if ref.IsDirectARMReference() {
+		return ArbitraryOwnerReference{
+			ARMID: ref.ARMID,
+		}
+	}
+
+	// Otherwise return GVK
+	return ArbitraryOwnerReference{
+		Group: ref.Group,
+		Kind:  ref.Kind,
+		Name:  ref.Name,
+	}
+}
+
+// AsKnownResourceReference creates a KnownResourceReference from this reference.
+func (ref *ResourceReference) AsKnownResourceReference() KnownResourceReference {
+	// If this is a direct ARM reference, return just the ARM  ID
+	if ref.IsDirectARMReference() {
+		return KnownResourceReference{
+			ARMID: ref.ARMID,
+		}
+	}
+
+	// Otherwise return just the name
+	return KnownResourceReference{
+		Name: ref.Name,
+	}
+}
+
 // GroupKind returns the GroupKind of the resource reference
 func (ref *ResourceReference) GroupKind() schema.GroupKind {
 	return schema.GroupKind{