Skip to content

Commit

Permalink
fix: lint issue (#1372)
Browse files Browse the repository at this point in the history
  • Loading branch information
laljikanjareeya committed May 21, 2021
1 parent ecaaf3b commit 3be0b4b
Show file tree
Hide file tree
Showing 31 changed files with 870 additions and 1,026 deletions.
7 changes: 4 additions & 3 deletions samples/backups-get-database-operations.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ async function getDatabaseOperations(instanceId, projectId) {
});
console.log('Optimize Database Operations:');
databaseOperations.forEach(databaseOperation => {
const metadata = protos.google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata.decode(
databaseOperation.metadata.value
);
const metadata =
protos.google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata.decode(
databaseOperation.metadata.value
);
console.log(
`Database ${metadata.name} restored from backup is ` +
`${metadata.progress.progressPercent}% optimized.`
Expand Down
7 changes: 4 additions & 3 deletions samples/backups-get-operations.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ async function getBackupOperations(instanceId, databaseId, projectId) {
});
console.log('Create Backup Operations:');
backupOperations.forEach(backupOperation => {
const metadata = protos.google.spanner.admin.database.v1.CreateBackupMetadata.decode(
backupOperation.metadata.value
);
const metadata =
protos.google.spanner.admin.database.v1.CreateBackupMetadata.decode(
backupOperation.metadata.value
);
console.log(
`Backup ${metadata.name} on database ${metadata.database} is ` +
`${metadata.progress.progressPercent}% complete.`
Expand Down
3 changes: 2 additions & 1 deletion samples/database-create-with-encryption-key.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ async function createDatabaseWithEncryptionKey(
// [END spanner_create_database_with_encryption_key]
}

module.exports.createDatabaseWithEncryptionKey = createDatabaseWithEncryptionKey;
module.exports.createDatabaseWithEncryptionKey =
createDatabaseWithEncryptionKey;
3 changes: 2 additions & 1 deletion samples/database-create-with-version-retention-period.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,5 @@ async function createDatabaseWithVersionRetentionPeriod(
// [END spanner_create_database_with_version_retention_period]
}

module.exports.createDatabaseWithVersionRetentionPeriod = createDatabaseWithVersionRetentionPeriod;
module.exports.createDatabaseWithVersionRetentionPeriod =
createDatabaseWithVersionRetentionPeriod;
3 changes: 1 addition & 2 deletions samples/dml.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ function insertUsingDml(instanceId, databaseId, projectId) {
}
try {
const [rowCount] = await transaction.runUpdate({
sql:
'INSERT Singers (SingerId, FirstName, LastName) VALUES (10, @firstName, @lastName)',
sql: 'INSERT Singers (SingerId, FirstName, LastName) VALUES (10, @firstName, @lastName)',
params: {
firstName: 'Virginia',
lastName: 'Watson',
Expand Down
52 changes: 29 additions & 23 deletions src/backup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ type IBackupTranslatedEnum = TranslateEnumKeys<
export type GetMetadataResponse = [IBackupTranslatedEnum];
type GetMetadataCallback = RequestCallback<IBackupTranslatedEnum>;

type UpdateExpireTimeCallback = RequestCallback<databaseAdmin.spanner.admin.database.v1.IBackup>;
type UpdateExpireTimeCallback =
RequestCallback<databaseAdmin.spanner.admin.database.v1.IBackup>;

type DeleteCallback = RequestCallback<databaseAdmin.protobuf.IEmpty>;

Expand Down Expand Up @@ -183,15 +184,16 @@ class Backup {
callback?: CreateBackupCallback
): Promise<CreateBackupResponse> | void {
const gaxOpts = options.gaxOptions;
const reqOpts: databaseAdmin.spanner.admin.database.v1.ICreateBackupRequest = {
parent: this.instanceFormattedName_,
backupId: this.id,
backup: {
database: options.databasePath,
expireTime: Spanner.timestamp(options.expireTime).toStruct(),
name: this.formattedName_,
},
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.ICreateBackupRequest =
{
parent: this.instanceFormattedName_,
backupId: this.id,
backup: {
database: options.databasePath,
expireTime: Spanner.timestamp(options.expireTime).toStruct(),
name: this.formattedName_,
},
};
if ('versionTime' in options) {
reqOpts.backup!.versionTime = Spanner.timestamp(
options.versionTime
Expand All @@ -201,7 +203,9 @@ class Backup {
'encryptionConfig' in options &&
(options as CreateBackupOptions).encryptionConfig
) {
reqOpts.encryptionConfig = (options as CreateBackupOptions).encryptionConfig;
reqOpts.encryptionConfig = (
options as CreateBackupOptions
).encryptionConfig;
}
this.request(
{
Expand Down Expand Up @@ -439,15 +443,16 @@ class Backup {
typeof gaxOptionsOrCallback === 'object'
? (gaxOptionsOrCallback as CallOptions)
: {};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IUpdateBackupRequest = {
backup: {
name: this.formattedName_,
expireTime: Spanner.timestamp(expireTime).toStruct(),
},
updateMask: {
paths: ['expire_time'],
},
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IUpdateBackupRequest =
{
backup: {
name: this.formattedName_,
expireTime: Spanner.timestamp(expireTime).toStruct(),
},
updateMask: {
paths: ['expire_time'],
},
};
this.request<databaseAdmin.spanner.admin.database.v1.IBackup>(
{
client: 'DatabaseAdminClient',
Expand Down Expand Up @@ -493,9 +498,10 @@ class Backup {
typeof gaxOptionsOrCallback === 'object'
? (gaxOptionsOrCallback as CallOptions)
: {};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IDeleteBackupRequest = {
name: this.formattedName_,
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IDeleteBackupRequest =
{
name: this.formattedName_,
};
this.request<databaseAdmin.spanner.admin.database.v1.IBackup>(
{
client: 'DatabaseAdminClient',
Expand Down
55 changes: 31 additions & 24 deletions src/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ export type BatchCreateSessionsCallback = ResourceCallback<
>;

export type DatabaseDeleteResponse = [databaseAdmin.protobuf.IEmpty];
export type DatabaseDeleteCallback = NormalCallback<databaseAdmin.protobuf.IEmpty>;
export type DatabaseDeleteCallback =
NormalCallback<databaseAdmin.protobuf.IEmpty>;

export interface CancelableDuplex extends Duplex {
cancel(): void;
Expand Down Expand Up @@ -314,7 +315,7 @@ class Database extends common.GrpcServiceObject {

const formattedName_ = Database.formatName_(instance.formattedName_, name);

super(({
super({
parent: instance,
id: name,
methods,
Expand Down Expand Up @@ -359,7 +360,7 @@ class Database extends common.GrpcServiceObject {
return instance.createDatabase(formattedName_, options, callback);
}
},
} as {}) as ServiceObjectConfig);
} as {} as ServiceObjectConfig);

this.pool_ =
typeof poolOptions === 'function'
Expand All @@ -382,7 +383,8 @@ class Database extends common.GrpcServiceObject {
}

static getEnvironmentQueryOptions() {
const options = {} as spannerClient.spanner.v1.ExecuteSqlRequest.IQueryOptions;
const options =
{} as spannerClient.spanner.v1.ExecuteSqlRequest.IQueryOptions;
if (process.env.SPANNER_OPTIMIZER_VERSION) {
options.optimizerVersion = process.env.SPANNER_OPTIMIZER_VERSION;
}
Expand Down Expand Up @@ -910,9 +912,10 @@ class Database extends common.GrpcServiceObject {
const callback =
typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

const reqOpts: databaseAdmin.spanner.admin.database.v1.IDropDatabaseRequest = {
database: this.formattedName_,
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IDropDatabaseRequest =
{
database: this.formattedName_,
};
this.close(() => {
this.request<r.Response>(
{
Expand Down Expand Up @@ -1128,9 +1131,10 @@ class Database extends common.GrpcServiceObject {
? (gaxOptionsOrCallback as CallOptions)
: {};

const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetDatabaseRequest = {
name: this.formattedName_,
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetDatabaseRequest =
{
name: this.formattedName_,
};
return this.request(
{
client: 'DatabaseAdminClient',
Expand Down Expand Up @@ -1289,9 +1293,10 @@ class Database extends common.GrpcServiceObject {
const callback =
typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetDatabaseDdlRequest = {
database: this.formattedName_,
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetDatabaseDdlRequest =
{
database: this.formattedName_,
};
this.request<databaseAdmin.spanner.admin.database.v1.IGetDatabaseDdlResponse>(
{
client: 'DatabaseAdminClient',
Expand Down Expand Up @@ -1926,11 +1931,12 @@ class Database extends common.GrpcServiceObject {
? (options as RestoreOptions).gaxOptions
: (options as CallOptions);

const reqOpts: databaseAdmin.spanner.admin.database.v1.IRestoreDatabaseRequest = {
parent: this.instance.formattedName_,
databaseId: this.id,
backup: Backup.formatName_(this.instance.formattedName_, backupName),
};
const reqOpts: databaseAdmin.spanner.admin.database.v1.IRestoreDatabaseRequest =
{
parent: this.instance.formattedName_,
databaseId: this.id,
backup: Backup.formatName_(this.instance.formattedName_, backupName),
};

if (
'encryptionConfig' in options &&
Expand Down Expand Up @@ -2756,12 +2762,13 @@ class Database extends common.GrpcServiceObject {
statements: arrify(statements) as string[],
};
}
const reqOpts: databaseAdmin.spanner.admin.database.v1.IUpdateDatabaseDdlRequest = extend(
{
database: this.formattedName_,
},
statements
);
const reqOpts: databaseAdmin.spanner.admin.database.v1.IUpdateDatabaseDdlRequest =
extend(
{
database: this.formattedName_,
},
statements
);
return this.request(
{
client: 'DatabaseAdminClient',
Expand Down
8 changes: 4 additions & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class Spanner extends GrpcService {
}
}
}
options = (Object.assign(
options = Object.assign(
{
libName: 'gccl',
libVersion: require('../../package.json').version,
Expand All @@ -228,7 +228,7 @@ class Spanner extends GrpcService {
grpc,
},
options || {}
) as {}) as SpannerOptions;
) as {} as SpannerOptions;
const emulatorHost = Spanner.getSpannerEmulatorHost();
if (
emulatorHost &&
Expand All @@ -239,7 +239,7 @@ class Spanner extends GrpcService {
options.port = emulatorHost.port;
options.sslCreds = grpc.credentials.createInsecure();
}
const config = ({
const config = {
baseUrl:
options.apiEndpoint ||
options.servicePath ||
Expand All @@ -253,7 +253,7 @@ class Spanner extends GrpcService {
},
scopes: ['https://www.googleapis.com/auth/cloud-platform'],
packageJson: require('../../package.json'),
} as {}) as GrpcServiceConfig;
} as {} as GrpcServiceConfig;
super(config, options);
this.options = options;
this.auth = new GoogleAuth(this.options);
Expand Down
7 changes: 4 additions & 3 deletions src/instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ export interface CreateDatabaseOptions
export type GetDatabasesOptions = PagedOptions;
export type CreateInstanceCallback = LongRunningCallback<Instance>;
export type CreateDatabaseCallback = LongRunningCallback<Database>;
export type DeleteInstanceCallback = NormalCallback<instanceAdmin.protobuf.IEmpty>;
export type DeleteInstanceCallback =
NormalCallback<instanceAdmin.protobuf.IEmpty>;

export type ExistsInstanceCallback = NormalCallback<boolean>;
export type GetDatabasesCallback = RequestCallback<
Expand Down Expand Up @@ -201,7 +202,7 @@ class Instance extends common.GrpcServiceObject {
*/
create: true,
};
super(({
super({
parent: spanner,
/**
* @name Instance#id
Expand All @@ -216,7 +217,7 @@ class Instance extends common.GrpcServiceObject {
): void {
spanner.createInstance(formattedName_, options, callback);
},
} as {}) as ServiceObjectConfig);
} as {} as ServiceObjectConfig);
this.formattedName_ = formattedName_;
this.request = spanner.request.bind(spanner);
this.requestStream = spanner.requestStream.bind(spanner);
Expand Down
7 changes: 4 additions & 3 deletions src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export const enum types {
ReadWrite = 'readwrite',
}

export type GetSessionMetadataCallback = NormalCallback<google.spanner.v1.ISession>;
export type GetSessionMetadataCallback =
NormalCallback<google.spanner.v1.ISession>;
export type GetSessionMetadataResponse = [google.spanner.v1.ISession];

export type KeepAliveCallback = NormalCallback<google.spanner.v1.IResultSet>;
Expand Down Expand Up @@ -202,7 +203,7 @@ export class Session extends common.GrpcServiceObject {
*/
get: true,
};
super(({
super({
parent: database,
/**
* @name Session#id
Expand Down Expand Up @@ -231,7 +232,7 @@ export class Session extends common.GrpcServiceObject {
callback(null, this, apiResponse);
});
},
} as {}) as ServiceObjectConfig);
} as {} as ServiceObjectConfig);

this.resourceHeader_ = {
[CLOUD_RESOURCE_HEADER]: (this.parent as Database).formattedName_,
Expand Down

0 comments on commit 3be0b4b

Please sign in to comment.