Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support check ssh #72

Merged
merged 5 commits into from Aug 21, 2023
Merged

feat: support check ssh #72

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d53d89f
feat: support check ssh
DokiDoki1103 Aug 20, 2023
da4e9a7
feat: support check ssh
DokiDoki1103 Aug 20, 2023
b6c3cb7
feat: update ssh package
DokiDoki1103 Aug 21, 2023
fb9c37a
feat: update ssh package
DokiDoki1103 Aug 21, 2023
0b5bb70
feat: support data is not object
DokiDoki1103 Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
88 changes: 60 additions & 28 deletions api/cloud-adaptor/v1/cluster.go
View file
Open in desktop
Expand Up @@ -34,39 +34,53 @@ var rbdComponentPodPhaseScore = map[string]int{
"Failed": 4,
}

//ListKubernetesCluster list kubernetes cluster request body
// ListKubernetesCluster list kubernetes cluster request body
//
//swagger:model ListKubernetesCluster
type ListKubernetesCluster struct {
ProviderName string `form:"provider_name" binding:"required"`
}

//AddAccessKey -
// AddAccessKey -
//
//swagger:model AddAccessKey
type AddAccessKey struct {
ProviderName string `json:"provider_name,omitempty" binding:"required"`
AccessKey string `json:"access_key,omitempty" binding:"required"`
SecretKey string `json:"secret_key,omitempty" binding:"required"`
}

//GetAccessKeyReq get enterprise access key
// GetAccessKeyReq get enterprise access key
//
//swagger:model GetAccessKeyReq
type GetAccessKeyReq struct {
ProviderName string `form:"provider_name" binding:"required"`
}

//KubernetesClustersResponse list kclusters response
// KubernetesClustersResponse list kclusters response
//
//swagger:model KubernetesClustersResponse
type KubernetesClustersResponse struct {
Clusters []*v1alpha1.Cluster `json:"clusters"`
}

//AccessKeyResponse access key
// check ssh request json
//
//swagger:model CheckSSHReq
type CheckSSHReq struct {
Host string `json:"host"`
Port uint `json:"port"`
}

// AccessKeyResponse access key
//
//swagger:model AccessKeyResponse
type AccessKeyResponse struct {
model.CloudAccessKey
}

