Merge pull request #358 from jpogran/GH-353-set-puppet-agent-default

(GH-353) Set default source to Puppet Agent

Author: glennsarti

package.json

@@ -269,14 +269,14 @@
       "properties": {
         "puppet.installType": {
           "type": "string",
-          "default": "pdk",
+          "default": "agent",
           "description": "The Puppet Install Type",
           "enum": [
             "pdk",
-            "puppet"
+            "agent"
           ]
         },
-        "puppet.installDirectory": {
+        "puppet.puppetAgentDir": {
           "type": "string",
           "default": null,
           "description": "The fully qualified path to the Puppet agent install directory. For example: 'C:\\Program Files\\Puppet Labs\\Puppet' or '/opt/puppetlabs/puppet'"

src/configuration.ts

@@ -37,8 +37,8 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
   }
 
   get puppetBaseDir(): string {
-    if (this.config['installDirectory'] !== null) {
-      return this.config['installDirectory'];
+    if (this.config['puppetAgentDir'] !== null) {
+      return this.config['puppetAgentDir'];
     }
 
     let programFiles = PathResolver.getprogramFiles();

src/interfaces.ts

@@ -51,5 +51,5 @@ export interface IConnectionConfiguration {
 
 export enum PuppetInstallType{
   PDK    = "pdk",
-  PUPPET = "puppet",
+  PUPPET = "agent",
 }

src/test/configuration.test.ts

@@ -24,12 +24,12 @@ suite("Configuration Tests", () => {
 
   test("correct install type", () => {
     var config = new ConnectionConfiguration();
-    assert.equal(PuppetInstallType.PDK, config.puppetInstallType);
+    assert.equal(PuppetInstallType.PUPPET, config.puppetInstallType);
   });
 
-  test("resolves puppetBaseDir as pdk with default installtype", () => {
+  test("resolves puppetBaseDir as puppet with default installtype", () => {
     var config = new ConnectionConfiguration();
-    assert.equal(config.puppetBaseDir, pdkPuppetBaseDir);
+    assert.equal(config.puppetBaseDir, puppetBaseDir);
   });
 
   test("resolves puppetBaseDir as puppet with installtype eq puppet", () => {