Improve resource condition/error when deletion is not permitted in Azure

v2/internal/controllers/crd_eventgrid_domain_test.go

@@ -60,6 +60,7 @@ func Test_EventGrid_Domain(t *testing.T) {
 			Owner: testcommon.AsOwner(acct),
 		},
 	}
+	tc.AddAnnotation(&queueServices.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.CreateResourceAndWait(queueServices)
 

v2/internal/controllers/crd_eventgrid_topic_test.go

@@ -116,6 +116,9 @@ func Topic_Subscription_CRUD(tc *testcommon.KubePerTestContext, rg *resources.Re
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&queueService.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.CreateResourceAndWait(queueService)
 
 	queue := &storage.StorageAccountsQueueServicesQueue{

v2/internal/controllers/crd_dataprotection_backupinstance_20231101_test.go → v2/internal/controllers/dataprotection_backupinstance_crud_20231101_test.go

@@ -71,6 +71,9 @@ func Test_DataProtection_BackupInstance_20231101_CRUD(t *testing.T) {
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&blobService.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	blobContainer := &storage.StorageAccountsBlobServicesContainer{
 		ObjectMeta: tc.MakeObjectMeta("velero"),
 		Spec: storage.StorageAccountsBlobServicesContainer_Spec{

v2/internal/controllers/dbformysql_flexibleserver_20210501_test.go

@@ -244,6 +244,8 @@ func MySQLFlexibleServer_Configuration_20220101_CRUD(tc *testcommon.KubePerTestC
 			Value:     to.Ptr("20"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.CreateResourceAndWait(configuration)
 	tc.Expect(configuration.Status.Id).ToNot(BeNil())
 }

v2/internal/controllers/dbformysql_flexibleserver_20230630_test.go

@@ -243,6 +243,8 @@ func MySQLFlexibleServer_Configuration_20230630_CRUD(tc *testcommon.KubePerTestC
 			Value:     to.Ptr("20"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.CreateResourceAndWait(configuration)
 	tc.Expect(configuration.Status.Id).ToNot(BeNil())
 }

v2/internal/controllers/dbformysql_flexibleserver_20231230_test.go

@@ -238,6 +238,8 @@ func MySQLFlexibleServer_Configuration_20231230_CRUD(tc *testcommon.KubePerTestC
 			Value:     to.Ptr("20"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.CreateResourceAndWait(configuration)
 	tc.Expect(configuration.Status.Id).ToNot(BeNil())
 }

v2/internal/controllers/dbforpostgresql_flexibleserver_crud_v1api20221201_test.go

@@ -166,6 +166,7 @@ func FlexibleServer_Configuration_20221201_CRUD(tc *testcommon.KubePerTestContex
 			Value:     to.Ptr("READ"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.CreateResourceAndWait(configuration)
 	// This isn't a "real" resource so it cannot be deleted directly

v2/internal/controllers/dbforpostgresql_flexibleserver_crud_v1api20230601preview_test.go

@@ -203,6 +203,7 @@ func FlexibleServer_Configuration_20230601Preview_CRUD(tc *testcommon.KubePerTes
 			Value:     to.Ptr("READ"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.CreateResourceAndWait(configuration)
 	// This isn't a "real" resource so it cannot be deleted directly

v2/internal/controllers/dbforpostgresql_flexibleserver_crud_v1api20240801_test.go

@@ -225,6 +225,7 @@ func FlexibleServer_Configuration_20240801_CRUD(tc *testcommon.KubePerTestContex
 			Value:     to.Ptr("READ"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.CreateResourceAndWait(configuration)
 	// This isn't a "real" resource so it cannot be deleted directly
@@ -261,9 +262,10 @@ func FlexibleServer_AdvancedThreatProtection_20240801_CRUD(tc *testcommon.KubePe
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&threatProtection.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.CreateResourceAndWait(threatProtection)
-	// This isn't a "real" resource so it cannot be deleted directly
-	// defer tc.DeleteResourceAndWait(threatProtection)
 
 	tc.Expect(threatProtection.Status.Id).ToNot(BeNil())
 }

v2/internal/controllers/documentdb_mongodb_crud_v20210515_test.go

@@ -175,6 +175,7 @@ func CosmosDB_MongoDB_Database_ThroughputSettings_CRUD(tc *testcommon.KubePerTes
 			},
 		},
 	}
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.T.Log("creating mongo database throughput")
 	tc.CreateResourceAndWait(&throughputSettings)
@@ -205,9 +206,11 @@ func CosmosDB_MongoDB_Database_Collections_ThroughputSettings_CRUD(tc *testcommo
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.T.Log("creating mongo database collections throughput")
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())

v2/internal/controllers/documentdb_mongodb_crud_v20231115_test.go

@@ -198,6 +198,7 @@ func DocumentDB_MongoDB_Database_ThroughputSettings_v20231115_CRUD(tc *testcommo
 			},
 		},
 	}
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.T.Log("creating mongo database throughput")
 	tc.CreateResourceAndWait(&throughputSettings)
@@ -228,9 +229,11 @@ func DocumentDB_MongoDB_Database_Collections_ThroughputSettings_v20231515_CRUD(t
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.LogSectionf("creating mongo database collections throughput")
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())

v2/internal/controllers/documentdb_mongodb_crud_v20240815_test.go

@@ -221,6 +221,7 @@ func DocumentDB_MongoDB_Database_ThroughputSettings_v20240815_CRUD(tc *testcommo
 			},
 		},
 	}
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
 	tc.T.Log("creating mongo database throughput")
 	tc.CreateResourceAndWait(&throughputSettings)
@@ -251,9 +252,11 @@ func DocumentDB_MongoDB_Database_Collections_ThroughputSettings_v20240815_CRUD(t
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.LogSectionf("creating mongo database collections throughput")
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())

v2/internal/controllers/documentdb_sql_crud_v20231115_test.go

@@ -326,9 +326,11 @@ func CosmosDB_SQL_Database_ThroughputSettings_v20231115_CRUD(tc *testcommon.Kube
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	// Create the resource
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())
@@ -359,9 +361,11 @@ func CosmosDB_SQL_Database_Container_ThroughputSettings_v20231115_CRUD(tc *testc
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	// Create the resource
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())

v2/internal/controllers/documentdb_sql_crud_v20240815_test.go

@@ -325,9 +325,11 @@ func CosmosDB_SQL_Database_ThroughputSettings_v20240815_CRUD(tc *testcommon.Kube
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	// Create the resource
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())
@@ -358,9 +360,11 @@ func CosmosDB_SQL_Database_Container_ThroughputSettings_v20240815_CRUD(tc *testc
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&throughputSettings.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	// Create the resource
 	tc.CreateResourceAndWait(&throughputSettings)
-	// no DELETE, this is not a real resource - to delete it you must delete its parent
 
 	// Ensure that the status is what we expect
 	tc.Expect(throughputSettings.Status.Id).ToNot(BeNil())

v2/internal/controllers/insights_component_crud_20200202_test.go

@@ -152,6 +152,9 @@ func Insights_PricingPlan_20171001_CRUD(
 		},
 	}
 
+	// Don't try to delete directly, this is not a real resource - to delete it you must delete its parent
+	tc.AddAnnotation(&plan.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
+
 	tc.CreateResourceAndWait(plan)
 
 	tc.Expect(plan.Status.PlanType).NotTo(BeNil())

v2/internal/controllers/crd_mariadb_server_test.go → v2/internal/controllers/mariadb_server_crud_20180601_test.go

@@ -32,7 +32,7 @@ func Test_MariaDB_Server_CRUD(t *testing.T) {
 	adminUser := "testadmin"
 	adminPasswordRef := createPasswordSecret("admin", "password", tc)
 
-	server := mariadb.Server{
+	server := &mariadb.Server{
 		ObjectMeta: tc.MakeObjectMetaWithName(serverName),
 		Spec: mariadb.Server_Spec{
 			AzureName: serverName,
@@ -65,37 +65,29 @@ func Test_MariaDB_Server_CRUD(t *testing.T) {
 		},
 	}
 
-	tc.T.Logf("Creating MariaDB Server %q", serverName)
-	tc.CreateResourcesAndWait(&server)
-
-	tc.ExpectSecretHasKeys(fqdnSecret, "fqdn")
-
 	// Configuration
 	configName := tc.NoSpaceNamer.GenerateName("mcfg")
 
-	configuration := mariadb.Configuration{
+	configuration := &mariadb.Configuration{
 		ObjectMeta: tc.MakeObjectMetaWithName(configName),
 		Spec: mariadb.Configuration_Spec{
 			AzureName: "query_cache_size",
-			Owner:     testcommon.AsOwner(&server),
+			Owner:     testcommon.AsOwner(server),
 			Value:     to.Ptr("102400"),
 		},
 	}
+	tc.AddAnnotation(&configuration.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 
-	tc.T.Logf("Creating MariaDB Configuration %q", configName)
-	tc.CreateResourcesAndWait(&configuration)
-	// Can't delete, so don't even try // defer tc.DeleteResourcesAndWait(&configuration)
-
-	database := mariadb.Database{
+	database := &mariadb.Database{
 		ObjectMeta: tc.MakeObjectMetaWithName(configName),
 		Spec: mariadb.Database_Spec{
 			AzureName: *to.Ptr("adventureworks"),
-			Owner:     testcommon.AsOwner(&server),
+			Owner:     testcommon.AsOwner(server),
 		},
 	}
 
-	tc.T.Logf("Creating MariaDB Database %q", database.Spec.AzureName)
-	tc.CreateResourcesAndWait(&database)
+	tc.CreateResourcesAndWait(server, database, configuration)
+	tc.ExpectSecretHasKeys(fqdnSecret, "fqdn")
 }
 
 func createPasswordSecret(

v2/internal/controllers/owner_arm_id_test.go

@@ -73,6 +73,7 @@ func Test_OwnerIsARMIDOfParent_ChildResourceSuccessfullyReconciled(t *testing.T)
 			Owner: testcommon.AsOwner(acct),
 		},
 	}
+	tc.AddAnnotation(&blobService.ObjectMeta, "serviceoperator.azure.com/reconcile-policy", "detach-on-delete")
 	tc.CreateResourceAndWait(blobService)
 
 	tc.Expect(blobService.Status.Id).ToNot(BeNil())