Skip to content
This repository has been archived by the owner on Jan 10, 2020. It is now read-only.

Fixes for Issue 37 40 41 42. Port changes from Delhi to master. #46

Merged
merged 17 commits into from
Jan 3, 2019

Conversation

tingyuz
Copy link
Contributor

@tingyuz tingyuz commented Dec 12, 2018

No description provided.

anonymouse64 and others added 15 commits October 31, 2018 17:13
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
Signed-off-by: Tingyu Zeng <tingyu.zeng@rsa.com>
* Use Form for uploading certificates due to bug with kong 0.13.x where the snis parameter is ignored when using JSON
* Load certificates into kong first, before adding any services or routes
* Use single loop to create service and associated routes so that we can use the service ID returned from kong when creating the service when creating the route
* Add Service parameter to KongRoute struct
* Use JSON for creating a kong route
* initKongService returns a KongServiceResponse object now for extracting the ID from the created service

Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
…o-kong-token

Use certificates from vault for kong routes
Signed-off-by: Tingyu Zeng <tingyu.zeng@rsa.com>
…already-initialized

Skip the steps if the services and routes are initialized already.
Signed-off-by: Tingyu Zeng <tingyu.zeng@rsa.com>
…ersion-delhi

Update the version to delhi.
0.2.0 is tagged and released.
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
@tingyuz
Copy link
Contributor Author

tingyuz commented Dec 12, 2018

recheck.

Copy link
Member

@jpwhitemn jpwhitemn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Will approve and merge if David and/or Alain is ok with.

glide.yaml Outdated
@@ -7,5 +7,6 @@ import:
- package: github.com/dgrijalva/jwt-go
version: v3.2.0
- package: github.com/edgexfoundry/edgex-go
version: delhi
Copy link
Contributor

@anonymouse64 anonymouse64 Dec 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line still needs be changed to master as this PR is targeting master...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in this PR with another push.

Signed-off-by: Tingyu Zeng <tingyu.zeng@rsa.com>
Signed-off-by: Tingyu Zeng <tingyu.zeng@rsa.com>
@anonymouse64
Copy link
Contributor

LGTM, thanks for changing the glide version

@jpwhitemn jpwhitemn self-requested a review January 3, 2019 17:25
@jpwhitemn jpwhitemn merged commit a5840be into edgexfoundry:master Jan 3, 2019
@anonymouse64 anonymouse64 mentioned this pull request Jan 25, 2019
@tingyuz tingyuz deleted the issue-37-40-41-42 branch February 26, 2019 19:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants