status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

NET 6525 (#19645) 

Removed resourcetest func
This commit is contained in:
Ashesh Vidyut 2023-11-15 12:02:15 +05:30 committed by GitHub
parent fbc2a58733
commit 443461318a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/mesh/internal/controllers/sidecarproxy/controller_test.go
View File

@ -566,8 +566,8 @@ func (suite *controllerTestSuite) TestController() {
// Run the controller manager // Run the controller manager
var ( var (
// Create proxy state template IDs to check against in this test. // Create proxy state template IDs to check against in this test.
apiProxyStateTemplateID = resourcetest.ResourceWithTenancy(pbmesh.ProxyStateTemplateType, "api-abc", tenancy).ID() apiProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").WithTenancy(tenancy).ID()
webProxyStateTemplateID = resourcetest.ResourceWithTenancy(pbmesh.ProxyStateTemplateType, "web-def", tenancy).ID() webProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-def").WithTenancy(tenancy).ID()
apiComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.apiService.Id) apiComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.apiService.Id)
dbComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.dbService.Id) dbComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.dbService.Id)

16
internal/resource/resourcetest/builder.go
View File

@ -43,22 +43,6 @@ func Resource(rtype *pbresource.Type, name string) *resourceBuilder {
} }
} }
func ResourceWithTenancy(rtype *pbresource.Type, name string, tenancy *pbresource.Tenancy) *resourceBuilder {
return &resourceBuilder{
resource: &pbresource.Resource{
Id: &pbresource.ID{
Type: &pbresource.Type{
Group: rtype.Group,
GroupVersion: rtype.GroupVersion,
Kind: rtype.Kind,
},
Name: name,
Tenancy: tenancy,
},
},
}
}
func ResourceID(id *pbresource.ID) *resourceBuilder { func ResourceID(id *pbresource.ID) *resourceBuilder {
return &resourceBuilder{ return &resourceBuilder{
resource: &pbresource.Resource{ resource: &pbresource.Resource{