fix: do not create empty license file (#78)

* fix: do not create empty license file * pretty
googleapis · Oct 28, 2019 · 908dd14 · 908dd14
1 parent 1ff3617
commit 908dd14
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 6 deletions.
diff --git a/...typescript_gapic/src/$version/license.njk → templates/typescript_gapic/_license.njk b/...typescript_gapic/src/$version/license.njk → templates/typescript_gapic/_license.njk
@@ -1,4 +1,5 @@
-{% macro license() %}// Copyright 2019 Google LLC
+{% macro license() -%}
+// Copyright 2019 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 // ** This file is automatically generated by gapic-generator-typescript. **
 // ** https://github.com/googleapis/gapic-generator-typescript **
 // ** All changes to this file may be overwritten. **
-{% endmacro %}
+{% endmacro %}
diff --git a/templates/typescript_gapic/src/$version/$service_client.ts.njk b/templates/typescript_gapic/src/$version/$service_client.ts.njk
@@ -1,4 +1,5 @@
-{% import "./license.njk" as license %}{{license.license()}}
+{% import "../../_license.njk" as license -%}
+{{license.license()}}
 import * as gax from 'google-gax';
 import * as path from 'path';
 

diff --git a/templates/typescript_gapic/src/$version/index.ts.njk b/templates/typescript_gapic/src/$version/index.ts.njk
@@ -1,4 +1,5 @@
-{% import "./license.njk" as license %}{{license.license()}}
+{% import "../../_license.njk" as license -%}
+{{license.license()}}
 {% for service in api.services -%}
 export {{ '{' + service.name.toPascalCase() + 'Client}' }} from './{{ service.name.toSnakeCase() }}_client';
 {%- endfor %}
diff --git a/templates/typescript_gapic/src/index.ts.njk b/templates/typescript_gapic/src/index.ts.njk
@@ -1,4 +1,5 @@
-{% import "././$version/license.njk" as license %}{{license.license()}}
+{% import "../_license.njk" as license -%}
+{{license.license()}}
 import * as {{ api.naming.version }} from './{{ api.naming.version }}';
 export {{ '{' + api.naming.version + '}' }};
 {% for service in api.services -%}

diff --git a/templates/typescript_gapic/test/gapic-$service-$version.ts.njk b/templates/typescript_gapic/test/gapic-$service-$version.ts.njk
@@ -1,4 +1,5 @@
-{% import "../src/$version/license.njk" as license %}{{license.license()}}
+{% import "../_license.njk" as license -%}
+{{license.license()}}
 'use strict';
 
 const assert = require('assert');

diff --git a/typescript/test/testdata/keymanager/src/v1/license.baseline b/typescript/test/testdata/keymanager/src/v1/license.baseline
diff --git a/typescript/test/testdata/showcase/src/v1beta1/license.baseline b/typescript/test/testdata/showcase/src/v1beta1/license.baseline
diff --git a/typescript/test/testdata/texttospeech/src/v1/license.baseline b/typescript/test/testdata/texttospeech/src/v1/license.baseline