Explorar el Código

worker to apply resources is in place

Mohammed Nafees hace 3 años
padre
commit
33ecb1ab97
Se han modificado 5 ficheros con 41 adiciones y 28 borrados
  1. 14 9
      cli/cmd/preview/v2/apply.go
  2. 22 0
      cli/cmd/preview/v2/default_driver.go
  3. 0 18
      cli/cmd/preview/v2/hooks.go
  4. 1 1
      go.mod
  5. 4 0
      go.sum

+ 14 - 9
cli/cmd/preview/v2/apply.go

@@ -13,10 +13,11 @@ import (
 	parser "github.com/porter-dev/switchboard/v2/pkg/parser"
 	types "github.com/porter-dev/switchboard/v2/pkg/types"
 	validator "github.com/porter-dev/switchboard/v2/pkg/validator"
+	"github.com/porter-dev/switchboard/v2/pkg/worker"
 )
 
 const (
-	contantsEnvGroup = "preview-env-constants"
+	constantsEnvGroup = "preview-env-constants"
 
 	defaultCharset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~`!@#$%^&*()_+-={}[]"
 )
@@ -74,13 +75,17 @@ func (a *PreviewApplier) Apply() error {
 		return err
 	}
 
-	// err = a.processEnvGroups()
+	err = a.processEnvGroups()
 
-	// if err != nil {
-	// 	return err
-	// }
+	if err != nil {
+		return err
+	}
 
-	return nil
+	w := worker.NewWorker()
+	w.RegisterDriver("default", NewDefaultDriver())
+	w.SetDefaultDriver("default")
+
+	return w.Apply(a.parsed.PorterYAML)
 }
 
 func (a *PreviewApplier) readOSEnv() error {
@@ -100,7 +105,7 @@ func (a *PreviewApplier) readOSEnv() error {
 			}
 
 			if k == "" {
-				color.New(color.FgYellow).Printf("[porter.yaml v2] ignoring invalid OS environment variable '%s'\n", kCopy) // FIXME: use a scoped logger
+				color.New(color.FgYellow).Printf("[porter.yaml v2] Ignoring invalid OS environment variable '%s'\n", kCopy) // FIXME: use a scoped logger
 			}
 
 			osEnv[k] = v
@@ -224,7 +229,7 @@ func (a *PreviewApplier) processVariables() error {
 			config.GetCLIConfig().Cluster,
 			a.namespace,
 			&apiTypes.CreateEnvGroupRequest{
-				Name:      contantsEnvGroup,
+				Name:      constantsEnvGroup,
 				Variables: constantsMap,
 			},
 		)
@@ -250,7 +255,7 @@ func (a *PreviewApplier) constantExistsInEnvGroup(name string) (*bool, error) {
 		config.GetCLIConfig().Cluster,
 		a.namespace,
 		&apiTypes.GetEnvGroupRequest{
-			Name: contantsEnvGroup,
+			Name: constantsEnvGroup,
 			// we do not care about the version because it always needs to be the latest
 		},
 	)

+ 22 - 0
cli/cmd/preview/v2/default_driver.go

@@ -1,4 +1,26 @@
 package v2
 
+import "github.com/porter-dev/switchboard/v2/pkg/types"
+
 type DefaultDriver struct {
 }
+
+func NewDefaultDriver() *DefaultDriver {
+	return &DefaultDriver{}
+}
+
+func (d *DefaultDriver) PreApply(resource *types.Resource) error {
+	return nil
+}
+
+func (d *DefaultDriver) Apply(resource *types.Resource) error {
+	return nil
+}
+
+func (d *DefaultDriver) PostApply(resource *types.Resource) error {
+	return nil
+}
+
+func (d *DefaultDriver) OnError(resource *types.Resource, err error) {
+
+}

+ 0 - 18
cli/cmd/preview/v2/hooks.go

@@ -1,18 +0,0 @@
-package v2
-
-import (
-	api "github.com/porter-dev/porter/api/client"
-	switchboardTypes "github.com/porter-dev/switchboard/pkg/types"
-)
-
-type VariablesHook struct {
-	client   *api.Client
-	resGroup *switchboardTypes.ResourceGroup
-}
-
-func NewCloneEnvGroupHook(client *api.Client, resourceGroup *switchboardTypes.ResourceGroup) *VariablesHook {
-	return &VariablesHook{
-		client:   client,
-		resGroup: resourceGroup,
-	}
-}

+ 1 - 1
go.mod

@@ -118,7 +118,7 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/open-policy-agent/opa v0.44.0 // indirect
 	github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
-	github.com/porter-dev/switchboard/v2 v2.0.0-20221027143410-a81838caabbe // indirect
+	github.com/porter-dev/switchboard/v2 v2.0.0-20221028153033-aaeedd2d3fd6 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.2 // indirect

+ 4 - 0
go.sum

@@ -1733,6 +1733,10 @@ github.com/porter-dev/switchboard v0.0.0-20221019155755-67ff2bf04935 h1:hfb3nt3A
 github.com/porter-dev/switchboard v0.0.0-20221019155755-67ff2bf04935/go.mod h1:xSPzqSFMQ6OSbp42fhCi4AbGbQbsm6nRvOkrblFeXU4=
 github.com/porter-dev/switchboard/v2 v2.0.0-20221027143410-a81838caabbe h1:VuU+EUPFi1gyKQa9nhv75GhcbWkyOxJh5JkByQ2GcyE=
 github.com/porter-dev/switchboard/v2 v2.0.0-20221027143410-a81838caabbe/go.mod h1:I/oKy2BmfIVtirJXM28W76Yqih0lR8EiaZ4lE5E5lY0=
+github.com/porter-dev/switchboard/v2 v2.0.0-20221027201656-c94bb98e5398 h1:OIi1hpVHica0VV01q9c8gpK/XLzI4EsVcTENODTBAR8=
+github.com/porter-dev/switchboard/v2 v2.0.0-20221027201656-c94bb98e5398/go.mod h1:I/oKy2BmfIVtirJXM28W76Yqih0lR8EiaZ4lE5E5lY0=
+github.com/porter-dev/switchboard/v2 v2.0.0-20221028153033-aaeedd2d3fd6 h1:lHCsfpQcrXqjHDXtQA5TXHwlarI8z1keDDrJtYef30Q=
+github.com/porter-dev/switchboard/v2 v2.0.0-20221028153033-aaeedd2d3fd6/go.mod h1:I/oKy2BmfIVtirJXM28W76Yqih0lR8EiaZ4lE5E5lY0=
 github.com/porter-dev/switchboard/v2 v2.0.0 h1:mg4c6mMHFNFBgprcac7ZcPxTPJeqZtfmH1O6pPt1h3U=
 github.com/porter-dev/switchboard/v2 v2.0.0/go.mod h1:I/oKy2BmfIVtirJXM28W76Yqih0lR8EiaZ4lE5E5lY0=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=