Skip to content

Commit d132d78

Browse files
trakhimenoktrakhimenok
committed
feat: removes dependency on botsfw & dalgo
1 parent 63823d0 commit d132d78

File tree

4 files changed

+52
-105
lines changed

4 files changed

+52
-105
lines changed

‎go.mod‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,10 @@ go 1.22.3
66
//
77
//replace github.com/bots-go-framework/bots-fw-store => ../../bots-go-framework/bots-fw-store
88

9-
require (
10-
github.com/bots-go-framework/bots-fw v0.55.0
11-
github.com/dal-go/dalgo v0.16.1
12-
google.golang.org/appengine/v2 v2.0.6
13-
)
9+
require google.golang.org/appengine/v2 v2.0.6
1410

1511
require (
16-
github.com/bots-go-framework/bots-fw-store v0.10.0 // indirect
17-
github.com/bots-go-framework/bots-go-core v0.0.3 // indirect
1812
github.com/golang/protobuf v1.5.4 // indirect
1913
github.com/google/go-cmp v0.6.0 // indirect
20-
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect
21-
github.com/strongo/gamp v0.0.1 // indirect
22-
github.com/strongo/i18n v0.6.1 // indirect
23-
github.com/strongo/logus v0.2.1 // indirect
24-
github.com/strongo/random v0.0.1 // indirect
25-
github.com/strongo/slice v0.3.1 // indirect
26-
github.com/strongo/validation v0.0.7 // indirect
27-
google.golang.org/protobuf v1.34.2 // indirect
14+
google.golang.org/protobuf v1.36.5 // indirect
2815
)

