client and unit tests for cache

SAP · Sep 12, 2024 · cc67ad6 · cc67ad6
1 parent 03806e9
commit cc67ad6
Show file tree

Hide file tree

Showing 10 changed files with 713 additions and 210 deletions.
diff --git a/internal/cf/binding.go b/internal/cf/binding.go
@@ -50,10 +50,10 @@ func (bo *bindingFilterOwner) getListOptions() *cfclient.ServiceCredentialBindin
 func (c *spaceClient) GetBinding(ctx context.Context, bindingOpts map[string]string) (*facade.Binding, error) {
 	if c.resourceCache.checkResourceCacheEnabled() {
 		// Attempt to retrieve binding from cache
-		if c.resourceCache.isCacheExpired("serviceBindings") {
+		if c.resourceCache.isCacheExpired(serviceBindings) {
 			//TODO: remove after internal review
-			fmt.Println("Cache is expired")
-			populateResourceCache[*spaceClient](c, "serviceBindings")
+			fmt.Println("Cache is expired for binding")
+			populateResourceCache[*spaceClient](c, serviceBindings)
 		}
 		if len(c.resourceCache.getCachedBindings()) != 0 {
 			binding, bindingInCache := c.resourceCache.getBindingFromCache(bindingOpts["owner"])

diff --git a/internal/cf/client.go b/internal/cf/client.go
@@ -312,6 +312,8 @@ func (c *spaceClient) populateServiceInstances(ctx context.Context) error {
 		instanceOptions.ListOptions.LabelSelector.EqualTo(labelOwner)
 
 		cfInstances, err := c.client.ServiceInstances.ListAll(ctx, instanceOptions)
+		//TODO:remove later after review
+		fmt.Println("populate instance cache called")
 		if err != nil {
 			return err
 		}
@@ -345,6 +347,8 @@ func (c *spaceClient) populateServiceBindings(ctx context.Context) error {
 		bindingOptions.ListOptions.LabelSelector.EqualTo(labelOwner)
 
 		cfBindings, err := c.client.ServiceCredentialBindings.ListAll(ctx, bindingOptions)
+		//TODO:remove later after review
+		fmt.Println("populate service binding cache called")
 		if err != nil {
 			return err
 		}
@@ -376,6 +380,8 @@ func (c *organizationClient) populateSpaces(ctx context.Context) error {
 		spaceOptions := cfclient.NewSpaceListOptions()
 		spaceOptions.ListOptions.LabelSelector.EqualTo(labelOwner)
 
+		//TODO:remove later after review
+		fmt.Println("populate Space cache called")
 		cfSpaces, err := c.client.Spaces.ListAll(ctx, spaceOptions)
 		if err != nil {
 			return err