fix: Handle // comments

suites/suiteDefinitions.go

@@ -22,7 +22,7 @@ var suiteDefinitions = []Suite{
 	{
 		Identifier:  "infra:debug",
 		DisplayName: "Infrastructure Agent (Debug)",
-		Description: "Infrastructure Agent installation with 3 minutes of debug log collection",
+		Description: "Infrastructure Agent installation with 5 minutes of debug log collection",
 		Tasks: []string{
 			"Base/*",
 			"Infra/*",

tasks/base/config/integrationTests.yml

@@ -65,7 +65,7 @@
     docker_cmd: ./nrdiag && cat nrdiag-output.json
  -  test_name: ProxyDetectNode
     dockerfile_lines:
-     - COPY tasks/fixtures/integration/proxyDetect/newrelicnode /app/newrelic.js
+     - COPY tasks/fixtures/integration/proxyDetect/newrelicnode.js /app/newrelic.js
     log_entry_expected:
      - Success.*Base/Config/ProxyDetect
      - http://user:pass@10.0.0.1:8000

tasks/base/config/validate.go

@@ -286,14 +286,33 @@ func ParseJSONarray(reader io.Reader) (result []tasks.ValidateBlob, err error) {
 // formatJs - Outputs the newrelic.js file into a more parsable format with comments and other non-essential items removed
 func formatJs(jsString string) ([]string, error) {
 	// remove comments that start with //
-	slashCommentRe, err := regexp.Compile("(?m)[/][/].*$")
+	// have to be careful not to remove proxy configs
+	slashCommentRe, err := regexp.Compile(`(?m)(^.*)([/][/].*)$`)
 	if err != nil {
 		return nil, err
 	}
-	removeSlashComments := slashCommentRe.ReplaceAllString(jsString, "")
-
+	singleQuoteRe, err := regexp.Compile(`[']`)
+	if err != nil {
+		return nil, err
+	}
+	removeSlashComments := slashCommentRe.ReplaceAllFunc([]byte(jsString), func(b []byte) []byte {
+		s := string(b)
+		checkForComment := strings.Split(s, "//")
+		// nothing on the left of the //, whole line is a comment, just remove it
+		if checkForComment[0] == "" {
+			return nil
+		}
+		// check to see if the // is within quotes like 'http://...'
+		quoteCount := len(singleQuoteRe.FindAllStringIndex(checkForComment[0], -1))
+		if quoteCount == 0 || quoteCount%2 == 0 {
+			// not in quotes
+			return []byte(checkForComment[0])
+		}
+		// keep the //, it was in quotes
+		return b
+	})
 	// remove \n and \r
-	removeLineBreaks := strings.ReplaceAll(removeSlashComments, "\n", "")
+	removeLineBreaks := strings.ReplaceAll(string(removeSlashComments), "\n", "")
 	removeCarriageReturn := strings.ReplaceAll(removeLineBreaks, "\r", "")
 
 	// remove everything before exports.config =
@@ -346,6 +365,7 @@ func parseJs(rawFile io.Reader) (result tasks.ValidateBlob, err error) {
 	if err != nil {
 		return
 	}
+	log.Debug("Formatted js: ", strings.Join(jsonString, "\n"))
 	tempMap := make(map[string]interface{})
 
 	location := ""
@@ -354,6 +374,7 @@ func parseJs(rawFile io.Reader) (result tasks.ValidateBlob, err error) {
 
 loop:
 	for lineNum, keyValue := range jsonString {
+		log.Debugf("keyValue: `%s`", keyValue)
 		switch keyValue {
 		case "{": //do nothing here
 		case "}", "},":

tasks/fixtures/integration/proxyDetect/newrelicnode → tasks/fixtures/integration/proxyDetect/newrelicnode.js

@@ -6,15 +6,16 @@
  * See lib/config.defaults.js in the agent distribution for a more complete
  * description of configuration variables and their potential values.
  */
-exports.config = { 
+// slash comment
+exports.config = { // slash comment
   /**
    * Array of application names.
    */
   app_name: ['My Node App'],
   /**
    * Your New Relic license key.
    */
-  license_key: 'license-key-val-node',
+  license_key: 'license-key-val-node',//comment
   proxy: 'http://user:pass@10.0.0.1:8000',
   logging: {
     /**