Skip to content

Modify controller tests to create resources in parallel #5001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Modify controller tests to create resources in parallel #5001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
354ebe0
Initial plan
Copilot Oct 27, 2025
1f6bce7
Modify APIM tests to create resources in parallel
Copilot Oct 27, 2025
79381f5
Modify authorization and SQL tests to create resources in parallel
Copilot Oct 27, 2025
164a91e
Modify machine learning and container service tests to create resourc…
Copilot Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 22 additions & 52 deletions v2/internal/controllers/apimanagement_20220801_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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())

Expand All @@ -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{
Expand All @@ -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{
Expand All @@ -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),
Expand All @@ -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")),
Expand All @@ -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)
Expand All @@ -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{
Expand All @@ -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),
Expand All @@ -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())
Expand Down Expand Up @@ -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{
Expand All @@ -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())
Expand All @@ -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{
Expand All @@ -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"
Expand All @@ -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{
Expand All @@ -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())
Expand Down
74 changes: 22 additions & 52 deletions v2/internal/controllers/apimanagement_20230501preview_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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())

Expand All @@ -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{
Expand All @@ -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{
Expand All @@ -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),
Expand All @@ -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")),
Expand All @@ -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)
Expand All @@ -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{
Expand All @@ -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),
Expand All @@ -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())
Expand Down Expand Up @@ -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{
Expand All @@ -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())
Expand All @@ -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{
Expand All @@ -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"
Expand All @@ -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{
Expand All @@ -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())
Expand Down
Loading
Loading