Mohammed Nafees 4 лет назад
Родитель
Сommit
e74d7f977a
3 измененных файлов с 367 добавлено и 162 удалено
  1. 57 0
      cli/cmd/apply.go
  2. 12 16
      go.mod
  3. 298 146
      go.sum

+ 57 - 0
cli/cmd/apply.go

@@ -0,0 +1,57 @@
+package cmd
+
+import (
+	"io/ioutil"
+	"os"
+
+	api "github.com/porter-dev/porter/api/client"
+	"github.com/porter-dev/porter/api/types"
+	"github.com/porter-dev/switchboard/pkg/parser"
+	"github.com/porter-dev/switchboard/pkg/worker"
+	"github.com/spf13/cobra"
+)
+
+// applyCmd represents the "porter apply" base command when called
+// with a porter.yaml file as an argument
+var applyCmd = &cobra.Command{
+	Use:   "apply",
+	Short: "Applies the provided porter.yaml to a project",
+	Run: func(cmd *cobra.Command, args []string) {
+		err := checkLoginAndRun(args, apply)
+
+		if err != nil {
+			os.Exit(1)
+		}
+	},
+}
+
+var porterYAML string
+
+func init() {
+	rootCmd.AddCommand(applyCmd)
+
+	applyCmd.Flags().StringVarP(&porterYAML, "file", "f", "", "path to porter.yaml")
+	applyCmd.MarkFlagRequired("file")
+}
+
+func apply(user *types.GetAuthenticatedUserResponse, client *api.Client, args []string) error {
+	fileBytes, err := ioutil.ReadFile(porterYAML)
+	if err != nil {
+		return err
+	}
+
+	resGroup, err := parser.ParseRawBytes(fileBytes)
+	if err != nil {
+		return err
+	}
+
+	basePath, err := os.Getwd()
+
+	if err != nil {
+		return err
+	}
+
+	return worker.Apply(resGroup, &worker.ApplyOpts{
+		BasePath: basePath,
+	})
+}

+ 12 - 16
go.mod

@@ -28,25 +28,23 @@ require (
 	github.com/google/go-github/v29 v29.0.3 // indirect
 	github.com/google/go-github/v33 v33.0.0
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/schema v1.2.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.2.1
 	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/itchyny/gojq v0.12.1
 	github.com/joeshaw/envdecode v0.0.0-20200121155833-099f1fc765bd
 	github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06
 	github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b // indirect
 	github.com/mattn/go-runewidth v0.0.12 // indirect
 	github.com/moby/moby v20.10.6+incompatible
-	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635
+	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297
 	github.com/onsi/gomega v1.16.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1
-	github.com/pelletier/go-toml v1.9.4
+	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/rogpeppe/go-internal v1.5.2 // indirect
-	github.com/rs/zerolog v1.20.0
+	github.com/porter-dev/switchboard v0.0.0-20211118162911-f56a84aeb5ca
+	github.com/rs/zerolog v1.26.0
 	github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
 	github.com/sendgrid/rest v2.6.3+incompatible // indirect
 	github.com/sendgrid/sendgrid-go v3.8.0+incompatible
@@ -55,9 +53,8 @@ require (
 	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
 	golang.org/x/mod v0.5.0 // indirect
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 	golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c // indirect
 	google.golang.org/api v0.44.0
@@ -67,14 +64,13 @@ require (
 	gorm.io/driver/postgres v1.0.2
 	gorm.io/driver/sqlite v1.1.3
 	gorm.io/gorm v1.20.2
-	helm.sh/helm/v3 v3.6.0
-	k8s.io/api v0.21.0
-	k8s.io/apimachinery v0.21.0
-	k8s.io/cli-runtime v0.21.0
-	k8s.io/client-go v0.21.0
-	k8s.io/helm v2.16.12+incompatible
-	k8s.io/kubectl v0.21.0
-	rsc.io/letsencrypt v0.0.3 // indirect
+	helm.sh/helm/v3 v3.7.1
+	k8s.io/api v0.22.3
+	k8s.io/apimachinery v0.22.3
+	k8s.io/cli-runtime v0.22.3
+	k8s.io/client-go v0.22.3
+	k8s.io/helm v2.17.0+incompatible
+	k8s.io/kubectl v0.22.1
 	sigs.k8s.io/aws-iam-authenticator v0.5.2
 	sigs.k8s.io/yaml v1.2.0
 )

Разница между файлами не показана из-за своего большого размера
+ 298 - 146
go.sum


Некоторые файлы не были показаны из-за большого количества измененных файлов