validation config?

lyft · Apr 12, 2024 · c514142 · c514142
1 parent 723f4d6
commit c514142
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/cmd/adhoc.go b/cmd/adhoc.go
@@ -75,6 +75,10 @@ func (a *Adhoc) NewServer(userConfig legacy.UserConfig, config legacy.Config) (S
 		GithubAppKeyFile: userConfig.GithubAppKeyFile,
 		GithubAppSlug:    userConfig.GithubAppSlug,
 		GlobalCfg:        globalCfg,
+		ValidationConfig: neptune.ValidationConfig{
+			DefaultVersion: globalCfg.PolicySets.Version,
+			Policies:       globalCfg.PolicySets,
+		},
 	}
 	return adhoc.NewServer(cfg)
 }
diff --git a/server/neptune/adhoc/config/config.go b/server/neptune/adhoc/config/config.go
@@ -31,4 +31,6 @@ type Config struct {
 	GithubHostname   string
 
 	GlobalCfg valid.GlobalCfg
+
+	ValidationConfig neptune.ValidationConfig
 }
diff --git a/server/neptune/adhoc/server.go b/server/neptune/adhoc/server.go
@@ -34,7 +34,6 @@ import (
 	neptune_http "github.com/runatlantis/atlantis/server/neptune/http"
 	internalSync "github.com/runatlantis/atlantis/server/neptune/sync"
 	"github.com/runatlantis/atlantis/server/neptune/temporal"
-	neptune "github.com/runatlantis/atlantis/server/neptune/temporalworker/config"
 	"github.com/runatlantis/atlantis/server/neptune/workflows"
 	"github.com/runatlantis/atlantis/server/neptune/workflows/activities"
 	"github.com/runatlantis/atlantis/server/static"
@@ -104,9 +103,20 @@ func NewServer(config *adhocconfig.Config) (*Server, error) {
 		Logger:      config.CtxLogger,
 	}
 
+	/*
+		config.TerraformCfg,
+		config.ValidationConfig,
+		config.App,
+		config.DataDir,
+		config.ServerCfg.URL,
+		config.TemporalCfg.TerraformTaskQueue,
+		config.GithubCfg.TemporalAppInstallationID,
+		jobStreamHandler,
+	*/
+
 	terraformActivities, err := activities.NewTerraform(
 		config.TerraformCfg,
-		neptune.ValidationConfig{},
+		config.ValidationConfig,
 		config.App,
 		config.DataDir,
 		config.ServerCfg.URL,