use containing API group when resolving shortname from discovery

pkg/kubectl/cmd/util/shortcut_restmapper.go

@@ -115,6 +115,7 @@ func (e shortcutExpander) expandResourceShortcut(resource schema.GroupVersionRes
 			}
 			if resource.Resource == item.ShortForm.Resource {
 				resource.Resource = item.LongForm.Resource
+				resource.Group = item.LongForm.Group
 				return resource
 			}
 		}

pkg/kubectl/cmd/util/shortcut_restmapper_test.go

@@ -46,7 +46,7 @@ func TestReplaceAliases(t *testing.T) {
 		{
 			name:     "hpa-priority",
 			arg:      "hpa",
-			expected: schema.GroupVersionResource{Resource: "superhorizontalpodautoscalers"},
+			expected: schema.GroupVersionResource{Resource: "superhorizontalpodautoscalers", Group: "autoscaling"},
 			srvRes: []*metav1.APIResourceList{
 				{
 					GroupVersion: "autoscaling/v1",
@@ -68,6 +68,31 @@ func TestReplaceAliases(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:     "resource-override",
+			arg:      "dpl",
+			expected: schema.GroupVersionResource{Resource: "deployments", Group: "foo"},
+			srvRes: []*metav1.APIResourceList{
+				{
+					GroupVersion: "foo/v1",
+					APIResources: []metav1.APIResource{
+						{
+							Name:       "deployments",
+							ShortNames: []string{"dpl"},
+						},
+					},
+				},
+				{
+					GroupVersion: "extension/v1beta1",
+					APIResources: []metav1.APIResource{
+						{
+							Name:       "deployments",
+							ShortNames: []string{"deploy"},
+						},
+					},
+				},
+			},
+		},
 	}
 
 	ds := &fakeDiscoveryClient{}