Remove an outstanding TODO

Azure · Nov 24, 2020 · f794832 · f794832
1 parent 52d346c
commit f794832
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/hack/generated/pkg/util/armresourceresolver/resolver.go b/hack/generated/pkg/util/armresourceresolver/resolver.go
@@ -80,7 +80,7 @@ func (h ResourceHierarchy) FullAzureName() string {
 	}
 
 	for _, res := range resources {
-		azureNames = append(azureNames, getAzureName(res))
+		azureNames = append(azureNames, res.AzureName())
 	}
 
 	return strings.Join(azureNames, "/")
@@ -201,13 +201,3 @@ func (r *Resolver) findGVK(owner *genruntime.ResourceReference) (schema.GroupVer
 
 	return ownerGvk, nil
 }
-
-// TODO: Remove this when we have proper AzureName defaulting on the way in
-// getAzureName returns the specified AzureName, or else the name of the Kubernetes resource
-func getAzureName(r genruntime.MetaObject) string {
-	if r.AzureName() == "" {
-		return r.GetName()
-	}
-
-	return r.AzureName()
-}
diff --git a/hack/generated/pkg/util/armresourceresolver/resolver_test.go b/hack/generated/pkg/util/armresourceresolver/resolver_test.go
@@ -242,5 +242,5 @@ func Test_ResourceHierarchy_ResourceGroup_NestedResource(t *testing.T) {
 	rg, err := hierarchy.ResourceGroup()
 	g.Expect(err).ToNot(HaveOccurred())
 	g.Expect(rg).To(Equal(resourceGroupName))
-	g.Expect(hierarchy.FullAzureName()).To(Equal(fmt.Sprintf("%s/%s", getAzureName(hierarchy[1]), getAzureName(hierarchy[2]))))
+	g.Expect(hierarchy.FullAzureName()).To(Equal(fmt.Sprintf("%s/%s", hierarchy[1].AzureName(), hierarchy[2].AzureName())))
 }