adding nil check before checking conftest version so it doesnt panic (#…

…747)
lyft · Apr 15, 2024 · 8dc95e2 · 8dc95e2
1 parent 723f4d6
commit 8dc95e2
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/server/neptune/workflows/activities/main.go b/server/neptune/workflows/activities/main.go
@@ -150,7 +150,6 @@ func NewTerraform(tfConfig config.TerraformConfig, validationConfig config.Valid
 	if err != nil {
 		return nil, errors.Wrapf(err, "parsing version %s", tfConfig.DefaultVersion)
 	}
-	defaultConftestVersion := validationConfig.DefaultVersion
 
 	tfClient, err := command.NewAsyncClient(
 		defaultTfVersion,
@@ -160,12 +159,16 @@ func NewTerraform(tfConfig config.TerraformConfig, validationConfig config.Valid
 		return nil, err
 	}
 
-	conftestClient, err := command.NewAsyncClient(
-		defaultConftestVersion,
-		conftestVersionCache,
-	)
-	if err != nil {
-		return nil, err
+	defaultConftestVersion := validationConfig.DefaultVersion
+	var conftestClient *command.AsyncClient
+	if defaultConftestVersion != nil {
+		conftestClient, err = command.NewAsyncClient(
+			defaultConftestVersion,
+			conftestVersionCache,
+		)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	policies := convertPolicies(validationConfig.Policies.PolicySets)