Skip to content

refactor: replace current apollo sdk with the official one #663

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

Merged
merged 33 commits into from
Jun 22, 2022
Merged

refactor: replace current apollo sdk with the official one #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1e7aa37
fix: configuration API returns wrong app_id
MichaelDeSteven Jun 4, 2022
5797639
Merge branch 'main' into main
seeflood Jun 7, 2022
66a2287
Merge branch 'mosn:main' into main
MichaelDeSteven Jun 10, 2022
d6b0518
fix: configuration API returns wrong store_name
MichaelDeSteven Jun 11, 2022
d94e9ce
Merge branch 'main' into main
seeflood Jun 13, 2022
5c332da
Merge branch 'main' into main
seeflood Jun 14, 2022
0b4d4a7
Merge branch 'main' into main
seeflood Jun 14, 2022
463d37d
Update etcdv3.go
MichaelDeSteven Jun 15, 2022
2e53758
Update etcdv3_test.go
MichaelDeSteven Jun 15, 2022
533e32d
Update types.go
MichaelDeSteven Jun 15, 2022
96fa1fc
Update api_configuration.go
MichaelDeSteven Jun 15, 2022
3154441
Update types.go
MichaelDeSteven Jun 15, 2022
c46a944
Update etcdv3.go
MichaelDeSteven Jun 15, 2022
05f846c
Merge branch 'main' into main
Xunzhuo Jun 17, 2022
a35bc0b
fix: configuration API returns wrong app_id
MichaelDeSteven Jun 19, 2022
307bc23
Merge branch 'main' of https://github.com/MichaelDeSteven/layotto int…
MichaelDeSteven Jun 19, 2022
71f0837
fix: apollo configuration API returns wrong store_name
MichaelDeSteven Jun 19, 2022
23eadde
delete unused const
MichaelDeSteven Jun 19, 2022
6c6ba21
delete: redundant assign line
MichaelDeSteven Jun 20, 2022
88baba2
fix: unit test of etcdv3 subscribe
MichaelDeSteven Jun 20, 2022
df3d73f
delete: subscribereq redundant storename field
MichaelDeSteven Jun 20, 2022
00bd590
Merge branch 'main' into main
MichaelDeSteven Jun 20, 2022
1c82c02
Merge branch 'main' into main
wenxuwan Jun 21, 2022
adeac11
Merge branch 'mosn:main' into main
MichaelDeSteven Jun 21, 2022
8e1f908
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 21, 2022
f0a7b96
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 21, 2022
44b544e
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 21, 2022
a77ceda
Merge branch 'main' into main
MichaelDeSteven Jun 22, 2022
5b38153
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 22, 2022
610e407
update: go 1.17 module
MichaelDeSteven Jun 22, 2022
951ee9a
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 22, 2022
d71cc65
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 22, 2022
f738737
refactor: replace current apollo sdk with the official one
MichaelDeSteven Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/configstores/apollo/change_listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package apollo
import (
"time"

"github.com/zouyx/agollo/v4/storage"
"github.com/apolloconfig/agollo/v4/storage"
"mosn.io/pkg/log"

"mosn.io/layotto/components/configstores"
Expand Down
2 changes: 1 addition & 1 deletion components/configstores/apollo/change_listener_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"testing"
"time"

"github.com/apolloconfig/agollo/v4/storage"
"github.com/stretchr/testify/assert"
"github.com/zouyx/agollo/v4/storage"

"mosn.io/layotto/components/configstores"
)
Expand Down
6 changes: 3 additions & 3 deletions components/configstores/apollo/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package apollo
import (
"fmt"

"github.com/zouyx/agollo/v4"
agolloConfig "github.com/zouyx/agollo/v4/env/config"
"github.com/apolloconfig/agollo/v4"
agolloConfig "github.com/apolloconfig/agollo/v4/env/config"
"mosn.io/pkg/log"
)