‎go.sum‎

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,9 @@
1-
github.com/bots-go-framework/bots-fw v0.38.2 h1:8w06QdDbQnc80dRRxipZCoAeXS92r1ife6XUXego36s=
2-
github.com/bots-go-framework/bots-fw v0.38.2/go.mod h1:rvwJ5HFLiRpaNypXPO8fEDcf5/oJOmOEs5/fH+1vVV0=
3-
github.com/bots-go-framework/bots-fw v0.40.1 h1:9WM2T498HT0rEf+6TIMexPx2y00Leycujrf6BMidXSY=
4-
github.com/bots-go-framework/bots-fw v0.40.1/go.mod h1:Qcb4XDKsVsvd3fBBkzqb269sHFqsTvixSGg9bJspC1w=
5-
github.com/bots-go-framework/bots-fw v0.40.2 h1:UZKnhnrNa1InRJVV20XSdZqZ6C1DTZNuUoKZmJkG0KE=
6-
github.com/bots-go-framework/bots-fw v0.40.2/go.mod h1:C9nvU/h8k2gBfB/bCoCax8g3iDclrdH1g+YSafPyWDk=
7-
github.com/bots-go-framework/bots-fw v0.40.4 h1:+PtLDbWUvr2J9xUnKtUTxAQl0Ka25ZjBxL2KYQ+m200=
8-
github.com/bots-go-framework/bots-fw v0.40.4/go.mod h1:KeNhMTMTiCymF8OeCADxTljQa8igCmSSqL2gqnr6W+A=
9-
github.com/bots-go-framework/bots-fw v0.40.6 h1:GpsqOuELd9VuV7qBuKTv9ospkIrwh8TF3Aj2724BiF8=
10-
github.com/bots-go-framework/bots-fw v0.40.6/go.mod h1:baBLMsoY14odhgYBCtsWr3e3scD9FgoWyK0E5FQY4i4=
11-
github.com/bots-go-framework/bots-fw v0.43.0 h1:ZbCspP6VrjvU91H/ib+nRT+tH3OJeWzXuyaoq/vEq30=
12-
github.com/bots-go-framework/bots-fw v0.43.0/go.mod h1:sx4RV2tuW3P/Qu2JM+38+aRE+NsMkwzGG4efn7eyMzs=
13-
github.com/bots-go-framework/bots-fw v0.46.1 h1:BAU3ZSix4laK+l8lawGiL+f/FWWu+EqNBwsX8VjJpUs=
14-
github.com/bots-go-framework/bots-fw v0.46.1/go.mod h1:0jnsvUxO7RiYYaHQ4MIu5xT+YMwMb8LZMcBz/odkPuE=
15-
github.com/bots-go-framework/bots-fw v0.50.1 h1:olmVFdrroEUrr/B23lTz8ppTS9gcFzMF+uH1i/gZjNA=
16-
github.com/bots-go-framework/bots-fw v0.50.1/go.mod h1:0jnsvUxO7RiYYaHQ4MIu5xT+YMwMb8LZMcBz/odkPuE=
17-
github.com/bots-go-framework/bots-fw v0.53.0 h1:dRb69FBAgOIbh6EzdpVAE+LYqlX2FUyBu8F9T7k/TEg=
18-
github.com/bots-go-framework/bots-fw v0.53.0/go.mod h1:0jnsvUxO7RiYYaHQ4MIu5xT+YMwMb8LZMcBz/odkPuE=
19-
github.com/bots-go-framework/bots-fw v0.53.3 h1:R/KfTDQhrYaj9Iwyx1ObuYACK0P6DcST1oxLdwgYdEk=
20-
github.com/bots-go-framework/bots-fw v0.53.3/go.mod h1:0jnsvUxO7RiYYaHQ4MIu5xT+YMwMb8LZMcBz/odkPuE=
21-
github.com/bots-go-framework/bots-fw v0.55.0 h1:BH62B9Rhd9l+kX2EsWqADTFhlNwCx07NwZSWrYwIvuk=
22-
github.com/bots-go-framework/bots-fw v0.55.0/go.mod h1:0jnsvUxO7RiYYaHQ4MIu5xT+YMwMb8LZMcBz/odkPuE=
23-
github.com/bots-go-framework/bots-fw-store v0.8.2 h1:Ss2ZRFoBeNgEy1TWzRIoVdERMoAv1kp9GlJvq3EbiHo=
24-
github.com/bots-go-framework/bots-fw-store v0.8.2/go.mod h1:ZxeNr86seS59kKyf9zol15vdZEcH+1CjjzHOFokGrVI=
25-
github.com/bots-go-framework/bots-fw-store v0.10.0 h1:e6bD274mjrHVp+X05/7uqqT3s5xZOqV9divKTaM2W+w=
26-
github.com/bots-go-framework/bots-fw-store v0.10.0/go.mod h1:7oU4B8j5HuJZM8AftosbyQD+AqckXsDv8eU1auGPzn8=
27-
github.com/bots-go-framework/bots-go-core v0.0.3 h1:z3A7DLUgxbHWxvTCGnkHP9WHpTT9xxROEypoqAfvYIQ=
28-
github.com/bots-go-framework/bots-go-core v0.0.3/go.mod h1:XCn9z4TI8sbgwyus+VDzw7iMY2QCPWEAvl23GMDjeEU=
29-
github.com/dal-go/dalgo v0.13.1 h1:vRV4dGpBKaRYteJRIbDTh+7lqS/7Gs8ns3ij3jEy/Ug=
30-
github.com/dal-go/dalgo v0.13.1/go.mod h1:tErF10bqQiNrwJQ5qwL3kwoaUa6dDq4z3X3pdChr3Ms=
31-
github.com/dal-go/dalgo v0.13.2 h1:q1NKsfn9vX90ugMyFp+yNVUyS4ykD/sjXpXibyx1Fb8=
32-
github.com/dal-go/dalgo v0.13.2/go.mod h1:tErF10bqQiNrwJQ5qwL3kwoaUa6dDq4z3X3pdChr3Ms=
33-
github.com/dal-go/dalgo v0.14.0 h1:XhEmNfbCtV5ISxzFBE/Bk7W8OpWePYRmlvlJ/8Jk+dQ=
34-
github.com/dal-go/dalgo v0.14.0/go.mod h1:tErF10bqQiNrwJQ5qwL3kwoaUa6dDq4z3X3pdChr3Ms=
35-
github.com/dal-go/dalgo v0.14.1 h1:AMSPsFjFH4iZ1JegHdBeouzpZ4frsLnsHxBSaV+8Wgs=
36-
github.com/dal-go/dalgo v0.14.1/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
37-
github.com/dal-go/dalgo v0.14.2 h1:e7T9D2Hiv9ryMWTdJd9OmnM2ilfsX3dxQOU6wbskDqc=
38-
github.com/dal-go/dalgo v0.14.2/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
39-
github.com/dal-go/dalgo v0.16.1 h1:cr1CefLIEH/Q1jIJuygv5sh02CDKKAqHXDNPOsUUSwE=
40-
github.com/dal-go/dalgo v0.16.1/go.mod h1:BoMNGwDE9FdjynV7xCn5f/GdVJxvfePwjsMldn+BhqA=
41-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
42-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
431
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
442
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
453
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
464
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
475
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
486
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
49-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
50-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
51-
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 h1:xoIK0ctDddBMnc74udxJYBqlo9Ylnsp1waqjLsnef20=
52-
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
53-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
54-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
55-
github.com/strongo/gamp v0.0.1 h1:b6vzHUzNvbPOhzPtIja1NqKf8GQqrJWjs2gninQPZac=
56-
github.com/strongo/gamp v0.0.1/go.mod h1:ZcVVIzSQFygVehdtGh6KYmcp1eOacuEKb9th81WcUOw=
57-
github.com/strongo/i18n v0.2.1 h1:SXvX1cseCNIzfRfkkLNdpU0a6AUX5KaB4+JbgYch13k=
58-
github.com/strongo/i18n v0.2.1/go.mod h1:4jBQ4PJ3Uiri2Y+LHJ5/o1nB1H2ToddRW/yZXSOTUjE=
59-
github.com/strongo/i18n v0.6.1 h1:hNtpU97R5xYavf6n2wfRFWGZHjRZ2lHmube0t2+FHFE=
60-
github.com/strongo/i18n v0.6.1/go.mod h1:4jBQ4PJ3Uiri2Y+LHJ5/o1nB1H2ToddRW/yZXSOTUjE=
61-
github.com/strongo/logus v0.2.0 h1:IbLupLW9WMIwjefJF+u9/Ajlaw6ysFuEeKQxOFX5tOE=
62-
github.com/strongo/logus v0.2.0/go.mod h1:sd8gjJklqGQAg+Q0mlP5MWgzguAuxR25YYFSkfVOPdc=
63-
github.com/strongo/logus v0.2.1 h1:ZzAtdSg6PPF1Y43WbNWl7MH1XYl7kvKMxyxv/lpbadI=
64-
github.com/strongo/logus v0.2.1/go.mod h1:sd8gjJklqGQAg+Q0mlP5MWgzguAuxR25YYFSkfVOPdc=
65-
github.com/strongo/random v0.0.1 h1:OZHJBb/3uEa7OX8L2Dv2pLnSeewRmXMyTACoeto6O8I=
66-
github.com/strongo/random v0.0.1/go.mod h1:/pSI+SjBNLBkjljNtVdYr6ERddA+LqSa87o0/s+9iuU=
67-
github.com/strongo/slice v0.3.1 h1:VWkyYBgcVJn6Hs7wYhL9Vxwgb7V3zQAUFTBV9wo5lc4=
68-
github.com/strongo/slice v0.3.1/go.mod h1:B5ODKCkl0rp2oiG0UBqkN1cCOrSCU2cUuhqCM1sC8r4=
69-
github.com/strongo/validation v0.0.7 h1:gs6YkwPsYtVsepQaQOB+ZF+T0Gu5+nk4ZMND8F85e+U=
70-
github.com/strongo/validation v0.0.7/go.mod h1:YUwoPEItLJd/Bc9X1OCUm03ofhvm3kwZvuihU7/jz58=
717
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
728
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
739
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -97,7 +33,5 @@ google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4Nt
9733
google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
9834
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
9935
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
100-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
101-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
102-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
103-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
36+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
37+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

