pr comments

atomist-skills · Mar 8, 2024 · 2021a9d · 2021a9d
1 parent f7dc75e
commit 2021a9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/policy/data/subscription.go b/policy/data/subscription.go
@@ -22,6 +22,10 @@ func NewSubscriptionDataSource(queryIndexes map[string]int, subscriptionResults
 }
 
 func (ds SubscriptionDataSource) Query(_ context.Context, queryName string, _ string, _ map[string]interface{}, output interface{}) (*QueryResponse, error) {
+	if len(ds.subscriptionResults) == 0 {
+		return nil, nil
+	}
+
 	result, ok := ds.subscriptionResults[0][edn.Keyword(queryName)]
 	if !ok {
 		return nil, nil

diff --git a/policy/policy_handler/local.go b/policy/policy_handler/local.go
@@ -54,17 +54,17 @@ func getLocalSubscriptionData(_ context.Context, req skill.RequestContext) (*goa
 		return nil, skill.Configuration{}, nil, err
 	}
 
-	var mockCommonSubscriptionData goals.ImageSubscriptionQueryResult
+	var commonSubscriptionData goals.ImageSubscriptionQueryResult
 	if sbom != nil {
-		mockCommonSubscriptionData = goals.ImageSubscriptionQueryResult{
+		commonSubscriptionData = goals.ImageSubscriptionQueryResult{
 			ImageDigest: sbom.Source.Image.Digest,
 			ImagePlatforms: []goals.ImagePlatform{{
 				Architecture: sbom.Source.Image.Platform.Architecture,
 				Os:           sbom.Source.Image.Platform.Os,
 			}},
 		}
 	} else {
-		mockCommonSubscriptionData = goals.ImageSubscriptionQueryResult{
+		commonSubscriptionData = goals.ImageSubscriptionQueryResult{
 			ImageDigest: "localDigest",
 		}
 
@@ -95,7 +95,7 @@ func getLocalSubscriptionData(_ context.Context, req skill.RequestContext) (*goa
 		}
 	}
 
-	subscriptionData, err := edn.Marshal(mockCommonSubscriptionData)
+	subscriptionData, err := edn.Marshal(commonSubscriptionData)
 	if err != nil {
 		return nil, skill.Configuration{}, nil, err
 	}