From 7f2be1b61ecf56b0bb85150784ac80fd4dbc8354 Mon Sep 17 00:00:00 2001 From: runzexia Date: Thu, 27 Jun 2019 19:36:33 +0800 Subject: [PATCH 1/2] update api docs Signed-off-by: runzexia --- pkg/apis/devops/v1alpha2/register.go | 2 +- pkg/apis/resources/v1alpha2/register.go | 12 +----------- pkg/models/devops/common.go | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkg/apis/devops/v1alpha2/register.go b/pkg/apis/devops/v1alpha2/register.go index ce33e581c..e3047d519 100644 --- a/pkg/apis/devops/v1alpha2/register.go +++ b/pkg/apis/devops/v1alpha2/register.go @@ -111,6 +111,7 @@ func addWebService(c *restful.Container) error { Metadata(restfulspec.KeyOpenAPITags, tags). Param(webservice.PathParameter("devops", "DevOps Project's Id, e.g. project-RRRRAzLBlLEm")). Param(webservice.PathParameter("member", "Member's username, e.g. admin")). + Returns(http.StatusOK, RespOK, devops.DevOpsProjectMembership{}). Reads(devops.DevOpsProjectMembership{}). Writes(devops.DevOpsProjectMembership{})) @@ -137,7 +138,6 @@ func addWebService(c *restful.Container) error { Param(webservice.PathParameter("devops", "DevOps Project's Id, e.g. project-RRRRAzLBlLEm")). Param(webservice.PathParameter("pipeline", "The name of pipeline, e.g. sample-pipeline")). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(http.StatusOK, RespOK, devops.ProjectPipeline{}). Writes(devops.ProjectPipeline{}). Reads(devops.ProjectPipeline{})) diff --git a/pkg/apis/resources/v1alpha2/register.go b/pkg/apis/resources/v1alpha2/register.go index c78ca754c..99973ef89 100644 --- a/pkg/apis/resources/v1alpha2/register.go +++ b/pkg/apis/resources/v1alpha2/register.go @@ -24,7 +24,6 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" "kubesphere.io/kubesphere/pkg/apiserver/components" - "kubesphere.io/kubesphere/pkg/apiserver/git" "kubesphere.io/kubesphere/pkg/apiserver/operations" "kubesphere.io/kubesphere/pkg/apiserver/quotas" "kubesphere.io/kubesphere/pkg/apiserver/registries" @@ -36,7 +35,6 @@ import ( "kubesphere.io/kubesphere/pkg/errors" "kubesphere.io/kubesphere/pkg/models" "kubesphere.io/kubesphere/pkg/models/applications" - gitmodel "kubesphere.io/kubesphere/pkg/models/git" registriesmodel "kubesphere.io/kubesphere/pkg/models/registries" "kubesphere.io/kubesphere/pkg/models/status" "kubesphere.io/kubesphere/pkg/params" @@ -226,15 +224,7 @@ func addWebService(c *restful.Container) error { Reads(registriesmodel.AuthInfo{}). Returns(http.StatusOK, ok, errors.Error{})) - tags = []string{"Git"} - webservice.Route(webservice.POST("/git/readverify"). - To( - git.GitReadVerify). - Metadata(restfulspec.KeyOpenAPITags, tags). - Doc("secret git read verify"). - Reads(gitmodel.AuthInfo{}). - Returns(http.StatusOK, ok, errors.Error{}), - ) + tags = []string{"Revision"} webservice.Route(webservice.GET("/namespaces/{namespace}/daemonsets/{daemonset}/revisions/{revision}"). diff --git a/pkg/models/devops/common.go b/pkg/models/devops/common.go index f2c51ed07..f515c775c 100644 --- a/pkg/models/devops/common.go +++ b/pkg/models/devops/common.go @@ -79,7 +79,7 @@ const ( ) type Role struct { - Name string `json:"name" description:"role's name'"` + Name string `json:"name" description:"role's name e.g. owner'"` Description string `json:"description" description:"role 's description'"` } From eded35c46dea6dfc1a8d642f776923ea78b27d77 Mon Sep 17 00:00:00 2001 From: runzexia Date: Thu, 27 Jun 2019 20:00:38 +0800 Subject: [PATCH 2/2] no message Signed-off-by: runzexia --- pkg/apis/resources/v1alpha2/register.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/apis/resources/v1alpha2/register.go b/pkg/apis/resources/v1alpha2/register.go index 99973ef89..76f308ddf 100644 --- a/pkg/apis/resources/v1alpha2/register.go +++ b/pkg/apis/resources/v1alpha2/register.go @@ -24,6 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" "kubesphere.io/kubesphere/pkg/apiserver/components" + "kubesphere.io/kubesphere/pkg/apiserver/git" "kubesphere.io/kubesphere/pkg/apiserver/operations" "kubesphere.io/kubesphere/pkg/apiserver/quotas" "kubesphere.io/kubesphere/pkg/apiserver/registries" @@ -35,6 +36,7 @@ import ( "kubesphere.io/kubesphere/pkg/errors" "kubesphere.io/kubesphere/pkg/models" "kubesphere.io/kubesphere/pkg/models/applications" + gitmodel "kubesphere.io/kubesphere/pkg/models/git" registriesmodel "kubesphere.io/kubesphere/pkg/models/registries" "kubesphere.io/kubesphere/pkg/models/status" "kubesphere.io/kubesphere/pkg/params" @@ -224,7 +226,15 @@ func addWebService(c *restful.Container) error { Reads(registriesmodel.AuthInfo{}). Returns(http.StatusOK, ok, errors.Error{})) - + tags = []string{"Git"} + webservice.Route(webservice.POST("git/verify"). + To( + git.GitReadVerify). + Metadata(restfulspec.KeyOpenAPITags, tags). + Doc("Verify that the kubernetes secret has read access to the git repository"). + Reads(gitmodel.AuthInfo{}). + Returns(http.StatusOK, ok, errors.Error{}), + ) tags = []string{"Revision"} webservice.Route(webservice.GET("/namespaces/{namespace}/daemonsets/{daemonset}/revisions/{revision}").