‎host.go‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ package gae
22

33
import (
44
"context"
5-
"errors"
6-
"github.com/bots-go-framework/bots-fw/botsfw"
7-
"github.com/dal-go/dalgo/dal"
85
"google.golang.org/appengine/v2"
96
"net/http"
107
)
@@ -13,19 +10,26 @@ import (
1310
type botHost struct {
1411
}
1512

16-
var _ botsfw.BotHost = (*botHost)(nil)
13+
//var _ botsfw.BotHost = (*botHost)(nil)
1714

1815
// BotHost returns hosting platform settings & information
19-
func BotHost() botsfw.BotHost {
16+
func BotHost() interface {
17+
18+
// Context returns a context.Context for a request.
19+
// We need this as some platforms (as Google App Engine Standard)
20+
// require usage of a context with a specific wrapper
21+
Context(r *http.Request) context.Context
22+
23+
// GetHTTPClient returns HTTP client for current host
24+
// We need this as some platforms (as Google App Engine Standard) require setting http client in a specific way.
25+
GetHTTPClient(c context.Context) *http.Client
26+
} {
2027
return botHost{}
2128
}
2229

2330
// Context creates context for http.Request
2431
func (h botHost) Context(r *http.Request) context.Context {
25-
//var appengine
26-
//return r.Context()
27-
var ctx = appengine.NewContext(r)
28-
return ctx
32+
return appengine.NewContext(r)
2933
}
3034

3135
// GetHTTPClient creates an HTTP client using AppEngine's URL fetch
@@ -42,18 +46,18 @@ func (h botHost) GetHTTPClient(c context.Context) *http.Client {
4246
//}
4347
}
4448

45-
var DbProvider = func(c context.Context) (db dal.DB, err error) {
46-
panic("gae.DbProvider is not set")
47-
//return dalgo2datastore.NewDatabase(c, "")
48-
}
49+
//var DbProvider = func(c context.Context) (db dal.DB, err error) {
50+
// panic("gae.DbProvider is not set")
51+
// //return dalgo2datastore.NewDatabase(c, "")
52+
//}
4953

5054
// DB returns database instance
51-
func (h botHost) DB(c context.Context) (db dal.DB, err error) {
52-
if DbProvider == nil {
53-
return nil, errors.New("variable DbProvider is not set in github.com/bots-go-framework/bots-host-gae")
54-
}
55-
return DbProvider(c)
56-
}
55+
//func (h botHost) DB(c context.Context) (db dal.DB, err error) {
56+
// if DbProvider == nil {
57+
// return nil, errors.New("variable DbProvider is not set in github.com/bots-go-framework/bots-host-gae")
58+
// }
59+
// return DbProvider(c)
60+
//}
5761

5862
// GetBotCoreStores returns bot DAL
5963
//func (h botHost) GetBotCoreStores(platform string, appContext botsfw.BotAppContext, r *http.Request) (stores botsfwdal.DataAccess) {

‎host_test.go‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,40 @@ package gae
22

33
import (
44
"context"
5+
"net/http"
56
"testing"
67
)
78

8-
const noPanic = "The code did not panic"
9-
109
func TestGaeBotHost_GetHTTPClient_nilRequest(t *testing.T) {
1110
defer func() {
1211
if r := recover(); r == nil {
13-
t.Error(noPanic)
12+
t.Error("The code did not panic")
1413
}
1514
}()
1615

1716
var ctx context.Context = nil
1817
botHost{}.GetHTTPClient(ctx)
1918
}
19+
20+
func TestBotHost(t *testing.T) {
21+
v := BotHost()
22+
if v == nil {
23+
t.Fatalf("BotHost() returns nil")
24+
}
25+
}
26+
27+
func TestBotHost_Context(t *testing.T) {
28+
r := &http.Request{}
29+
ctx := botHost{}.Context(r)
30+
if ctx == nil {
31+
t.Error("Context() returns nil")
32+
}
33+
}
34+
35+
func TestBotHost_GetHTTPClient(t *testing.T) {
36+
ctx := context.Background()
37+
httpClient := botHost{}.GetHTTPClient(ctx)
38+
if httpClient == nil {
39+
t.Error("GetHTTPClient() returns nil")
40+
}
41+
}

0 commit comments

Comments
 (0)