golang · kennethye1 · Sep 25, 2023 · Apr 8, 2024
diff --git a/.github/workflows/ci-v2.yaml b/.github/workflows/ci-v2.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ['1.11.x', '1.13.x', '1.16.x', '1.18.x', '1.19.x', '1.20.x', '1.21.x']
+        go-version: ['1.19.x', '1.20.x', '1.21.x', '1.22.x']
     env:
       working-directory: ./v2
 
@@ -59,53 +59,4 @@ jobs:
         go test -v -cover -race google.golang.org/appengine/v2/...
         # TestAPICallAllocations doesn't run under race detector.
         go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations
-
-  test-gopath-v2:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        # GOPATH is deprecated in go 1.13.
-        go-version: [ '1.11.x', '1.12.x']
-    env:
-      working-directory: ./v2
-
-    steps:
-    - name: Update base image, intall Python2 and Python3
-      run:  |
-       sudo apt-get update
-       sudo apt-get install -y python2
-       sudo apt-get install -y python3
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Cache go modules
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.go-version }}-go-
-    - name: Set up Cloud SDK
-      uses: google-github-actions/setup-gcloud@v0
-    - name: Install
-      working-directory: ${{env.working-directory}}
-      env:
-        GO111MODULE: off
-      run: |
-        go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
-        go get -u google.golang.org/appengine/v2
-        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
-    - name: Test gopath v2
-      working-directory: ${{env.working-directory}}
-      run: |
-        export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
-        export CLOUDSDK_PYTHON="python3"
-        go test -v -cover -race google.golang.org/appengine/v2/...
-        # TestAPICallAllocations doesn't run under race detector.
-        go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x', '1.18.x', '1.19.x', '1.20.x']
+        go-version: ['1.19.x', '1.20.x', '1.21.x', '1.22.x']
 
     steps:
     - name: Update base image, intall Python2 and Python3
@@ -55,51 +55,4 @@ jobs:
         export CLOUDSDK_PYTHON="python3"
         go test -v -cover -race google.golang.org/appengine/...
         # TestAPICallAllocations doesn't run under race detector.
-        go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations
-
-  test-gopath:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        # GOPATH is deprecated in go 1.13.
-        go-version: [ '1.11.x', '1.12.x']
-
-    steps:
-    - name: Update base image, intall Python2 and Python3
-      run:  |
-       sudo apt-get update
-       sudo apt-get install -y python2
-       sudo apt-get install -y python3
-       export CLOUDSDK_PYTHON="python3"
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Cache go modules
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.go-version }}-go-
-    - name: Set up Cloud SDK
-      uses: google-github-actions/setup-gcloud@v0
-    - name: Install
-      env:
-        GO111MODULE: off
-      run: |
-        go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
-        go get -u google.golang.org/appengine
-        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
-    - name: Test gopath
-      run: |
-        export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
-        export CLOUDSDK_PYTHON="python3"
-        go test -v -cover -race google.golang.org/appengine/...
-        # TestAPICallAllocations doesn't run under race detector.
-        go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations
+        go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations
diff --git a/appengine.go b/appengine.go
@@ -12,7 +12,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 )

diff --git a/blobstore/blobstore.go b/blobstore/blobstore.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"golang.org/x/text/encoding/htmlindex"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/datastore"

diff --git a/blobstore/read.go b/blobstore/read.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/datastore/datastore.go b/datastore/datastore.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"

diff --git a/datastore/internal/cloudkey/cloudkey.go b/datastore/internal/cloudkey/cloudkey.go
@@ -12,8 +12,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
 	cloudpb "google.golang.org/appengine/datastore/internal/cloudpb"
+	"google.golang.org/protobuf/proto"
 )
 
 /////////////////////////////////////////////////////////////////////

