fix(deps): google.golang.org/appengine/v2

Author: trakhimenok

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/dal-go/dalgo v0.2.31
 	github.com/dal-go/dalgo2datastore v0.0.12
 	github.com/strongo/log v0.3.0
-	google.golang.org/appengine v1.6.7
+	google.golang.org/appengine/v2 v2.0.4
 )
 
 require (
@@ -41,6 +41,7 @@ require (
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.122.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.55.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect

go.sum

@@ -11,24 +11,8 @@ cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nw
 cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/bots-go-framework/bots-fw v0.16.0 h1:XCKwpG3JPi4bb43G+AYqyOec5b8C6QfNBhuf0C93JVE=
-github.com/bots-go-framework/bots-fw v0.16.0/go.mod h1:nVCd6tV/+9wLnmewcFeXXEx6u82ZxXN1ltVzfla5Axo=
-github.com/bots-go-framework/bots-fw v0.16.1 h1:vm//ux/EwCYXdrDXDe62qxrLgpdFL3250SIv1P3cgnU=
-github.com/bots-go-framework/bots-fw v0.16.1/go.mod h1:nVCd6tV/+9wLnmewcFeXXEx6u82ZxXN1ltVzfla5Axo=
-github.com/bots-go-framework/bots-fw v0.16.2 h1:LbkVdrmBeYCO4cbX02pElzWwqQ5/wbzQNhMGVvCyUFg=
-github.com/bots-go-framework/bots-fw v0.16.2/go.mod h1:Jl98LTR7lsCQlL1qMEg/zu/aHdmdJ05APhcLC4gWlYY=
-github.com/bots-go-framework/bots-fw v0.16.8 h1:x7/zzWI9DKPtet310DVKOQKhMTpynCCLhqlYJ9PlES8=
-github.com/bots-go-framework/bots-fw v0.16.8/go.mod h1:9q855DIMQRTdaCjQ1E/o3LWztxNMIiZlZuzx99Gmrys=
-github.com/bots-go-framework/bots-fw v0.16.9 h1:xAfo9OfXdFzk1XuiwM2/r+fZbR3O1jCb10H8XlNS/y0=
-github.com/bots-go-framework/bots-fw v0.16.9/go.mod h1:ENb9dNwg/peyr39zojQbnpCyr8p5ynKAt8jAycHK240=
-github.com/bots-go-framework/bots-fw v0.16.12 h1:0DKVIe6VQk77GhEI/NSqrXYN7ogBAt4j+itfIhXgKlk=
-github.com/bots-go-framework/bots-fw v0.16.12/go.mod h1:2oNckzJLUZ2vwllw1qh85RLvxBg/5xWUMK8EHWeLeEc=
 github.com/bots-go-framework/bots-fw v0.17.2 h1:/qSAl3+SPxnRAQbycEN5nvdAsC01tqgLRYaVjxHgdag=
 github.com/bots-go-framework/bots-fw v0.17.2/go.mod h1:UXHnomSLrzphczDC/MA/tuX6v+QReBCVCbp8bT8eA/k=
-github.com/bots-go-framework/bots-fw-store v0.0.4 h1:oLj6j2TQjG8WWQaz/OxFMAWRojRzX/q1Wv0pr+UhFhg=
-github.com/bots-go-framework/bots-fw-store v0.0.4/go.mod h1:afElYDog6nZQ6f8kJxq9rhmjBFvZQCuAIOecnQFNqaU=
-github.com/bots-go-framework/bots-fw-store v0.0.5 h1:2/qKxpMfiWxjgw1XeDhW8iCXQBXorQcEmQF1dtIdyFY=
-github.com/bots-go-framework/bots-fw-store v0.0.5/go.mod h1:XkLKnHugQ98Wr5VIlw2YuRYJNMcqqYDDw/j47plxmBY=
 github.com/bots-go-framework/bots-fw-store v0.0.7 h1:Prq99VAJWtVkgLkwXtvMQIg0dsi3XQWoFmWRqBj4j5k=
 github.com/bots-go-framework/bots-fw-store v0.0.7/go.mod h1:XkLKnHugQ98Wr5VIlw2YuRYJNMcqqYDDw/j47plxmBY=
 github.com/bots-go-framework/bots-go-core v0.0.1 h1:Br7j+Ir3R6U8x1mnFZFq1G1K0bupJhLvdF8TIqI/7i8=
@@ -42,12 +26,6 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/dal-go/dalgo v0.2.27 h1:gjrb13ONf5Nuqhr1y2G4EKMa8vIZbeCT/BHUaMpa2sg=
-github.com/dal-go/dalgo v0.2.27/go.mod h1:b0U+y2xjE5xY+HJ+vAt1DDcJe32N98tbRWDp5tPTwIc=
-github.com/dal-go/dalgo v0.2.28 h1:/FYFQgrUUvE2rIXv1N1mOvCHYqWNQfun1FrETozgYCI=
-github.com/dal-go/dalgo v0.2.28/go.mod h1:b0U+y2xjE5xY+HJ+vAt1DDcJe32N98tbRWDp5tPTwIc=
-github.com/dal-go/dalgo v0.2.30 h1:VtpW3rk1C1pDEKjgwkhXFE6vccXiCbqgScsveEa4pOo=
-github.com/dal-go/dalgo v0.2.30/go.mod h1:REh0bOj3Nf7esWrhEtXivfaZX5OhVyRofF0crxGlsdc=
 github.com/dal-go/dalgo v0.2.31 h1:i+22Fn1Y2lYSna8sPJIdaPHAvfVijthXvXIXWe7GOUU=
 github.com/dal-go/dalgo v0.2.31/go.mod h1:741DXTLpQfmvkazyEiivX8OBFylpzS1QErdh/6WquqI=
 github.com/dal-go/dalgo2datastore v0.0.12 h1:TpEHSkovimQWkZ6Ou7Gp7nP1uvmeAOTxBEdLp4qCw4I=
@@ -95,7 +73,6 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE=
 github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc=
@@ -115,27 +92,17 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/strongo/app v0.4.0 h1:I3o7zWG1TBHe6Y/4iEwxtBLQnqH0B7xhMu7TPdbqJpI=
-github.com/strongo/app v0.4.0/go.mod h1:rh+WVQYPuxwCkC/s+2OBUYZuJHIoRbJM9uhCQ5juDLw=
-github.com/strongo/app v0.4.1 h1:3Yggb9+byljzAzWspeoQNVIcsP/ufydC1BfDIMOogLg=
-github.com/strongo/app v0.4.1/go.mod h1:r1GYjymMLncZ+hcIx/Yar41KmBobnjE/YOi3ngm6l08=
-github.com/strongo/app v0.5.5 h1:0pzFwkgGHHHCYu6DRr2PMFAfgSgGLnfVbgP1JkzXlHg=
-github.com/strongo/app v0.5.5/go.mod h1:r1GYjymMLncZ+hcIx/Yar41KmBobnjE/YOi3ngm6l08=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/strongo/app v0.5.7 h1:Qm4YNBmCti0ewDeSqp/8hhXrD7UOHLsk5Lp0yjgOQGI=
 github.com/strongo/app v0.5.7/go.mod h1:3sv0TgKPA03wHoJX5d4zn7gqwxaxGAKthvyvVZd+Q0Y=
 github.com/strongo/gamp v0.0.1 h1:b6vzHUzNvbPOhzPtIja1NqKf8GQqrJWjs2gninQPZac=
 github.com/strongo/gamp v0.0.1/go.mod h1:ZcVVIzSQFygVehdtGh6KYmcp1eOacuEKb9th81WcUOw=
 github.com/strongo/i18n v0.0.4 h1:48DQrrlqTlZBi7uFbyruOVsSfr+X24RmO59FaOXLWGQ=
 github.com/strongo/i18n v0.0.4/go.mod h1:4jBQ4PJ3Uiri2Y+LHJ5/o1nB1H2ToddRW/yZXSOTUjE=
-github.com/strongo/log v0.2.3 h1:Qc3YoNUYvZjCxwHdfl0Ne/XUCQfpxAyYJDucsy5PmCI=
-github.com/strongo/log v0.2.3/go.mod h1:C0OyprbH7WjyhcZXdveDiu5n0vxB8qZ1rQXxtUqx8y4=
 github.com/strongo/log v0.3.0 h1:89rh62SdO9TNTd8/pzhMSdGCmZwFDXHWm5ZtJvp0Wcg=
 github.com/strongo/log v0.3.0/go.mod h1:C0OyprbH7WjyhcZXdveDiu5n0vxB8qZ1rQXxtUqx8y4=
 github.com/strongo/random v0.0.1 h1:OZHJBb/3uEa7OX8L2Dv2pLnSeewRmXMyTACoeto6O8I=
 github.com/strongo/random v0.0.1/go.mod h1:/pSI+SjBNLBkjljNtVdYr6ERddA+LqSa87o0/s+9iuU=
-github.com/strongo/validation v0.0.1 h1:kBMqVLa73nT6FaWrMX5aPKbM4hcNqe6A519MoRXhLUY=
-github.com/strongo/validation v0.0.1/go.mod h1:euQ9ywYwBASSnCLSYOx8JW0u4/71yfbeZhBQJv93dZg=
 github.com/strongo/validation v0.0.5 h1:O+eJM06v+rR+ZUua7kBi1JCK4a7JXMlkS7pmXkhxFJc=
 github.com/strongo/validation v0.0.5/go.mod h1:euQ9ywYwBASSnCLSYOx8JW0u4/71yfbeZhBQJv93dZg=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -218,6 +185,8 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine/v2 v2.0.4 h1:aAAPYixP9EfTJjNO6F46afaxp+jfzb0VgwVjMeLBtF4=
+google.golang.org/appengine/v2 v2.0.4/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=

host.go

@@ -6,7 +6,7 @@ import (
 	"github.com/bots-go-framework/bots-fw/botsfw"
 	"github.com/dal-go/dalgo/dal"
 	"github.com/dal-go/dalgo2datastore"
-	"google.golang.org/appengine"
+	"google.golang.org/appengine/v2"
 	"net/http"
 )
 

logger.go

@@ -3,7 +3,7 @@ package gae
 import (
 	"context"
 	"github.com/strongo/log"
-	logGae "google.golang.org/appengine/log"
+	logGae "google.golang.org/appengine/v2/log"
 )
 
 type logger struct{}

store_app_user.go

@@ -7,7 +7,7 @@ package gae
 //	"github.com/bots-go-framework/bots-fw/botsfw"
 //	"github.com/strongo/log"
 //	"github.com/strongo/nds"
-//	"google.golang.org/appengine/datastore"
+//	"google.golang.org/appengine/v2/datastore"
 //	"reflect"
 //)
 //

store_bot_chat.go

@@ -7,7 +7,7 @@ package gae
 //	"github.com/bots-go-framework/bots-fw/botsfw"
 //	"github.com/strongo/log"
 //	"github.com/strongo/nds"
-//	"google.golang.org/appengine/datastore"
+//	"google.golang.org/appengine/v2/datastore"
 //	"strconv"
 //	"time"
 //)

store_bot_user.go

@@ -7,7 +7,7 @@ package gae
 //	"github.com/bots-go-framework/bots-fw/botsfw"
 //	"github.com/strongo/log"
 //	"github.com/strongo/nds"
-//	"google.golang.org/appengine/datastore"
+//	"google.golang.org/appengine/v2/datastore"
 //	"time"
 //)
 //