Skip to content

Commit d705f70

Browse files
authored
refactor: pin setup-gcloud gh action to v0 (#271)
1 parent 154bfe5 commit d705f70

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/ci-v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x']
14+
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x']
1515
env:
1616
working-directory: ./v2
1717

@@ -76,7 +76,7 @@ jobs:
7676
restore-keys: |
7777
${{ runner.os }}-${{ matrix.go-version }}-go-
7878
- name: Set up Cloud SDK
79-
uses: google-github-actions/setup-gcloud@master
79+
uses: google-github-actions/setup-gcloud@v0
8080
- name: Install
8181
working-directory: ${{env.working-directory}}
8282
env:

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x']
14+
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x']
1515

1616
steps:
1717
- name: Set up Go
@@ -70,7 +70,7 @@ jobs:
7070
restore-keys: |
7171
${{ runner.os }}-${{ matrix.go-version }}-go-
7272
- name: Set up Cloud SDK
73-
uses: google-github-actions/setup-gcloud@master
73+
uses: google-github-actions/setup-gcloud@v0
7474
- name: Install
7575
env:
7676
GO111MODULE: off

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ A few APIs were cleaned up, and there are some differences:
7272
* `appengine/socket` is not required on App Engine flexible environment / Managed VMs.
7373
Use the standard `net` package instead.
7474

75-
## Key Encode/Decode compatibiltiy to help with datastore library migrations
75+
## Key Encode/Decode compatibility to help with datastore library migrations
7676

7777
Key compatibility updates have been added to help customers transition from google.golang.org/appengine/datastore to cloud.google.com/go/datastore.
7878
The `EnableKeyConversion` enables automatic conversion from a key encoded with cloud.google.com/go/datastore to google.golang.org/appengine/datastore key type.

v2/internal/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var (
6767
backgroundContextOnce sync.Once
6868
backgroundContext netcontext.Context
6969

70-
logStream io.Writer = os.Stdout // For test hooks.
70+
logStream io.Writer = os.Stderr // For test hooks.
7171
timeNow func() time.Time = time.Now // For test hooks.
7272
)
7373

v2/internal/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func chunkLog(msg string) []string {
108108
}
109109

110110
func traceAndSpan(c *context) (string, string) {
111-
headers := c.req.Header["Cloud-Trace-Context"]
111+
headers := c.req.Header["X-Cloud-Trace-Context"]
112112
if len(headers) < 1 {
113113
return "", ""
114114
}

v2/internal/log_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ func buildContextWithTraceHeaders(t *testing.T, headers []string) *context {
437437
t.Fatal(err)
438438
}
439439
for _, h := range headers {
440-
req.Header.Add("Cloud-Trace-Context", h)
440+
req.Header.Add("X-Cloud-Trace-Context", h)
441441
}
442442
return fromContext(ContextForTesting(req))
443443
}

0 commit comments

Comments
 (0)