Merge pull request #39 from qiniu/develop

QCOS-0 Merge develop into master for 1.2.0 release

.gitattributes

@@ -0,0 +1 @@
+CHANGELOG.md merge=union

CHANGELOG.md

@@ -1,6 +1,11 @@
 # vNext
+
+# Release 1.2.0
+- 添加禁用/启用AP端口的API，并在查看/搜索AP的API返回的端口信息中返回端口的启用状态（启用/禁用）。
+- 查看服务时，给出与该服务关联的AP端口信息。
 - 为 Service 以及 Job 增加 Confs 域
 - 增加 ConfigService 相关 V3 接口
+- 为 index 列取tag 接口增加排序，分页和时间参数
 
 # Release 1.1.0
 - AccountClient 相关 API 使用 appd V3 接口

kirksdk/account_client.go

@@ -190,7 +190,7 @@ func (p *accountClientImp) GetQcosClient(ctx context.Context, appURI string) (cl
 		keyChan <- result
 	}()
 
-	// Get qocos end point
+	// Get qcos end point
 	go func() {
 		var result endpointResult
 		appInfos, err := p.ListApps(ctx)

kirksdk/index_api.go

@@ -14,6 +14,7 @@ type IndexAuthClient interface {
 type IndexClient interface {
 	ListRepo(ctx context.Context, username string) (repos []*Repo, err error)
 	ListRepoTags(ctx context.Context, username, repo string) (tags []*Tag, err error)
+	ListRepoTagsPage(ctx context.Context, username, repo string, start, size int) (tags []*Tag, err error)
 	GetImageConfig(ctx context.Context, username, repo, reference string) (res *ImageConfig, err error)
 	DeleteRepoTag(ctx context.Context, username, repo, reference string) error
 	CreateTagFromRepo(ctx context.Context, username, repo, tag string, from *ImageSpec) (result *ImageSpec, err error)
@@ -36,7 +37,8 @@ type Repo struct {
 }
 
 type Tag struct {
-	Name string `json:"name"`
+	Name    string    `json:"name"`
+	Created time.Time `json:"created"`
 }
 
 type ImageConfig struct {

kirksdk/index_client.go

@@ -47,6 +47,12 @@ func (p *indexClientImp) ListRepoTags(ctx context.Context, username, repo string
 	return
 }
 
+func (p *indexClientImp) ListRepoTagsPage(ctx context.Context, username, repo string, start, size int) (tags []*Tag, err error) {
+	err = p.client.Call(ctx, &tags, "GET", fmt.Sprintf("%s/api/%s/%s/tags?start=%d&size=%d",
+		p.host, username, repo, start, size))
+	return
+}
+
 func (p *indexClientImp) GetImageConfig(ctx context.Context, username, repo, reference string) (res *ImageConfig, err error) {
 	err = p.client.Call(ctx, &res, "GET", fmt.Sprintf("%s/api/%s/%s/repo/%s", p.host, username, repo, reference))
 	return

kirksdk/kirksdk.go

@@ -1,3 +1,3 @@
 package kirksdk
 
-const Version = "1.1.0"
+const Version = "1.2.0"

kirksdk/qcos_api.go

@@ -228,6 +228,22 @@ type QcosClient interface {
 	DeleteApPortRange(
 		ctx context.Context, apid string, fromPort string, toPort string) (err error)
 
+	// POST /v3/aps/<apid>/<port>/enable
+	EnableApPort(
+		ctx context.Context, apid string, port string) (err error)
+
+	// POST /v3/aps/<apid>/<port>/disable
+	DisableApPort(
+		ctx context.Context, apid string, port string) (err error)
+
+	// POST /v3/aps/<apid>/portrange/<from>/<to>/enable
+	EnableApPortRange(
+		ctx context.Context, apid string, fromPort string, toPort string) (err error)
+
+	// POST /v3/aps/<apid>/portrange/<from>/<to>/disable
+	DisableApPortRange(
+		ctx context.Context, apid string, fromPort string, toPort string) (err error)
+
 	// DELETE /v3/aps/<apid>
 	DeleteAp(ctx context.Context, apid string) (err error)
 
@@ -314,6 +330,9 @@ type QcosClient interface {
 
 	// POST /v3/configservices/<namespace>
 	UpdateConfigServiceSpec(ctx context.Context, namespace string, args UpdateConfigServiceSpecArgs) (err error)
+
+	// DELETE /v3/configservices/<namespace>
+	DeleteConfigServiceSpec(ctx context.Context, namespace string) (err error)
 }
 
 const (
@@ -340,6 +359,7 @@ const (
 	ApTypePublicIPStr  = "PUBLIC_IP"
 	ApTypePrivateIPStr = "INTERNAL_IP"
 	ApTypeDomainStr    = "DOMAIN"
+	ApTypeOutwardIPStr = "OUTWARD_IP"
 )
 
 type Status string
@@ -399,6 +419,7 @@ type ServiceInfo struct {
 	UpdatingProgress  int               `json:"updatingProgress"`
 	CreatedAt         time.Time         `json:"createdAt"`
 	UpdatedAt         time.Time         `json:"updatedAt"`
+	ApPorts           []ServiceApPort   `json:"apPorts"`
 }
 
 type ServiceExportInfo struct {
@@ -543,6 +564,19 @@ type StartContainerExecArgs struct {
 	Mode string `json:"mode"`
 }
 
+// AP ports related to a service.
+type ServiceApPort struct {
+	ApID         string   `json:"apId"`
+	Type         string   `json:"type"`
+	IP           string   `json:"ip,omitempty"`
+	Domain       string   `json:"domain,omitempty"`
+	UserDomains  []string `json:"userDomains,omitempty"`
+	FrontendPort string   `json:"frontendPort"`
+	BackendPort  string   `json:"backendPort"`
+	Proto        string   `json:"proto"`
+	Enabled      bool     `json:"enabled"`
+}
+
 type CreateApArgs struct {
 	Type      string `json:"type"`
 	Provider  string `json:"provider"`
@@ -602,6 +636,7 @@ type ApPortInfo struct {
 	SessionTmoSec   int               `json:"sessionTimeoutSec"`
 	ProxyOpts       ApProxyOpts       `json:"proxyOptions"`
 	HealthCheckOpts ApHealthCheckOpts `json:"healthCheck"`
+	Enabled         bool              `json:"enabled"`
 	CreatedAt       time.Time         `json:"createdAt"`
 	UpdatedAt       time.Time         `json:"updatedAt"`
 	Backends        []struct {

kirksdk/qcos_client.go

@@ -1065,6 +1065,38 @@ func (p *qcosClientImp) DeleteApPortRange(
 	return
 }
 
+// POST /v3/aps/<apid>/<port>/enable
+func (p *qcosClientImp) EnableApPort(
+	ctx context.Context, apid string, port string) (err error) {
+	url := fmt.Sprintf("%s/v3/aps/%s/%s/enable", p.host, apid, port)
+	err = p.client.CallWithJson(ctx, nil, "POST", url, nil)
+	return
+}
+
+// POST /v3/aps/<apid>/<port>/disable
+func (p *qcosClientImp) DisableApPort(
+	ctx context.Context, apid string, port string) (err error) {
+	url := fmt.Sprintf("%s/v3/aps/%s/%s/disable", p.host, apid, port)
+	err = p.client.CallWithJson(ctx, nil, "POST", url, nil)
+	return
+}
+
+// POST /v3/aps/<apid>/portrange/<from>/<to>/enable
+func (p *qcosClientImp) EnableApPortRange(
+	ctx context.Context, apid string, fromPort string, toPort string) (err error) {
+	url := fmt.Sprintf("%s/v3/aps/%s/portrange/%s/%s/enable", p.host, apid, fromPort, toPort)
+	err = p.client.CallWithJson(ctx, nil, "POST", url, nil)
+	return
+}
+
+// POST /v3/aps/<apid>/portrange/<from>/<to>/disable
+func (p *qcosClientImp) DisableApPortRange(
+	ctx context.Context, apid string, fromPort string, toPort string) (err error) {
+	url := fmt.Sprintf("%s/v3/aps/%s/portrange/%s/%s/disable", p.host, apid, fromPort, toPort)
+	err = p.client.CallWithJson(ctx, nil, "POST", url, nil)
+	return
+}
+
 // GET  /v3/aps/<apid>/<port>/healthcheck
 func (p *qcosClientImp) GetHealthcheck(ctx context.Context, apid string, port string) (ret map[string]string, err error) {
 	url := fmt.Sprintf("%s/v3/aps/%s/%s/healthcheck", p.host, apid, port)
@@ -1280,6 +1312,13 @@ func (p *qcosClientImp) UpdateConfigServiceSpec(ctx context.Context, namespace s
 	return
 }
 
+// DELETE /v3/configservices/<namespace>
+func (p *qcosClientImp) DeleteConfigServiceSpec(ctx context.Context, namespace string) (err error) {
+	url := fmt.Sprintf("%s/v3/configservices/%s", p.host, namespace)
+	err = p.client.Call(ctx, nil, "DELETE", url)
+	return
+}
+
 func (p *qcosClientImp) wait4StackRunning(stackName string, timeout time.Duration) (err error) {
 	if stackName == "" {
 		stackName = DefaultStack

kirksdk/qcos_client_test.go

@@ -248,6 +248,18 @@ func TestServicesInspect(t *testing.T) {
 				Name:      "v2",
 			},
 		},
+		ApPorts: []ServiceApPort{
+			ServiceApPort{
+				ApID:         "1000001",
+				Type:         "DOMAIN",
+				Domain:       "abcd1234",
+				UserDomains:  []string{"www.aa.com"},
+				FrontendPort: "80",
+				BackendPort:  "8080",
+				Proto:        "HTTP",
+				Enabled:      true,
+			},
+		},
 	}
 	ret := `{
     "containerIps": [
@@ -350,7 +362,17 @@ func TestServicesInspect(t *testing.T) {
             "name": "v2",
 			"unitType": "SSD1_16G"
         }
-    ]
+    ],
+    "apPorts": [{
+    	"apId": "1000001",
+    	"type": "DOMAIN",
+    	"domain": "abcd1234",
+    	"userDomains": ["www.aa.com"],
+    	"frontendPort": "80",
+    	"backendPort": "8080",
+    	"proto": "HTTP",
+    	"enabled": true
+    	}]
 }`
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		assert.Equal(t, expectedUrl, r.URL.Path)