diff --git a/packages/google-cloud-oslogin/src/index.ts b/packages/google-cloud-oslogin/src/index.ts index 531f3c5dc80e..4ce2c305aa22 100644 --- a/packages/google-cloud-oslogin/src/index.ts +++ b/packages/google-cloud-oslogin/src/index.ts @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,17 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// ** This file is automatically generated by gapic-generator-typescript. ** -// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** This file is automatically generated by synthtool. ** +// ** https://github.com/googleapis/synthtool ** // ** All changes to this file may be overwritten. ** -import * as v1beta from './v1beta'; import * as v1 from './v1'; +import * as v1beta from './v1beta'; const OsLoginServiceClient = v1.OsLoginServiceClient; -export {v1beta, v1, OsLoginServiceClient}; -// For compatibility with JavaScript libraries we need to provide this default export: -// tslint:disable-next-line no-default-export -export default {v1beta, v1, OsLoginServiceClient}; + +export {v1, v1beta, OsLoginServiceClient}; +export default {v1, v1beta, OsLoginServiceClient}; import * as protos from '../protos/protos'; export {protos}; diff --git a/packages/google-cloud-oslogin/synth.metadata b/packages/google-cloud-oslogin/synth.metadata index 0a49541b3bab..de1b8de638b8 100644 --- a/packages/google-cloud-oslogin/synth.metadata +++ b/packages/google-cloud-oslogin/synth.metadata @@ -4,14 +4,22 @@ "git": { "name": ".", "remote": "git@github.com:googleapis/nodejs-os-login.git", - "sha": "59a874f2ad586f54b994e0ee8ed3c7920eb15126" + "sha": "579f1e48ef2a3f0fd1460b07592d5dc499cf8043" + } + }, + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "6dfd72d028a0d0a43764e060f7b15e004385c3a1", + "internalRef": "310168181" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ab883569eb0257bbf16a6d825fd018b3adde3912" + "sha": "756bc4dfc24e8bc4c5dd4116daa41a0440ebf5a0" } } ], @@ -20,7 +28,7 @@ "client": { "source": "googleapis", "apiName": "os-login", - "apiVersion": "v1beta", + "apiVersion": "v1", "language": "typescript", "generator": "gapic-generator-typescript" } @@ -29,7 +37,7 @@ "client": { "source": "googleapis", "apiName": "os-login", - "apiVersion": "v1", + "apiVersion": "v1beta", "language": "typescript", "generator": "gapic-generator-typescript" } diff --git a/packages/google-cloud-oslogin/synth.py b/packages/google-cloud-oslogin/synth.py index 95c52999f7da..17983c6cdb2a 100644 --- a/packages/google-cloud-oslogin/synth.py +++ b/packages/google-cloud-oslogin/synth.py @@ -25,14 +25,14 @@ gapic = gcp.GAPICMicrogenerator() -versions = ['v1beta', 'v1'] +versions = ['v1', 'v1beta'] for version in versions: library = gapic.typescript_library( 'os-login', generator_args={ "grpc-service-config": f"google/cloud/oslogin/{version}/oslogin_grpc_service_config.json", "package-name": f"@google-cloud/os-login" - }, + }, proto_path=f'/google/cloud/oslogin/{version}', extra_proto_files=['google/cloud/oslogin/common/common.proto'], version=version) @@ -40,12 +40,13 @@ # skip index, protos, package.json, and README.md s.copy( library, - excludes=['package.json', 'README.md', 'src/index.ts'], + excludes=['package.json', 'README.md'], ) # Copy common templates common_templates = gcp.CommonTemplates() -templates = common_templates.node_library(source_location='build/src') +templates = common_templates.node_library( + source_location='build/src', versions=versions, default_version='v1') s.copy(templates) node.postprocess_gapic_library()