Expand Down Expand Up @@ -54,7 +54,7 @@ func init() {

//Implement Repository interface
type AgolloRepository struct {
client *agollo.Client
client agollo.Client
cfg *repoConfig
}

Expand Down
2 changes: 1 addition & 1 deletion components/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/alicebob/miniredis/v2 v2.16.0
github.com/aliyun/aliyun-oss-go-sdk v2.1.8+incompatible
github.com/apache/dubbo-go-hessian2 v1.7.0
github.com/apolloconfig/agollo/v4 v4.2.0
github.com/aws/aws-sdk-go-v2 v1.9.1
github.com/aws/aws-sdk-go-v2/config v1.8.2
github.com/aws/aws-sdk-go-v2/credentials v1.4.2
Expand All @@ -26,7 +27,6 @@ require (
github.com/stretchr/testify v1.7.0
github.com/tencentyun/cos-go-sdk-v5 v0.7.33
github.com/valyala/fasthttp v1.26.0
github.com/zouyx/agollo/v4 v4.0.7
go.beyondstorage.io/services/hdfs v0.3.0
go.beyondstorage.io/v5 v5.0.0
go.etcd.io/etcd/api/v3 v3.5.0
Expand Down
4 changes: 2 additions & 2 deletions components/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ github.com/apache/dubbo-go-hessian2 v1.7.0 h1:u2XxIuepu/zb6JcGZc7EbvKboXdKoJbf7r
github.com/apache/dubbo-go-hessian2 v1.7.0/go.mod h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apolloconfig/agollo/v4 v4.2.0 h1:FkE8acffsUhnRnjyi37eOq6JpfUhQKuNccG2jXB3Mco=
github.com/apolloconfig/agollo/v4 v4.2.0/go.mod h1:SuvTjtg0p4UlSzSbik+ibLRr6oR1xRsfy65QzP3GEAs=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
Expand Down Expand Up @@ -830,8 +832,6 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5ukMK0AMWEhFaL/lrEOaephfuoiARg=
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
github.com/zouyx/agollo/v4 v4.0.7 h1:aUwdnCz+1jExZbZvN1nZ+kKjn62Ula5joekZHTccj2E=
github.com/zouyx/agollo/v4 v4.0.7/go.mod h1:unhojnZiGLlT4gLpWz3Oa7sGcChZWv/1DJBkV6s8uAE=
go.beyondstorage.io/endpoint v1.2.0 h1:/7mgKquTykeqJ9op82hso2+WQfECeywGd/Lda1N3tF4=
go.beyondstorage.io/endpoint v1.2.0/go.mod h1:oZ7Z7HZ7mAo337JBLjuCF/DM66HVEUu6+hw68c3UcLs=
go.beyondstorage.io/services/hdfs v0.3.0 h1:DvPxjEpUIkqyW1aMoj9C5/TDzhosxLMSqF7wUMXCE7E=
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.14.0 h1:vqZ2DP42i8th2OsgCcYZkirtbzvpZEFx53LiWDJXIAs=
github.com/apache/thrift v0.14.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apolloconfig/agollo/v4 v4.2.0 h1:FkE8acffsUhnRnjyi37eOq6JpfUhQKuNccG2jXB3Mco=
github.com/apolloconfig/agollo/v4 v4.2.0/go.mod h1:SuvTjtg0p4UlSzSbik+ibLRr6oR1xRsfy65QzP3GEAs=
github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4=
github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI=
github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
Expand Down Expand Up @@ -1422,8 +1424,6 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5u
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
github.com/zouyx/agollo/v4 v4.0.7 h1:aUwdnCz+1jExZbZvN1nZ+kKjn62Ula5joekZHTccj2E=
github.com/zouyx/agollo/v4 v4.0.7/go.mod h1:unhojnZiGLlT4gLpWz3Oa7sGcChZWv/1DJBkV6s8uAE=
go.beyondstorage.io/endpoint v1.2.0/go.mod h1:oZ7Z7HZ7mAo337JBLjuCF/DM66HVEUu6+hw68c3UcLs=
go.beyondstorage.io/services/hdfs v0.3.0/go.mod h1:yU0eL80JczPPuR5hoK21Dck0H9gXDBu3WN51Od7wtlo=
go.beyondstorage.io/v5 v5.0.0/go.mod h1:3wV9gCQnqu7tD/3LMeo2yimUKIeTSHpTc6wHSb0yY20=
Expand Down