diff --git a/v2/internal/controllers/apimanagement_20220801_test.go b/v2/internal/controllers/apimanagement_20220801_test.go index b492796424d..d2cdbf262ee 100644 --- a/v2/internal/controllers/apimanagement_20220801_test.go +++ b/v2/internal/controllers/apimanagement_20220801_test.go @@ -318,12 +318,6 @@ func APIM_Product_Policy_CRUD(tc *testcommon.KubePerTestContext, service client. }, } - tc.T.Log("creating apim product to attach policy to") - tc.CreateResourceAndWait(&product) - - tc.Expect(product.Status).ToNot(BeNil()) - tc.Expect(product.Status.Id).ToNot(BeNil()) - productPolicy := apim.ProductPolicy{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("productpolicy")), Spec: apim.ProductPolicy_Spec{ @@ -332,9 +326,11 @@ func APIM_Product_Policy_CRUD(tc *testcommon.KubePerTestContext, service client. }, } - tc.T.Log("creating apim product policy") - tc.CreateResourceAndWait(&productPolicy) + tc.T.Log("creating apim product and product policy") + tc.CreateResourcesAndWait(&product, &productPolicy) + tc.Expect(product.Status).ToNot(BeNil()) + tc.Expect(product.Status.Id).ToNot(BeNil()) tc.Expect(productPolicy.Status).ToNot(BeNil()) tc.Expect(productPolicy.Status.Id).ToNot(BeNil()) @@ -356,12 +352,6 @@ func APIM_Product_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Obj }, } - tc.T.Log("creating apim product to attach api to") - tc.CreateResourceAndWait(&product) - - tc.Expect(product.Status).ToNot(BeNil()) - tc.Expect(product.Status.Id).ToNot(BeNil()) - versionSet := apim.ApiVersionSet{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("vs2")), Spec: apim.ApiVersionSet_Spec{ @@ -372,12 +362,8 @@ func APIM_Product_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Obj }, } - tc.T.Log("creating apim version set") - tc.CreateResourceAndWait(&versionSet) - - versionSetReference := genruntime.ResourceReference{ - ARMID: *versionSet.Status.Id, - } + // Use within-cluster reference instead of ARMID + versionSetReference := tc.MakeReferenceFromResource(&versionSet) // Add a simple Api api := apim.Api{ @@ -387,7 +373,7 @@ func APIM_Product_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Obj ApiRevision: to.Ptr("v1"), ApiRevisionDescription: to.Ptr("First Revision"), ApiVersionDescription: to.Ptr("Second Version"), - ApiVersionSetReference: &versionSetReference, + ApiVersionSetReference: versionSetReference, Description: to.Ptr("A Description about the api"), DisplayName: to.Ptr("account-api2"), Owner: testcommon.AsOwner(service), @@ -409,9 +395,6 @@ func APIM_Product_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Obj }, } - tc.T.Log("creating apim api to attach to product") - tc.CreateResourceAndWait(&api) - // Now link the display name of the api to the product productAPI := apim.ProductApi{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("productapi")), @@ -421,9 +404,11 @@ func APIM_Product_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Obj }, } - tc.T.Log("creating apim product api") - tc.CreateResourceAndWait(&productAPI) + tc.T.Log("creating apim product, version set, api and product api") + tc.CreateResourcesAndWait(&product, &versionSet, &api, &productAPI) + tc.Expect(product.Status).ToNot(BeNil()) + tc.Expect(product.Status.Id).ToNot(BeNil()) tc.Expect(productAPI.Status).ToNot(BeNil()) defer tc.DeleteResourceAndWait(&product) @@ -443,12 +428,8 @@ func APIM_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Object) { }, } - tc.T.Log("creating apim version set") - tc.CreateResourceAndWait(&versionSet) - - versionSetReference := genruntime.ResourceReference{ - ARMID: *versionSet.Status.Id, - } + // Use within-cluster reference instead of ARMID + versionSetReference := tc.MakeReferenceFromResource(&versionSet) // Add a simple Api api := apim.Api{ @@ -458,7 +439,7 @@ func APIM_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Object) { ApiRevision: to.Ptr("v1"), ApiRevisionDescription: to.Ptr("First Revision"), ApiVersionDescription: to.Ptr("Second Version"), - ApiVersionSetReference: &versionSetReference, + ApiVersionSetReference: versionSetReference, Description: to.Ptr("A Description about the api"), DisplayName: to.Ptr("account-api"), Owner: testcommon.AsOwner(service), @@ -480,8 +461,8 @@ func APIM_Api_CRUD(tc *testcommon.KubePerTestContext, service client.Object) { }, } - tc.T.Log("creating apim api") - tc.CreateResourceAndWait(&api) + tc.T.Log("creating apim version set and api") + tc.CreateResourcesAndWait(&versionSet, &api) defer tc.DeleteResourceAndWait(&api) tc.Expect(api.Status).ToNot(BeNil()) @@ -528,9 +509,6 @@ func APIM_AuthorizationProviders_Authorization_CRUD(tc *testcommon.KubePerTestCo }, } - tc.T.Log("creating apim authorization provider") - tc.CreateResourceAndWait(&authorizationProvider) - authorization := apim.AuthorizationProvidersAuthorization{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization")), Spec: apim.AuthorizationProvidersAuthorization_Spec{ @@ -540,8 +518,8 @@ func APIM_AuthorizationProviders_Authorization_CRUD(tc *testcommon.KubePerTestCo }, } - tc.T.Log("creating apim authorization") - tc.CreateResourceAndWait(&authorization) + tc.T.Log("creating apim authorization provider and authorization") + tc.CreateResourcesAndWait(&authorizationProvider, &authorization) defer tc.DeleteResourceAndWait(&authorization) tc.Expect(authorization.Status).ToNot(BeNil()) @@ -567,9 +545,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy_CRUD(tc *testcommon }, } - tc.T.Log("creating apim authorization provider") - tc.CreateResourceAndWait(&authorizationProvider) - authorization := apim.AuthorizationProvidersAuthorization{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization")), Spec: apim.AuthorizationProvidersAuthorization_Spec{ @@ -579,9 +554,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy_CRUD(tc *testcommon }, } - tc.T.Log("creating apim authorization") - tc.CreateResourceAndWait(&authorization) - configMapName := "my-configmap" principalIDKey := "principalId" tenantIDKey := "tenantId" @@ -607,10 +579,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy_CRUD(tc *testcommon }, } - tc.CreateResourceAndWait(mi) - tc.Expect(mi.Status.TenantId).ToNot(BeNil()) - tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) - accessPolicy := apim.AuthorizationProvidersAuthorizationsAccessPolicy{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization-access-policy")), Spec: apim.AuthorizationProvidersAuthorizationsAccessPolicy_Spec{ @@ -626,8 +594,10 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy_CRUD(tc *testcommon }, } - tc.T.Log("creating apim authorization accessPolicy") - tc.CreateResourceAndWait(&accessPolicy) + tc.T.Log("creating apim authorization provider, authorization, managed identity and access policy") + tc.CreateResourcesAndWait(&authorizationProvider, &authorization, mi, &accessPolicy) + tc.Expect(mi.Status.TenantId).ToNot(BeNil()) + tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) defer tc.DeleteResourceAndWait(&accessPolicy) tc.Expect(accessPolicy.Status).ToNot(BeNil()) diff --git a/v2/internal/controllers/apimanagement_20230501preview_test.go b/v2/internal/controllers/apimanagement_20230501preview_test.go index a9e580fc34a..576a219362d 100644 --- a/v2/internal/controllers/apimanagement_20230501preview_test.go +++ b/v2/internal/controllers/apimanagement_20230501preview_test.go @@ -311,12 +311,6 @@ func APIM_Product_Policy20230501preview_CRUD(tc *testcommon.KubePerTestContext, }, } - tc.T.Log("creating apim product to attach policy to") - tc.CreateResourceAndWait(&product) - - tc.Expect(product.Status).ToNot(BeNil()) - tc.Expect(product.Status.Id).ToNot(BeNil()) - productPolicy := apim.ProductPolicy{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("productpolicy")), Spec: apim.ProductPolicy_Spec{ @@ -325,9 +319,11 @@ func APIM_Product_Policy20230501preview_CRUD(tc *testcommon.KubePerTestContext, }, } - tc.T.Log("creating apim product policy") - tc.CreateResourceAndWait(&productPolicy) + tc.T.Log("creating apim product and product policy") + tc.CreateResourcesAndWait(&product, &productPolicy) + tc.Expect(product.Status).ToNot(BeNil()) + tc.Expect(product.Status.Id).ToNot(BeNil()) tc.Expect(productPolicy.Status).ToNot(BeNil()) tc.Expect(productPolicy.Status.Id).ToNot(BeNil()) @@ -349,12 +345,6 @@ func APIM_Product_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, ser }, } - tc.T.Log("creating apim product to attach api to") - tc.CreateResourceAndWait(&product) - - tc.Expect(product.Status).ToNot(BeNil()) - tc.Expect(product.Status.Id).ToNot(BeNil()) - versionSet := apim.ApiVersionSet{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("vs2")), Spec: apim.ApiVersionSet_Spec{ @@ -365,12 +355,8 @@ func APIM_Product_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, ser }, } - tc.T.Log("creating apim version set") - tc.CreateResourceAndWait(&versionSet) - - versionSetReference := genruntime.ResourceReference{ - ARMID: *versionSet.Status.Id, - } + // Use within-cluster reference instead of ARMID + versionSetReference := tc.MakeReferenceFromResource(&versionSet) // Add a simple Api api := apim.Api{ @@ -380,7 +366,7 @@ func APIM_Product_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, ser ApiRevision: to.Ptr("v1"), ApiRevisionDescription: to.Ptr("First Revision"), ApiVersionDescription: to.Ptr("Second Version"), - ApiVersionSetReference: &versionSetReference, + ApiVersionSetReference: versionSetReference, Description: to.Ptr("A Description about the api"), DisplayName: to.Ptr("account-api2"), Owner: testcommon.AsOwner(service), @@ -402,9 +388,6 @@ func APIM_Product_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, ser }, } - tc.T.Log("creating apim api to attach to product") - tc.CreateResourceAndWait(&api) - // Now link the display name of the api to the product productAPI := apim.ProductApi{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("productapi")), @@ -414,9 +397,11 @@ func APIM_Product_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, ser }, } - tc.T.Log("creating apim product api") - tc.CreateResourceAndWait(&productAPI) + tc.T.Log("creating apim product, version set, api and product api") + tc.CreateResourcesAndWait(&product, &versionSet, &api, &productAPI) + tc.Expect(product.Status).ToNot(BeNil()) + tc.Expect(product.Status.Id).ToNot(BeNil()) tc.Expect(productAPI.Status).ToNot(BeNil()) defer tc.DeleteResourceAndWait(&product) @@ -436,12 +421,8 @@ func APIM_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, service cli }, } - tc.T.Log("creating apim version set") - tc.CreateResourceAndWait(&versionSet) - - versionSetReference := genruntime.ResourceReference{ - ARMID: *versionSet.Status.Id, - } + // Use within-cluster reference instead of ARMID + versionSetReference := tc.MakeReferenceFromResource(&versionSet) // Add a simple Api api := apim.Api{ @@ -451,7 +432,7 @@ func APIM_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, service cli ApiRevision: to.Ptr("v1"), ApiRevisionDescription: to.Ptr("First Revision"), ApiVersionDescription: to.Ptr("Second Version"), - ApiVersionSetReference: &versionSetReference, + ApiVersionSetReference: versionSetReference, Description: to.Ptr("A Description about the api"), DisplayName: to.Ptr("account-api"), Owner: testcommon.AsOwner(service), @@ -473,8 +454,8 @@ func APIM_Api20230501preview_CRUD(tc *testcommon.KubePerTestContext, service cli }, } - tc.T.Log("creating apim api") - tc.CreateResourceAndWait(&api) + tc.T.Log("creating apim version set and api") + tc.CreateResourcesAndWait(&versionSet, &api) defer tc.DeleteResourceAndWait(&api) tc.Expect(api.Status).ToNot(BeNil()) @@ -521,9 +502,6 @@ func APIM_AuthorizationProviders_Authorization20230501preview_CRUD(tc *testcommo }, } - tc.T.Log("creating apim authorization provider") - tc.CreateResourceAndWait(&authorizationProvider) - authorization := apim.AuthorizationProvidersAuthorization{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization")), Spec: apim.AuthorizationProvidersAuthorization_Spec{ @@ -533,8 +511,8 @@ func APIM_AuthorizationProviders_Authorization20230501preview_CRUD(tc *testcommo }, } - tc.T.Log("creating apim authorization") - tc.CreateResourceAndWait(&authorization) + tc.T.Log("creating apim authorization provider and authorization") + tc.CreateResourcesAndWait(&authorizationProvider, &authorization) defer tc.DeleteResourceAndWait(&authorization) tc.Expect(authorization.Status).ToNot(BeNil()) @@ -560,9 +538,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20230501preview_CRUD }, } - tc.T.Log("creating apim authorization provider") - tc.CreateResourceAndWait(&authorizationProvider) - authorization := apim.AuthorizationProvidersAuthorization{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization")), Spec: apim.AuthorizationProvidersAuthorization_Spec{ @@ -572,9 +547,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20230501preview_CRUD }, } - tc.T.Log("creating apim authorization") - tc.CreateResourceAndWait(&authorization) - configMapName := "my-configmap" principalIDKey := "principalId" tenantIDKey := "tenantId" @@ -600,10 +572,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20230501preview_CRUD }, } - tc.CreateResourceAndWait(mi) - tc.Expect(mi.Status.TenantId).ToNot(BeNil()) - tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) - accessPolicy := apim.AuthorizationProvidersAuthorizationsAccessPolicy{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization-access-policy")), Spec: apim.AuthorizationProvidersAuthorizationsAccessPolicy_Spec{ @@ -619,8 +587,10 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20230501preview_CRUD }, } - tc.T.Log("creating apim authorization accessPolicy") - tc.CreateResourceAndWait(&accessPolicy) + tc.T.Log("creating apim authorization provider, authorization, managed identity and access policy") + tc.CreateResourcesAndWait(&authorizationProvider, &authorization, mi, &accessPolicy) + tc.Expect(mi.Status.TenantId).ToNot(BeNil()) + tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) defer tc.DeleteResourceAndWait(&accessPolicy) tc.Expect(accessPolicy.Status).ToNot(BeNil()) diff --git a/v2/internal/controllers/apimanagement_20240501_test.go b/v2/internal/controllers/apimanagement_20240501_test.go index 192d5241b4a..936d9d9728f 100644 --- a/v2/internal/controllers/apimanagement_20240501_test.go +++ b/v2/internal/controllers/apimanagement_20240501_test.go @@ -308,12 +308,6 @@ func APIM_Product_Policy20240501_CRUD(tc *testcommon.KubePerTestContext, service }, } - tc.T.Log("creating apim product to attach policy to") - tc.CreateResourceAndWait(&product) - - tc.Expect(product.Status).ToNot(BeNil()) - tc.Expect(product.Status.Id).ToNot(BeNil()) - productPolicy := apim.ProductPolicy{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("productpolicy")), Spec: apim.ProductPolicy_Spec{ @@ -322,9 +316,11 @@ func APIM_Product_Policy20240501_CRUD(tc *testcommon.KubePerTestContext, service }, } - tc.T.Log("creating apim product policy") - tc.CreateResourceAndWait(&productPolicy) + tc.T.Log("creating apim product and product policy") + tc.CreateResourcesAndWait(&product, &productPolicy) + tc.Expect(product.Status).ToNot(BeNil()) + tc.Expect(product.Status.Id).ToNot(BeNil()) tc.Expect(productPolicy.Status).ToNot(BeNil()) tc.Expect(productPolicy.Status.Id).ToNot(BeNil()) @@ -346,12 +342,6 @@ func APIM_Product_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service cl }, } - tc.T.Log("creating apim product to attach api to") - tc.CreateResourceAndWait(&product) - - tc.Expect(product.Status).ToNot(BeNil()) - tc.Expect(product.Status.Id).ToNot(BeNil()) - versionSet := apim.ApiVersionSet{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("vs2")), Spec: apim.ApiVersionSet_Spec{ @@ -362,12 +352,8 @@ func APIM_Product_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service cl }, } - tc.T.Log("creating apim version set") - tc.CreateResourceAndWait(&versionSet) - - versionSetReference := genruntime.ResourceReference{ - ARMID: *versionSet.Status.Id, - } + // Use within-cluster reference instead of ARMID + versionSetReference := tc.MakeReferenceFromResource(&versionSet) // Add a simple Api api := apim.Api{ @@ -377,7 +363,7 @@ func APIM_Product_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service cl ApiRevision: to.Ptr("v1"), ApiRevisionDescription: to.Ptr("First Revision"), ApiVersionDescription: to.Ptr("Second Version"), - ApiVersionSetReference: &versionSetReference, + ApiVersionSetReference: versionSetReference, Description: to.Ptr("A Description about the api"), DisplayName: to.Ptr("account-api2"), Owner: testcommon.AsOwner(service), @@ -399,9 +385,6 @@ func APIM_Product_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service cl }, } - tc.T.Log("creating apim api to attach to product") - tc.CreateResourceAndWait(&api) - // Now link the display name of the api to the product productAPI := apim.ProductApi{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("productapi")), @@ -411,9 +394,11 @@ func APIM_Product_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service cl }, } - tc.T.Log("creating apim product api") - tc.CreateResourceAndWait(&productAPI) + tc.T.Log("creating apim product, version set, api and product api") + tc.CreateResourcesAndWait(&product, &versionSet, &api, &productAPI) + tc.Expect(product.Status).ToNot(BeNil()) + tc.Expect(product.Status.Id).ToNot(BeNil()) tc.Expect(productAPI.Status).ToNot(BeNil()) defer tc.DeleteResourceAndWait(&product) @@ -433,12 +418,8 @@ func APIM_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service client.Obj }, } - tc.T.Log("creating apim version set") - tc.CreateResourceAndWait(&versionSet) - - versionSetReference := genruntime.ResourceReference{ - ARMID: *versionSet.Status.Id, - } + // Use within-cluster reference instead of ARMID + versionSetReference := tc.MakeReferenceFromResource(&versionSet) // Add a simple Api api := apim.Api{ @@ -448,7 +429,7 @@ func APIM_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service client.Obj ApiRevision: to.Ptr("v1"), ApiRevisionDescription: to.Ptr("First Revision"), ApiVersionDescription: to.Ptr("Second Version"), - ApiVersionSetReference: &versionSetReference, + ApiVersionSetReference: versionSetReference, Description: to.Ptr("A Description about the api"), DisplayName: to.Ptr("account-api"), Owner: testcommon.AsOwner(service), @@ -470,8 +451,8 @@ func APIM_Api20240501_CRUD(tc *testcommon.KubePerTestContext, service client.Obj }, } - tc.T.Log("creating apim api") - tc.CreateResourceAndWait(&api) + tc.T.Log("creating apim version set and api") + tc.CreateResourcesAndWait(&versionSet, &api) defer tc.DeleteResourceAndWait(&api) tc.Expect(api.Status).ToNot(BeNil()) @@ -518,9 +499,6 @@ func APIM_AuthorizationProviders_Authorization20240501_CRUD(tc *testcommon.KubeP }, } - tc.T.Log("creating apim authorization provider") - tc.CreateResourceAndWait(&authorizationProvider) - authorization := apim.AuthorizationProvidersAuthorization{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization")), Spec: apim.AuthorizationProvidersAuthorization_Spec{ @@ -530,8 +508,8 @@ func APIM_AuthorizationProviders_Authorization20240501_CRUD(tc *testcommon.KubeP }, } - tc.T.Log("creating apim authorization") - tc.CreateResourceAndWait(&authorization) + tc.T.Log("creating apim authorization provider and authorization") + tc.CreateResourcesAndWait(&authorizationProvider, &authorization) defer tc.DeleteResourceAndWait(&authorization) tc.Expect(authorization.Status).ToNot(BeNil()) @@ -557,9 +535,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20240501_CRUD(tc *te }, } - tc.T.Log("creating apim authorization provider") - tc.CreateResourceAndWait(&authorizationProvider) - authorization := apim.AuthorizationProvidersAuthorization{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization")), Spec: apim.AuthorizationProvidersAuthorization_Spec{ @@ -569,9 +544,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20240501_CRUD(tc *te }, } - tc.T.Log("creating apim authorization") - tc.CreateResourceAndWait(&authorization) - configMapName := "my-configmap" principalIDKey := "principalId" tenantIDKey := "tenantId" @@ -597,10 +569,6 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20240501_CRUD(tc *te }, } - tc.CreateResourceAndWait(mi) - tc.Expect(mi.Status.TenantId).ToNot(BeNil()) - tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) - accessPolicy := apim.AuthorizationProvidersAuthorizationsAccessPolicy{ ObjectMeta: tc.MakeObjectMetaWithName(tc.Namer.GenerateName("authorization-access-policy")), Spec: apim.AuthorizationProvidersAuthorizationsAccessPolicy_Spec{ @@ -616,8 +584,10 @@ func APIM_AuthorizationProviders_Authorizations_AccessPolicy20240501_CRUD(tc *te }, } - tc.T.Log("creating apim authorization accessPolicy") - tc.CreateResourceAndWait(&accessPolicy) + tc.T.Log("creating apim authorization provider, authorization, managed identity and access policy") + tc.CreateResourcesAndWait(&authorizationProvider, &authorization, mi, &accessPolicy) + tc.Expect(mi.Status.TenantId).ToNot(BeNil()) + tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) defer tc.DeleteResourceAndWait(&accessPolicy) tc.Expect(accessPolicy.Status).ToNot(BeNil()) diff --git a/v2/internal/controllers/authorization_roleassignment_20220401_test.go b/v2/internal/controllers/authorization_roleassignment_20220401_test.go index a42f1208d0e..67b476cc7b7 100644 --- a/v2/internal/controllers/authorization_roleassignment_20220401_test.go +++ b/v2/internal/controllers/authorization_roleassignment_20220401_test.go @@ -175,10 +175,6 @@ func Test_Authorization_RoleAssignment_OnStorageAccount_CRUD(t *testing.T) { }, } - tc.CreateResourceAndWait(mi) - tc.Expect(mi.Status.TenantId).ToNot(BeNil()) - tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) - // Create a storage account accessTier := storage.StorageAccountPropertiesCreateParameters_AccessTier_Hot kind := storage.StorageAccount_Kind_Spec_BlobStorage @@ -196,7 +192,9 @@ func Test_Authorization_RoleAssignment_OnStorageAccount_CRUD(t *testing.T) { }, } - tc.CreateResourceAndWait(acct) + tc.CreateResourcesAndWait(mi, acct) + tc.Expect(mi.Status.TenantId).ToNot(BeNil()) + tc.Expect(mi.Status.PrincipalId).ToNot(BeNil()) // Now assign that managed identity to a new role on the storage account roleAssignmentGUID, err := tc.Namer.GenerateUUID() diff --git a/v2/internal/controllers/containerservice_managedcluster_crud_v1api20231001_test.go b/v2/internal/controllers/containerservice_managedcluster_crud_v1api20231001_test.go index 11aca90fd7d..5a4c95815f0 100644 --- a/v2/internal/controllers/containerservice_managedcluster_crud_v1api20231001_test.go +++ b/v2/internal/controllers/containerservice_managedcluster_crud_v1api20231001_test.go @@ -195,10 +195,9 @@ func AKS_ManagedCluster_TrustedAccessRoleBinding_20231001_CRUD( ) { // Create a storage account and key vault to use for the workspace sa := newStorageAccount(tc, resourceGroup) - tc.CreateResourceAndWait(sa) - kv := newVault20210401preview("kv", tc, resourceGroup) - tc.CreateResourceAndWait(kv) + + tc.CreateResourcesAndWait(sa, kv) // Create workspace workspace := newWorkspace( diff --git a/v2/internal/controllers/crd_sql_server_test.go b/v2/internal/controllers/crd_sql_server_test.go index a619282bf7b..83ea95d507e 100644 --- a/v2/internal/controllers/crd_sql_server_test.go +++ b/v2/internal/controllers/crd_sql_server_test.go @@ -496,10 +496,6 @@ func SQL_Database_VulnerabilityAssessment_CRUD(tc *testcommon.KubePerTestContext }, } - tc.CreateResourceAndWait(securityAlertPolicy) - - tc.Expect(securityAlertPolicy.Status.Id).ToNot(BeNil()) - secret := tc.GetSecret(storageDetails.secretName) blobEndpoint := string(secret.Data[storageDetails.blobEndpointSecretKey]) @@ -519,8 +515,9 @@ func SQL_Database_VulnerabilityAssessment_CRUD(tc *testcommon.KubePerTestContext }, } - tc.CreateResourceAndWait(vulnerabilityAssessment) + tc.CreateResourcesAndWait(securityAlertPolicy, vulnerabilityAssessment) + tc.Expect(securityAlertPolicy.Status.Id).ToNot(BeNil()) tc.Expect(vulnerabilityAssessment.Status.Id).ToNot(BeNil()) tc.DeleteResourceAndWait(vulnerabilityAssessment) diff --git a/v2/internal/controllers/machinelearning_workspaces_20240401_test.go b/v2/internal/controllers/machinelearning_workspaces_20240401_test.go index 83b12e4ba75..0d82bacd14e 100644 --- a/v2/internal/controllers/machinelearning_workspaces_20240401_test.go +++ b/v2/internal/controllers/machinelearning_workspaces_20240401_test.go @@ -138,8 +138,7 @@ func WorkspaceCompute_20240401_CRUD(tc *testcommon.KubePerTestContext, owner *ge nsg := newNetworkSecurityGroup(tc, testcommon.AsOwner(rg)) rule := newNetworkSecurityGroupRule(tc, testcommon.AsOwner(nsg)) - tc.CreateResourceAndWait(nsg) - tc.CreateResourceAndWait(rule) + tc.CreateResourcesAndWait(nsg, rule) networkInterface := newVMNetworkInterfaceWithPublicIP(tc, testcommon.AsOwner(rg), subnet, publicIP, nsg) tc.CreateResourcesAndWait(subnet, publicIP, networkInterface)