feat: use flag instead of nil to disable tuf

docker · Aug 28, 2024 · ccf3aa7 · ccf3aa7
1 parent 0fdb133
commit ccf3aa7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/policy/policy.go b/pkg/policy/policy.go
@@ -167,7 +167,7 @@ func resolvePolicyByID(opts *Options, tufClient tuf.Downloader) (*Policy, error)
 				return resolveLocalPolicy(opts, policy, "", "")
 			}
 		}
-		if tufClient != nil {
+		if !opts.DisableTUF {
 			// must check tuf
 			tufMappings, err := config.LoadTUFMappings(tufClient, opts.LocalTargetsDir)
 			if err != nil {

diff --git a/pkg/policy/policy_test.go b/pkg/policy/policy_test.go
@@ -76,6 +76,7 @@ func TestRegoEvaluator_Evaluate(t *testing.T) {
 					LocalTargetsDir: test.CreateTempDir(t, "", "tuf-targets"),
 					PolicyID:        tc.policyID,
 					LocalPolicyDir:  tc.repo,
+					DisableTUF:      true,
 				}
 			}
 			imageName, err := tc.resolver.ImageName(ctx)
@@ -86,7 +87,6 @@ func TestRegoEvaluator_Evaluate(t *testing.T) {
 			require.NoError(t, err)
 			resolver, err := policy.CreateImageDetailsResolver(src)
 			require.NoError(t, err)
-			//nil below indicates TUF is disabled
 			policy, err := policy.ResolvePolicy(ctx, nil, resolver, tc.policy)
 			if tc.resolveErrorStr != "" {
 				require.Error(t, err)