From 0cbe2b10a56d9bd099ad1c8255ddf154793afe16 Mon Sep 17 00:00:00 2001 From: Andrei Rybnov Date: Wed, 17 Jan 2024 23:53:12 +0400 Subject: [PATCH 1/2] Update descriptions --- cmd/deploy_script/cpu.go | 2 +- cmd/deploy_script/gpu.go | 2 +- cmd/deploy_script/main.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/deploy_script/cpu.go b/cmd/deploy_script/cpu.go index 3f4fe83..d2fbfeb 100644 --- a/cmd/deploy_script/cpu.go +++ b/cmd/deploy_script/cpu.go @@ -44,7 +44,7 @@ var ( Use: "create", Short: "create cpu instance", RunE: func(cmd *cobra.Command, args []string) error { - log.Debugf("create cpu instance with config %v", cpuCreateCfg) + log.Debugf("create cpu instance with config %#+v", cpuCreateCfg) cli := tcli.NewClient(cmd.Context(), clientCfg, tcli.ClientOptWithURL(APIURL)) resp, err := cli.CreateDeployment(cmd.Context(), &cpuCreateCfg) if err != nil { diff --git a/cmd/deploy_script/gpu.go b/cmd/deploy_script/gpu.go index d9ed19d..d4ad65d 100644 --- a/cmd/deploy_script/gpu.go +++ b/cmd/deploy_script/gpu.go @@ -46,7 +46,7 @@ var ( Use: "create", Short: "create gpu instance", RunE: func(cmd *cobra.Command, args []string) error { - log.Debugf("create gpu instance with config %v", gpuCreateCfg) + log.Debugf("create gpu instance with config %#+v", gpuCreateCfg) cli := tcli.NewClient(cmd.Context(), clientCfg, tcli.ClientOptWithURL(APIURL)) respCreate, err := cli.CreateGPU(cmd.Context(), &gpuCreateCfg) if err != nil { diff --git a/cmd/deploy_script/main.go b/cmd/deploy_script/main.go index b5d1b30..b7ffc7a 100644 --- a/cmd/deploy_script/main.go +++ b/cmd/deploy_script/main.go @@ -57,7 +57,7 @@ func init() { cpuCreateCmd.Flags().IntVar(&cpuCreateCfg.Hdd, "disk_size", 10, "Disk size for your Deployment in GB") cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.HddType, "disk_type", "hdd", "Disk type for your Deployment. Available options: hdd, ssd") cpuCreateCmd.Flags().BoolVar(&cpuCreateCfg.Ipv4, "assign_public_ipv4", false, "If true assigns a public ipv4 address for your Deployment") - cpuCreateCmd.Flags().BoolVar(&cpuCreateCfg.Ipv4, "assign_public_ipv6", false, "If true assigns a public ipv6 address for your Deployment") + cpuCreateCmd.Flags().BoolVar(&cpuCreateCfg.Ipv6, "assign_public_ipv6", false, "If true assigns a public ipv6 address for your Deployment") cpuCreateCmd.Flags().BoolVar(&cpuCreateCfg.Ygg, "assign_ygg_ip", false, "If true assigns a yggdrasil address for your Deployment") cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.NetworkUUID, "vpc_id", "", "ID of the vpc to deploy your VM into") cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.SSHKey, "ssh_key", "", "SSH key to add to the target VM to make it possible to connect to your VM") From e022cdf50f867675d2b35cf0c3adc9b682c3d3af Mon Sep 17 00:00:00 2001 From: Andrei Rybnov Date: Thu, 1 Feb 2024 17:22:45 +0400 Subject: [PATCH 2/2] Update deps --- cmd/deploy_script/main.go | 2 ++ go.mod | 6 +++--- go.sum | 16 ++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cmd/deploy_script/main.go b/cmd/deploy_script/main.go index b7ffc7a..67e829b 100644 --- a/cmd/deploy_script/main.go +++ b/cmd/deploy_script/main.go @@ -61,6 +61,7 @@ func init() { cpuCreateCmd.Flags().BoolVar(&cpuCreateCfg.Ygg, "assign_ygg_ip", false, "If true assigns a yggdrasil address for your Deployment") cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.NetworkUUID, "vpc_id", "", "ID of the vpc to deploy your VM into") cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.SSHKey, "ssh_key", "", "SSH key to add to the target VM to make it possible to connect to your VM") + cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.SSHKeyName, "ssh_key_name", "", "SSH key name") cpuCreateCmd.Flags().StringVar(&cpuCreateCfg.HostName, "host_name", "", "Host name for your Deployment") _ = viper.BindPFlag("region", rootCmd.Flags().Lookup("region")) _ = viper.BindPFlag("image", rootCmd.Flags().Lookup("image")) @@ -73,6 +74,7 @@ func init() { _ = viper.BindPFlag("assign_ygg_ip", rootCmd.Flags().Lookup("assign_ygg_ip")) _ = viper.BindPFlag("vpc_id", rootCmd.Flags().Lookup("vpc_id")) _ = viper.BindPFlag("ssh_key", rootCmd.Flags().Lookup("ssh_key")) + _ = viper.BindPFlag("ssh_key_name", rootCmd.Flags().Lookup("ssh_key_name")) _ = viper.BindPFlag("host_name", rootCmd.Flags().Lookup("host_name")) cpuCmd.AddCommand(cpuCreateCmd) diff --git a/go.mod b/go.mod index d756f44..00ca186 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/deweb-services/deployment-script go 1.21.3 require ( - github.com/deweb-services/terraform-provider-dws v0.0.8 + github.com/deweb-services/terraform-provider-dws v0.0.9 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.17.0 go.uber.org/zap v1.26.0 @@ -50,8 +50,8 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.10.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 1f9622e..76531bc 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deweb-services/terraform-provider-dws v0.0.8 h1:Zr0ctetOilGyuA6rgctBY+hAtJ8TYHFQwpxZXpSrKc0= -github.com/deweb-services/terraform-provider-dws v0.0.8/go.mod h1:tKl+ROgvWEAWnMME/qLWhPW3zO2BniDTLFHXfyl8MvI= +github.com/deweb-services/terraform-provider-dws v0.0.9 h1:D4CN4IyQbpTlioC7Ld8gVAIhiHEBlHDshGiOR+pq3/k= +github.com/deweb-services/terraform-provider-dws v0.0.9/go.mod h1:Jy+kXHSGr5TpXSVFIVRNfezn8dKeHc2Y4SFicV/G8GU= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -161,8 +161,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -408,8 +408,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -422,8 +422,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=