accept version and map version_date to version (#635)

* Change generated service to accept version and translate version_date to version in compact layer

* Fix change lost in rebase

Author: Mike Kistler

README.md

@@ -151,7 +151,7 @@ var conversation = new ConversationV1({
   username: '<username>',
   password: '<password>',
   url: 'https://gateway.watsonplatform.net/conversation/api/',
-  version_date: '2017-05-26'
+  version: '2017-05-26'
 });
 
 conversation.message(
@@ -180,7 +180,7 @@ var discovery = new DiscoveryV1({
   username: '<username>',
   password: '<password>',
   url: 'https://gateway.watsonplatform.net/discovery/api/',
-  version_date: '2017-09-01'
+  version: '2017-09-01'
 });
 
 discovery.query(
@@ -286,7 +286,7 @@ var NaturalLanguageUnderstandingV1 = require('watson-developer-cloud/natural-lan
 var nlu = new NaturalLanguageUnderstandingV1({
   username: '<username>',
   password: '<password>',
-  version_date: '2017-02-27',
+  version: '2017-02-27',
   url: 'https://gateway.watsonplatform.net/natural-language-understanding/api/'
 });
 
@@ -320,7 +320,7 @@ var PersonalityInsightsV3 = require('watson-developer-cloud/personality-insights
 var personalityInsights = new PersonalityInsightsV3({
   username: '<username>',
   password: '<password>',
-  version_date: '2016-10-19',
+  version: '2016-10-19',
   url: 'https://gateway.watsonplatform.net/personality-insights/api/'
 });
 
@@ -420,7 +420,7 @@ var ToneAnalyzerV3 = require('watson-developer-cloud/tone-analyzer/v3');
 var toneAnalyzer = new ToneAnalyzerV3({
   username: '<username>',
   password: '<password>',
-  version_date: '2016-05-19',
+  version: '2016-05-19',
   url: 'https://gateway.watsonplatform.net/tone-analyzer/api/'
 });
 
@@ -453,7 +453,7 @@ var fs = require('fs');
 
 var visualRecognition = new VisualRecognitionV3({
   api_key: '<api_key>',
-  version_date: '2016-05-20'
+  version: '2016-05-20'
 });
 
 var params = {

conversation/v1-generated.ts

@@ -35,7 +35,7 @@ class ConversationV1 extends BaseService {
    * Construct a ConversationV1 object.
    *
    * @param {Object} options - Options for the service.
-   * @param {String} options.version_date - The API version date to use with the service, in "YYYY-MM-DD" format. Whenever the API is changed in a backwards incompatible way, a new minor version of the API is released. The service uses the API version for the date you specify, or the most recent version before that date. Note that you should not programmatically specify the current date at runtime, in case the API has been updated since your application's release. Instead, specify a version date that is compatible with your application, and don't change it until your application is ready for a later version.
+   * @param {String} options.version - The API version date to use with the service, in "YYYY-MM-DD" format. Whenever the API is changed in a backwards incompatible way, a new minor version of the API is released. The service uses the API version for the date you specify, or the most recent version before that date. Note that you should not programmatically specify the current date at runtime, in case the API has been updated since your application's release. Instead, specify a version date that is compatible with your application, and don't change it until your application is ready for a later version.
    * @param {String} [options.url] - The base url to use when contacting the service (e.g. 'https://gateway.watsonplatform.net/conversation/api'). The base url may differ between Bluemix regions.
    * @param {String} [options.username] - The username used to authenticate with the service. Username and password credentials are only required to run your application locally or outside of Bluemix. When running on Bluemix, the credentials will be automatically loaded from the `VCAP_SERVICES` environment variable.
    * @param {String} [options.password] - The password used to authenticate with the service. Username and password credentials are only required to run your application locally or outside of Bluemix. When running on Bluemix, the credentials will be automatically loaded from the `VCAP_SERVICES` environment variable.
@@ -48,11 +48,11 @@ class ConversationV1 extends BaseService {
    */
   constructor(options: ConversationV1.Options) {
     super(options);
-    // check if 'version_date' was provided
-    if (typeof this._options.version_date === 'undefined') {
-      throw new Error('Argument error: version_date was not specified');
+    // check if 'version' was provided
+    if (typeof this._options.version === 'undefined') {
+      throw new Error('Argument error: version was not specified');
     }
-    this._options.qs.version = options.version_date;
+    this._options.qs.version = options.version;
   }
 
   /*************************
@@ -2240,7 +2240,7 @@ ConversationV1.prototype.serviceVersion = 'v1';
 namespace ConversationV1 {
   /** Options for the `ConversationV1` constructor. **/
   export type Options = {
-    version_date: string;
+    version: string;
     url?: string;
     username?: string;
     password?: string;

conversation/v1.ts

@@ -31,7 +31,10 @@ class ConversationV1 extends GeneratedConversationV1 {
   static VERSION_DATE_2016_07_11: string = '2016-07-11';
 
   constructor(options) {
-    super(options);
+    // For backward compatibility, allow version to be passed in version_date.
+    const _options = extend({}, options);
+    _options.version = _options.version_date || _options.version;
+    super(_options);
   }
 
   private static removedError: Error = new Error(

discovery/v1-generated.ts

@@ -35,7 +35,7 @@ class DiscoveryV1 extends BaseService {
    * Construct a DiscoveryV1 object.
    *
    * @param {Object} options - Options for the service.
-   * @param {String} options.version_date - The API version date to use with the service, in "YYYY-MM-DD" format. Whenever the API is changed in a backwards incompatible way, a new minor version of the API is released. The service uses the API version for the date you specify, or the most recent version before that date. Note that you should not programmatically specify the current date at runtime, in case the API has been updated since your application's release. Instead, specify a version date that is compatible with your application, and don't change it until your application is ready for a later version.
+   * @param {String} options.version - The API version date to use with the service, in "YYYY-MM-DD" format. Whenever the API is changed in a backwards incompatible way, a new minor version of the API is released. The service uses the API version for the date you specify, or the most recent version before that date. Note that you should not programmatically specify the current date at runtime, in case the API has been updated since your application's release. Instead, specify a version date that is compatible with your application, and don't change it until your application is ready for a later version.
    * @param {String} [options.url] - The base url to use when contacting the service (e.g. 'https://gateway.watsonplatform.net/discovery/api'). The base url may differ between Bluemix regions.
    * @param {String} [options.username] - The username used to authenticate with the service. Username and password credentials are only required to run your application locally or outside of Bluemix. When running on Bluemix, the credentials will be automatically loaded from the `VCAP_SERVICES` environment variable.
    * @param {String} [options.password] - The password used to authenticate with the service. Username and password credentials are only required to run your application locally or outside of Bluemix. When running on Bluemix, the credentials will be automatically loaded from the `VCAP_SERVICES` environment variable.
@@ -48,11 +48,11 @@ class DiscoveryV1 extends BaseService {
    */
   constructor(options: DiscoveryV1.Options) {
     super(options);
-    // check if 'version_date' was provided
-    if (typeof this._options.version_date === 'undefined') {
-      throw new Error('Argument error: version_date was not specified');
+    // check if 'version' was provided
+    if (typeof this._options.version === 'undefined') {
+      throw new Error('Argument error: version was not specified');
     }
-    this._options.qs.version = options.version_date;
+    this._options.qs.version = options.version;
   }
 
   /*************************
@@ -2002,7 +2002,7 @@ DiscoveryV1.prototype.serviceVersion = 'v1';
 namespace DiscoveryV1 {
   /** Options for the `DiscoveryV1` constructor. **/
   export type Options = {
-    version_date: string;
+    version: string;
     url?: string;
     username?: string;
     password?: string;

discovery/v1.ts

@@ -27,6 +27,13 @@ class DiscoveryV1 extends GeneratedDiscoveryV1 {
   static VERSION_DATE_2017_04_27: string = '2017-04-27';
   static VERSION_DATE_2016_12_15: string = '2016-12-15';
 
+  constructor(options) {
+    // For backward compatibility, allow version to be passed in version_date.
+    const _options = extend({}, options);
+    _options.version = _options.version_date || _options.version;
+    super(_options);
+  }
+
   static _ensureFilename(file) {
     // no changes needed for streams created by fs.ReadStream (or similar looking streams)
     if (isStream.isReadable(file) && file.path) {

lib/base_service.ts

@@ -30,7 +30,7 @@ export interface HeaderOptions {
 
 export interface UserOptions {
   url?: string;
-  version_date?: string;
+  version?: string;
   username?: string;
   password?: string;
   api_key?: string;