Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions handwritten/spanner/.OwlBot.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion handwritten/spanner/benchmark/spanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import * as mock from '../test/mockserver/mockspanner';
import {SimulatedExecutionTime} from '../test/mockserver/mockspanner';
import * as mockInstanceAdmin from '../test/mockserver/mockinstanceadmin';
import * as mockDatabaseAdmin from '../test/mockserver/mockdatabaseadmin';
import {google} from '../protos/protos';
import {protos} from '@google-cloud/spanner-api';
import google = protos.google;
import {SessionPoolOptions} from '../src/session-pool';
import protobuf = google.spanner.v1;
import {performance} from 'perf_hooks';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
import {ServerDuplexStream, status} from '@grpc/grpc-js';
import {Spanner} from '../../src';
import {trace, context, Tracer} from '@opentelemetry/api';
import * as protos from '../../protos/protos';
import {CloudUtil} from './cloud-util';
import {OutcomeSender, ExecutionFlowContextInterface} from './cloud-executor';
import {protos} from '@google-cloud/spanner-api';
import spanner = protos.google.spanner;
import SpannerAsyncActionRequest = spanner.executor.v1.SpannerAsyncActionRequest;
import SpannerAsyncActionResponse = spanner.executor.v1.SpannerAsyncActionResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import {ServerDuplexStream, status} from '@grpc/grpc-js';
import {trace, context, Tracer} from '@opentelemetry/api';
import {CloudClientExecutor} from './cloud-client-executor';
import * as protos from '../../protos/protos';
import {protos} from '@google-cloud/spanner-api';
import spanner = protos.google.spanner;
import SpannerAsyncActionRequest = spanner.executor.v1.SpannerAsyncActionRequest;
import SpannerAsyncActionResponse = spanner.executor.v1.SpannerAsyncActionResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

import {status} from '@grpc/grpc-js';
import * as protos from '../../protos/protos';

// Import Protobuf types
import {protos as protos} from '@google-cloud/spanner-api';
import spanner = protos.google.spanner;
import SpannerActionOutcome = spanner.executor.v1.SpannerActionOutcome;
import SpannerAsyncActionResponse = spanner.executor.v1.SpannerAsyncActionResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ import {CloudExecutorImpl} from './cloud-executor-impl';
import {CloudUtil} from './cloud-util';
import {HealthImplementation} from 'grpc-health-check';
import {ReflectionService} from '@grpc/reflection';
import {getProtoPath} from '../../src/protos';

const PROTO_PATH = path.join(
__dirname,
'../../protos/google/spanner/executor/v1/cloud_executor.proto',
);
const PROTO_PATH = getProtoPath('google/spanner/executor/v1/cloud_executor.proto');

const OPTION_SPANNER_PORT = 'spanner_port';
const OPTION_PROXY_PORT = 'proxy_port';
Expand Down Expand Up @@ -160,7 +158,7 @@ export class WorkerProxy {
defaults: true,
oneofs: true,
includeDirs: [
path.join(__dirname, '../../protos'),
path.join(__dirname, '../../../node_modules/@google-cloud/spanner-api/build/protos'),
Comment thread
feywind marked this conversation as resolved.
path.join(__dirname, '../../../node_modules/google-proto-files'),
path.join(__dirname, '../../../node_modules/google-gax/build/protos'),
],
Expand Down
3 changes: 2 additions & 1 deletion handwritten/spanner/observability-test/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import * as through from 'through2';
import {EventEmitter} from 'events';
import * as assert from 'assert';
import * as extend from 'extend';
import {google} from '../protos/protos';
import {protos} from '@google-cloud/spanner-api';
import google = protos.google;
import {
BatchWriteOptions,
CommitCallback,
Expand Down
3 changes: 2 additions & 1 deletion handwritten/spanner/observability-test/spanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

import * as assert from 'assert';
import {grpc} from 'google-gax';
import {google} from '../protos/protos';
import {protos} from '@google-cloud/spanner-api';
import google = protos.google;
import {Database, Instance, Spanner} from '../src';
import {MutationSet} from '../src/transaction';
import protobuf = google.spanner.v1;
Expand Down
72 changes: 0 additions & 72 deletions handwritten/spanner/owlbot.py

This file was deleted.

6 changes: 3 additions & 3 deletions handwritten/spanner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,12 @@
"fix": "gts fix",
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build && cp -r test/data build/test",
"prepare": "npm run compile-protos && npm run compile",
"prepare": "npm run compile",
"pretest": "npm run compile",
"presystem-test": "npm run compile",
"preobservability-test": "npm run compile",
"proto": "compileProtos src",
"benchwrapper": "node bin/benchwrapper.js",
"precompile": "gts clean",
"compile-protos": "compileProtos src",
"coverage": "c8 mocha build/test build/test/common && c8 report --check-coverage"
},
"dependencies": {
Expand All @@ -61,6 +59,7 @@
"@google-cloud/opentelemetry-resource-util": "^2.4.0",
"@google-cloud/precise-date": "^5.0.0",
"@google-cloud/promisify": "^5.0.0",
"@google-cloud/spanner-api": "^0.2.0",
"@grpc/grpc-js": "^1.13.2",
"@grpc/proto-loader": "^0.8.0",
"@opentelemetry/api": "^1.9.0",
Expand Down Expand Up @@ -140,6 +139,7 @@
"overrides": {
"gcp-metadata": "^7.0.1",
"@sinonjs/fake-timers": "15.2.1",
"brace-expansion": "5.0.7",
"@eslint-community/eslint-utils": "<4.10.0"
},
"pnpm": {
Expand Down
Loading
Loading