From ce8e06d5199d83d9704d0216591b0596a1a80d6d Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 3 Apr 2020 15:39:40 -0700 Subject: [PATCH] fix: proper licenses and proper link to Apache license (#386) --- .../bigquery-storage/.prettierrc.js.baseline | 7 ++++++- .../disable-packing-test/.prettierrc.js.baseline | 7 ++++++- baselines/dlp/.prettierrc.js.baseline | 7 ++++++- baselines/kms/.prettierrc.js.baseline | 7 ++++++- baselines/logging/.prettierrc.js.baseline | 7 ++++++- baselines/monitoring/.prettierrc.js.baseline | 7 ++++++- baselines/redis/.prettierrc.js.baseline | 7 ++++++- baselines/showcase/.prettierrc.js.baseline | 7 ++++++- baselines/texttospeech/.prettierrc.js.baseline | 7 ++++++- baselines/translate/.prettierrc.js.baseline | 7 ++++++- templates/typescript_gapic/.prettierrc.js.njk | 15 ++------------- templates/typescript_gapic/_license.njk | 2 +- templates/typescript_gapic/_util.njk | 2 +- .../src/$version/$service_client.ts.njk | 2 +- .../src/$version/$service_client_config.json.njk | 2 +- .../src/$version/$service_proto_list.json.njk | 2 +- .../typescript_gapic/src/$version/index.ts.njk | 2 +- templates/typescript_gapic/src/index.ts.njk | 2 +- .../test/gapic_$service_$version.ts.njk | 2 +- templates/typescript_gapic/tsconfig.json.njk | 2 +- templates/typescript_packing_test/_license.njk | 2 +- .../system-test/fixtures/sample/src/index.js.njk | 2 +- .../system-test/fixtures/sample/src/index.ts.njk | 2 +- .../system-test/install.ts.njk | 2 +- 24 files changed, 75 insertions(+), 36 deletions(-) diff --git a/baselines/bigquery-storage/.prettierrc.js.baseline b/baselines/bigquery-storage/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/bigquery-storage/.prettierrc.js.baseline +++ b/baselines/bigquery-storage/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/disable-packing-test/.prettierrc.js.baseline b/baselines/disable-packing-test/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/disable-packing-test/.prettierrc.js.baseline +++ b/baselines/disable-packing-test/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/dlp/.prettierrc.js.baseline b/baselines/dlp/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/dlp/.prettierrc.js.baseline +++ b/baselines/dlp/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/kms/.prettierrc.js.baseline b/baselines/kms/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/kms/.prettierrc.js.baseline +++ b/baselines/kms/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/logging/.prettierrc.js.baseline b/baselines/logging/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/logging/.prettierrc.js.baseline +++ b/baselines/logging/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/monitoring/.prettierrc.js.baseline b/baselines/monitoring/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/monitoring/.prettierrc.js.baseline +++ b/baselines/monitoring/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/redis/.prettierrc.js.baseline b/baselines/redis/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/redis/.prettierrc.js.baseline +++ b/baselines/redis/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/showcase/.prettierrc.js.baseline b/baselines/showcase/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/showcase/.prettierrc.js.baseline +++ b/baselines/showcase/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/texttospeech/.prettierrc.js.baseline b/baselines/texttospeech/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/texttospeech/.prettierrc.js.baseline +++ b/baselines/texttospeech/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/baselines/translate/.prettierrc.js.baseline b/baselines/translate/.prettierrc.js.baseline index 08cba3775..ee62d5025 100644 --- a/baselines/translate/.prettierrc.js.baseline +++ b/baselines/translate/.prettierrc.js.baseline @@ -4,13 +4,18 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // 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 ** +// ** All changes to this file may be overwritten. ** + module.exports = { ...require('gts/.prettierrc.json') diff --git a/templates/typescript_gapic/.prettierrc.js.njk b/templates/typescript_gapic/.prettierrc.js.njk index 08cba3775..9255ad915 100644 --- a/templates/typescript_gapic/.prettierrc.js.njk +++ b/templates/typescript_gapic/.prettierrc.js.njk @@ -1,16 +1,5 @@ -// 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +{% import "./_license.njk" as license -%} +{{license.license(commonParameters.copyrightYear)}} module.exports = { ...require('gts/.prettierrc.json') diff --git a/templates/typescript_gapic/_license.njk b/templates/typescript_gapic/_license.njk index b224b99a8..46576fcdb 100644 --- a/templates/typescript_gapic/_license.njk +++ b/templates/typescript_gapic/_license.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/_util.njk b/templates/typescript_gapic/_util.njk index 860160dd1..d209d5d3f 100644 --- a/templates/typescript_gapic/_util.njk +++ b/templates/typescript_gapic/_util.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/src/$version/$service_client.ts.njk b/templates/typescript_gapic/src/$version/$service_client.ts.njk index c4cdc1ed2..622900da6 100644 --- a/templates/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/typescript_gapic/src/$version/$service_client.ts.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/src/$version/$service_client_config.json.njk b/templates/typescript_gapic/src/$version/$service_client_config.json.njk index 20d83b5d4..e6686b3e8 100644 --- a/templates/typescript_gapic/src/$version/$service_client_config.json.njk +++ b/templates/typescript_gapic/src/$version/$service_client_config.json.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/src/$version/$service_proto_list.json.njk b/templates/typescript_gapic/src/$version/$service_proto_list.json.njk index 09ce2c06e..493c9b503 100644 --- a/templates/typescript_gapic/src/$version/$service_proto_list.json.njk +++ b/templates/typescript_gapic/src/$version/$service_proto_list.json.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/src/$version/index.ts.njk b/templates/typescript_gapic/src/$version/index.ts.njk index 6b92b82a8..75084c2d7 100644 --- a/templates/typescript_gapic/src/$version/index.ts.njk +++ b/templates/typescript_gapic/src/$version/index.ts.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/src/index.ts.njk b/templates/typescript_gapic/src/index.ts.njk index 4314a3b67..e87873863 100644 --- a/templates/typescript_gapic/src/index.ts.njk +++ b/templates/typescript_gapic/src/index.ts.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/test/gapic_$service_$version.ts.njk b/templates/typescript_gapic/test/gapic_$service_$version.ts.njk index bed29d789..390088731 100644 --- a/templates/typescript_gapic/test/gapic_$service_$version.ts.njk +++ b/templates/typescript_gapic/test/gapic_$service_$version.ts.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_gapic/tsconfig.json.njk b/templates/typescript_gapic/tsconfig.json.njk index bfd1a4c5b..59cbff05a 100644 --- a/templates/typescript_gapic/tsconfig.json.njk +++ b/templates/typescript_gapic/tsconfig.json.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_packing_test/_license.njk b/templates/typescript_packing_test/_license.njk index b224b99a8..46576fcdb 100644 --- a/templates/typescript_packing_test/_license.njk +++ b/templates/typescript_packing_test/_license.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_packing_test/system-test/fixtures/sample/src/index.js.njk b/templates/typescript_packing_test/system-test/fixtures/sample/src/index.js.njk index e13ab8a44..3f3aa9abb 100644 --- a/templates/typescript_packing_test/system-test/fixtures/sample/src/index.js.njk +++ b/templates/typescript_packing_test/system-test/fixtures/sample/src/index.js.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk b/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk index 16842e693..72996e3ed 100644 --- a/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk +++ b/templates/typescript_packing_test/system-test/fixtures/sample/src/index.ts.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/templates/typescript_packing_test/system-test/install.ts.njk b/templates/typescript_packing_test/system-test/install.ts.njk index 7ec493901..ed23b8eaf 100644 --- a/templates/typescript_packing_test/system-test/install.ts.njk +++ b/templates/typescript_packing_test/system-test/install.ts.njk @@ -6,7 +6,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,