Feat/kong 1.2

.ci/setup_kong.sh

@@ -7,8 +7,8 @@ sudo apt-get update
 sudo apt-get install openssl libpcre3 procps perl wget
 
 /usr/bin/curl -sL \
-  "https://kong.bintray.com/kong-community-edition-deb/dists/kong-community-edition-${KONG_VERSION}.trusty.all.deb" \
-  -o kong.deb -o kong.deb
+  "https://kong.bintray.com/kong-deb/kong-${KONG_VERSION}.trusty.all.deb" \
+  -o kong.deb
 
 sudo dpkg -i kong.deb
 

.travis.yml

@@ -15,7 +15,8 @@ addons:
 env:
   matrix:
   - KONG_VERSION=1.0.3 GOPROXY=https://gocenter.io GO111MODULE=on
-  - KONG_VERSION=1.1.1 GOPROXY=https://gocenter.io GO111MODULE=on
+  - KONG_VERSION=1.1.2 GOPROXY=https://gocenter.io GO111MODULE=on
+  - KONG_VERSION=1.2.0 GOPROXY=https://gocenter.io GO111MODULE=on
 
 before_install:
   - psql -c 'create database kong;' -U postgres

kong/custom_entity_service.go

@@ -51,18 +51,28 @@ func (s *CustomEntityService) Create(ctx context.Context,
 			"' not registered")
 	}
 
+	method := "POST"
 	queryPath, err := def.PostEndpoint(entity)
 	if err != nil {
 		return nil, err
 	}
+	if entity.Object() != nil {
+		if _, ok := entity.Object()["id"]; ok {
+			queryPath, err = def.PatchEndpoint(entity)
+			if err != nil {
+				return nil, err
+			}
+			method = "PUT"
+		}
+	}
 
 	o := entity.Object()
 	// Necessary to Marshal an empty map
 	// as {} and not null
 	if o == nil || len(o) == 0 {
 		o = make(map[string]interface{})
 	}
-	req, err := s.client.newRequest("POST", queryPath, nil, o)
+	req, err := s.client.newRequest(method, queryPath, nil, o)
 
 	if err != nil {
 		return nil, err

kong/custom_entity_service_test.go

@@ -42,14 +42,19 @@ func TestCustomEntityService(T *testing.T) {
 	assert.Nil(err)
 	assert.Equal("my-secret", e1.Object()["key"])
 
-	// list endpoint
+	// PUT request
 	k2 := custom.NewEntityObject("key-auth")
-	k2.SetObject(map[string]interface{}{"key": "super-secret"})
+	id := "fc3898d9-4b4d-4491-a834-8358646e2d20"
+	k2.SetObject(map[string]interface{}{
+		"id":  id,
+		"key": "super-secret",
+	})
 	k2.AddRelation("consumer_id", *consumer.ID)
 	e2, err := client.CustomEntities.Create(defaultCtx, k2)
 	assert.NotNil(e2)
 	assert.Nil(err)
 	assert.Equal("super-secret", e2.Object()["key"])
+	assert.Equal(id, e2.Object()["id"])
 
 	se = custom.NewEntityObject("key-auth")
 	se.AddRelation("consumer_id", *consumer.ID)
@@ -58,6 +63,7 @@ func TestCustomEntityService(T *testing.T) {
 	assert.Nil(err)
 	assert.Equal(2, len(keyAuths))
 
+	// list endpoint
 	keyAuths, err = client.CustomEntities.ListAll(defaultCtx, se)
 	assert.Nil(err)
 	assert.Equal(2, len(keyAuths))

kong/route.go

@@ -52,6 +52,8 @@ type Route struct {
 	Sources       []*CIDRPort `json:"sources,omitempty" yaml:"sources,omitempty"`
 	Destinations  []*CIDRPort `json:"destinations,omitempty" yaml:"destinations,omitempty"`
 	Tags          []*string   `json:"tags,omitempty" yaml:"tags,omitempty"`
+
+	HTTPSRedirectStatusCode *int `json:"https_redirect_status_code,omitempty" yaml:"https_redirect_status_code,omitempty"`
 }
 
 // Valid checks if all the fields in Route are valid.