Merge pull request #303 from crossplane/backport-302-to-release-0.17

[Backport release-0.17] Fix panic when returning error with provider reference name

apis/storage/v1alpha3/test/container.go

@@ -93,6 +93,12 @@ func (tc *MockContainer) WithSpecProviderRef(name string) *MockContainer {
 	return tc
 }
 
+// WithSpecProviderConfigRef sets spec account reference value
+func (tc *MockContainer) WithSpecProviderConfigRef(name string) *MockContainer {
+	tc.Container.Spec.ProviderConfigReference = &xpv1.Reference{Name: name}
+	return tc
+}
+
 // WithSpecDeletionPolicy sets spec deletion policy value
 func (tc *MockContainer) WithSpecDeletionPolicy(p xpv1.DeletionPolicy) *MockContainer {
 	tc.Container.Spec.DeletionPolicy = p

pkg/controller/storage/container/container.go

@@ -155,7 +155,7 @@ func (m *containerSyncdeleterMaker) newSyncdeleter(ctx context.Context, c *v1alp
 				return nil, errors.Wrapf(err, "failed to update after removing finalizer")
 			}
 		}
-		return nil, errors.Wrapf(err, "failed to retrieve storage account: %s", c.Spec.ProviderReference.Name)
+		return nil, errors.Wrapf(err, "failed to retrieve storage account: %s", nn.Name)
 	}
 
 	if acct.GetWriteConnectionSecretToReference() == nil {

pkg/controller/storage/container/container_test.go

@@ -314,7 +314,7 @@ func Test_containerSyncdeleterMaker_newSyncdeleter(t *testing.T) {
 		want   want
 	}{
 		{
-			name: "FailedToGetAccountNotFoundNoDelete",
+			name: "FailedToGetAccountNotFoundNoDeleteProviderRef",
 			fields: fields{
 				Client: &test.MockClient{
 					MockGet: func(ctx context.Context, key client.ObjectKey, obj client.Object) error {
@@ -331,6 +331,24 @@ func Test_containerSyncdeleterMaker_newSyncdeleter(t *testing.T) {
 					"failed to retrieve storage account: %s", testAccountName),
 			},
 		},
+		{
+			name: "FailedToGetAccountNotFoundNoDeleteProviderConfigRef",
+			fields: fields{
+				Client: &test.MockClient{
+					MockGet: func(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+						return newAccountNotFoundError(testAccountName)
+					},
+				},
+			},
+			args: args{
+				ctx: ctx,
+				c:   newCont().WithSpecProviderConfigRef(testAccountName).WithFinalizer(finalizer).Container,
+			},
+			want: want{
+				err: errors.Wrapf(newAccountNotFoundError(testAccountName),
+					"failed to retrieve storage account: %s", testAccountName),
+			},
+		},
 		{
 			name: "FailedToGetAccountNotFoundYesDelete",
 			fields: fields{