diff --git a/datastore/internal/cloudpb/entity.pb.go b/datastore/internal/cloudpb/entity.pb.go
@@ -10,7 +10,7 @@
 import (
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // A partition ID identifies a grouping of entities. The grouping is always
@@ -44,7 +44,7 @@
 }

 func (m *PartitionId) Reset()         { *m = PartitionId{} }
 func (m *PartitionId) String() string { return proto.CompactTextString(m) }
 func (*PartitionId) ProtoMessage()    {}
 func (*PartitionId) Descriptor() ([]byte, []int) {
 	return fileDescriptor_entity_096a297364b049a5, []int{0}
@@ -65,7 +65,7 @@
 	xxx_messageInfo_PartitionId.DiscardUnknown(m)
 }

 var xxx_messageInfo_PartitionId proto.InternalMessageInfo

 func (m *PartitionId) GetProjectId() string {
 	if m != nil {
@@ -113,7 +113,7 @@
 }

 func (m *Key) Reset()         { *m = Key{} }
 func (m *Key) String() string { return proto.CompactTextString(m) }
 func (*Key) ProtoMessage()    {}
 func (*Key) Descriptor() ([]byte, []int) {
 	return fileDescriptor_entity_096a297364b049a5, []int{1}
@@ -156,7 +156,7 @@
 }

 func (m *Key_PathElement) Reset()         { *m = Key_PathElement{} }
 func (m *Key_PathElement) String() string { return proto.CompactTextString(m) }
 func (*Key_PathElement) ProtoMessage()    {}
 func (*Key_PathElement) Descriptor() ([]byte, []int) {
 	return fileDescriptor_entity_096a297364b049a5, []int{1, 0}
@@ -177,7 +177,7 @@
 	xxx_messageInfo_Key_PathElement.DiscardUnknown(m)
 }

 var xxx_messageInfo_Key_PathElement proto.InternalMessageInfo

 func (m *Key_PathElement) GetKind() string {
 	if m != nil {
@@ -224,15 +224,15 @@
 }

 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*Key_PathElement) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _Key_PathElement_OneofMarshaler, _Key_PathElement_OneofUnmarshaler, _Key_PathElement_OneofSizer, []interface{}{
 		(*Key_PathElement_Id)(nil),
 		(*Key_PathElement_Name)(nil),
 	}
 }

 func _Key_PathElement_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 	m := msg.(*Key_PathElement)
 	// id_type
 	switch x := m.IdType.(type) {
 	case *Key_PathElement_Id:
@@ -248,7 +248,7 @@
 	return nil
 }

 func _Key_PathElement_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
 	m := msg.(*Key_PathElement)
 	switch tag {
 	case 2: // id_type.id
@@ -341,4 +341,4 @@
 	0x00, 0x00, 0xff, 0xff, 0xf3, 0xdd, 0x11, 0x96, 0x45, 0x06, 0x00, 0x00,
 }

 var xxx_messageInfo_Key proto.InternalMessageInfo
diff --git a/datastore/key.go b/datastore/key.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 	pb "google.golang.org/appengine/internal/datastore"

diff --git a/datastore/load.go b/datastore/load.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/datastore"
+	"google.golang.org/protobuf/proto"
 )
 
 var (

diff --git a/datastore/load_test.go b/datastore/load_test.go
@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
-	proto "github.com/golang/protobuf/proto"
 	pb "google.golang.org/appengine/internal/datastore"
+	proto "google.golang.org/protobuf/proto"
 )
 
 type Simple struct {

diff --git a/datastore/query.go b/datastore/query.go
@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 	pb "google.golang.org/appengine/internal/datastore"

diff --git a/datastore/query_test.go b/datastore/query_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 	"google.golang.org/appengine/internal/aetesting"

diff --git a/datastore/save.go b/datastore/save.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/datastore"

diff --git a/delay/delay_test.go b/delay/delay_test.go
@@ -17,7 +17,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 	"google.golang.org/appengine/taskqueue"

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module google.golang.org/appengine
 go 1.11
 
 require (
-	github.com/golang/protobuf v1.5.2
-	golang.org/x/text v0.3.8
-	google.golang.org/protobuf v1.26.0
+	golang.org/x/text v0.13.0
+	google.golang.org/protobuf v1.31.0
 )
diff --git a/go.sum b/go.sum
@@ -1,35 +1,42 @@
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
diff --git a/internal/aetesting/fake.go b/internal/aetesting/fake.go
@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 )

diff --git a/internal/api.go b/internal/api.go
@@ -25,7 +25,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	basepb "google.golang.org/appengine/internal/base"
 	logpb "google.golang.org/appengine/internal/log"

diff --git a/internal/api_classic.go b/internal/api_classic.go
@@ -18,7 +18,7 @@ import (
 	"appengine_internal"
 	basepb "appengine_internal/base"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 var contextKey = "holds an appengine.Context"

diff --git a/internal/api_common.go b/internal/api_common.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"os"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 type ctxKey string

diff --git a/internal/api_test.go b/internal/api_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	basepb "google.golang.org/appengine/internal/base"
 	remotepb "google.golang.org/appengine/internal/remote_api"

diff --git a/internal/app_identity/app_identity_service.pb.go b/internal/app_identity/app_identity_service.pb.go
diff --git a/internal/base/api_base.pb.go b/internal/base/api_base.pb.go
diff --git a/internal/blobstore/blobstore_service.pb.go b/internal/blobstore/blobstore_service.pb.go
diff --git a/internal/capability/capability_service.pb.go b/internal/capability/capability_service.pb.go
diff --git a/internal/channel/channel_service.pb.go b/internal/channel/channel_service.pb.go