//CreateKubernetesReq create kubernetes req
// CreateKubernetesReq create kubernetes req
//
//swagger:model CreateKubernetesReq
type CreateKubernetesReq struct {
Name string `json:"name" binding:"required"`
Expand All @@ -81,7 +95,8 @@ type CreateKubernetesReq struct {
KubeConfig string `json:"kubeconfig,omitempty"`
}

//UpdateKubernetesReq update kubernetes req
// UpdateKubernetesReq update kubernetes req
//
//swagger:model UpdateKubernetesReq
type UpdateKubernetesReq struct {
Provider string `json:"provider"`
Expand All @@ -94,145 +109,162 @@ type UpdateKubernetesReq struct {
EncodedRKEConfig string `json:"encodedRKEConfig"`
}

//CreateKubernetesRes create kubernetes res
// CreateKubernetesRes create kubernetes res
//
//swagger:model CreateKubernetesRes
type CreateKubernetesRes struct {
model.CreateKubernetesTask
}

//UpdateKubernetesRes create kubernetes res
// UpdateKubernetesRes create kubernetes res
//
//swagger:model UpdateKubernetesRes
type UpdateKubernetesRes struct {
Task interface{} `json:"task"`
NodeList v1alpha1.NodeList `json:"nodeList"`
RKEConfig string `json:"rkeConfig"`
}

//GetLastCreateKubernetesClusterTaskReq get last create kubernetes task
// GetLastCreateKubernetesClusterTaskReq get last create kubernetes task
//
//swagger:model GetLastCreateKubernetesClusterTaskReq
type GetLastCreateKubernetesClusterTaskReq struct {
ProviderName string `form:"provider_name" binding:"required"`
}

//DeleteKubernetesClusterReq delete cluster
// DeleteKubernetesClusterReq delete cluster
//
//swagger:model DeleteKubernetesClusterReq
type DeleteKubernetesClusterReq struct {
ProviderName string `form:"provider_name" binding:"required"`
}

//GetCreateKubernetesClusterTaskRes create kubernetes res
// GetCreateKubernetesClusterTaskRes create kubernetes res
//
//swagger:model GetCreateKubernetesClusterTaskRes
type GetCreateKubernetesClusterTaskRes struct {
model.CreateKubernetesTask
}

//GetTaskEventListReq get event list of task
// GetTaskEventListReq get event list of task
//
//swagger:model GetTaskEventListReq
type GetTaskEventListReq struct {
TaskID string `form:"taskID" binding:"required"`
}

//TaskEventListRes get event list of task
// TaskEventListRes get event list of task
//
//swagger:model TaskEventListRes
type TaskEventListRes struct {
Events []*model.TaskEvent `json:"events"`
}

//InitRainbondRegionReq init rainbond region
// InitRainbondRegionReq init rainbond region
//
//swagger:model InitRainbondRegionReq
type InitRainbondRegionReq struct {
Provider string `json:"providerName" binding:"required"`
ClusterID string `json:"clusterID" binding:"required"`
Retry bool `json:"retry"`
}

//InitRainbondTaskRes init rainbond region response
// InitRainbondTaskRes init rainbond region response
//
//swagger:model InitRainbondTaskRes
type InitRainbondTaskRes struct {
model.InitRainbondTask
}

//GetInitRainbondTaskReq get init rainbond task
// GetInitRainbondTaskReq get init rainbond task
//
//swagger:model GetInitRainbondTaskReq
type GetInitRainbondTaskReq struct {
ProviderName string `form:"provider_name" binding:"required"`
}

// InitRainbondTaskListRes running init tasks
//
//swagger:model InitRainbondTaskListRes
type InitRainbondTaskListRes struct {
Tasks []*model.InitRainbondTask `json:"tasks"`
}

// GetRegionConfigRes region configs
//
//swagger:model GetRegionConfigRes
type GetRegionConfigRes struct {
Configs map[string]string `json:"configs"`
ConfigYaml string `json:"configs_yaml"`
}

//GetRegionConfigReq get rainbond region config
// GetRegionConfigReq get rainbond region config
//
//swagger:model GetRegionConfigReq
type GetRegionConfigReq struct {
ProviderName string `form:"provider_name" binding:"required"`
}

//UpdateInitRainbondTaskStatusReq update init task status
// UpdateInitRainbondTaskStatusReq update init task status
//
//swagger:model UpdateInitRainbondTaskStatusReq
type UpdateInitRainbondTaskStatusReq struct {
Status string `json:"status" binding:"required"`
}

//InitNodeCmdRes init node cmd
// InitNodeCmdRes init node cmd
//
//swagger:model InitNodeCmdRes
type InitNodeCmdRes struct {
Cmd string `json:"cmd"`
IsOffline bool `json:"isOffline"`
}

//GetLogContentRes create kubernetes cluster log
// GetLogContentRes create kubernetes cluster log
//
//swagger:model GetLogContentRes
type GetLogContentRes struct {
Content string `json:"content"`
}

//GetKubeConfigRes get kubernetes cluster kubeconfig file
// GetKubeConfigRes get kubernetes cluster kubeconfig file
//
//swagger:model GetKubeConfigRes
type GetKubeConfigRes struct {
Config string `json:"config"`
}

//EventMessage event nsq message
// EventMessage event nsq message
type EventMessage struct {
EnterpriseID string
TaskID string
Message *Message
}

//Body make body
// Body make body
func (e *EventMessage) Body() []byte {
b, _ := json.Marshal(e)
return b
}

//Message task exec log message
// Message task exec log message
type Message struct {
StepType string `json:"type"`
Message string `json:"message"`
Status string `json:"status"`
}

//SetRainbondClusterConfigReq -
// SetRainbondClusterConfigReq -
type SetRainbondClusterConfigReq struct {
Config string `json:"config" binding:"required"`
}

//UninstallRegionReq -
// UninstallRegionReq -
type UninstallRegionReq struct {
ProviderName string `json:"provider_name" binding:"required"`
}

//UpdateKubernetesTask -
// UpdateKubernetesTask -
type UpdateKubernetesTask struct {
TaskID string `json:"taskID"`
ClusterID string `json:"clusterID"`
Expand Down
14 changes: 7 additions & 7 deletions go.mod
View file
Open in desktop
Expand Up @@ -26,8 +26,8 @@ require (
github.com/swaggo/swag v1.6.7
github.com/tencentcloud/tencentcloud-sdk-go v3.0.233+incompatible
github.com/urfave/cli/v2 v2.3.0
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
golang.org/x/crypto v0.12.0
golang.org/x/sync v0.1.0
gopkg.in/yaml.v2 v2.4.0
gorm.io/driver/mysql v1.0.5
gorm.io/driver/sqlite v1.1.4
Expand Down Expand Up @@ -179,13 +179,13 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/tools v0.6.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220714211235-042d03aeabc9 // indirect
google.golang.org/grpc v1.48.0 // indirect
Expand Down
15 changes: 15 additions & 0 deletions go.sum
View file
Open in desktop
Expand Up @@ -1858,6 +1858,8 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrb
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down Expand Up @@ -1899,6 +1901,7 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -1981,6 +1984,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -2013,6 +2018,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -2157,11 +2164,15 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew=
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -2174,6 +2185,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
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=
Expand Down Expand Up @@ -2277,6 +2290,8 @@ golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down