Merge pull request #690 from postmanlabs/release/1.6.1

Release 1.6.1

Author: Ankit Saini

CHANGELOG.md

@@ -1,3 +1,6 @@
+v1.6.1 (March 27, 2023)
+* Fix backlashes being unescaped unnecessarily in cURL codegen
+
 v1.6.0 (March 17, 2023)
 * PEP8 improvements in python-requests code
 * Fix for - [#491](https://github.com/postmanlabs/postman-code-generators/issues/491) Added support for kotlin okhttp code snippets.

codegens/curl/lib/index.js

@@ -141,7 +141,8 @@ self = module.exports = {
               isAsperandPresent = _.includes(rawBody, '@'),
               // Use the long option if `@` is present in the request body otherwise follow user setting
               optionName = isAsperandPresent ? '--data-raw' : form('-d', format);
-            snippet += indent + `${optionName} ${quoteType}${sanitize(rawBody, trim, quoteType, true)}${quoteType}`;
+            // eslint-disable-next-line max-len
+            snippet += indent + `${optionName} ${quoteType}${sanitize(rawBody, trim, quoteType)}${quoteType}`;
             break;
           }
 

codegens/curl/test/unit/convert.test.js

@@ -34,41 +34,6 @@ describe('curl convert function', function () {
       });
     });
 
-    it('should escape backslash in raw bodies', function () {
-      request = new sdk.Request({
-        'method': 'POST',
-        'header': [
-          {
-            'key': 'Content-Type',
-            'value': 'application/json'
-          }
-        ],
-        'body': {
-          'mode': 'raw',
-          'raw': '{ "foo": "\\" }'
-        },
-        'url': {
-          'raw': 'https://postman-echo.com/post',
-          'protocol': 'https',
-          'host': [
-            'postman-echo',
-            'com'
-          ],
-          'path': [
-            'post'
-          ]
-        }
-      });
-
-      convert(request, {}, function (error, snippet) {
-        if (error) {
-          expect.fail(null, null, error);
-        }
-
-        expect(snippet).to.contain('{ "foo": "\\\\" }');
-      });
-    });
-
     it('should return snippet with url in single quote(\')', function () {
       request = new sdk.Request({
         'method': 'POST',

codegens/r-httr/test/newman/newman.test.js

@@ -13,7 +13,7 @@ describe('r-httr Converter', function () {
         fileName: 'snippet.r',
         // Run script required to run the generated code snippet
         runScript: 'Rscript snippet.r',
-        skipCollections: ['redirectCollection', 'unsupportedMethods']
+        skipCollections: ['redirectCollection', 'unsupportedMethods', 'rawBody']
       };
     runNewmanTest(convert, options, testConfig);
   });

npm/ci-requirements.sh

@@ -66,7 +66,7 @@ pushd ./codegens/swift &>/dev/null;
   sudo apt-get update
   sudo apt-get install clang-3.6 libicu-dev libpython2.7 -y
   sudo apt-get install libcurl4 libpython2.7-dev -y
-  sudo wget https://download.swift.org/swift-5.7.3-release/ubuntu2004/swift-5.7.3-RELEASE/swift-5.7.3-RELEASE-ubuntu20.04.tar.gz
+  sudo wget -q https://download.swift.org/swift-5.7.3-release/ubuntu2004/swift-5.7.3-RELEASE/swift-5.7.3-RELEASE-ubuntu20.04.tar.gz
   sudo tar xzf swift-5.7.3-RELEASE-ubuntu20.04.tar.gz
   sudo chmod 777 swift-5.7.3-RELEASE-ubuntu20.04/usr/lib/swift/CoreFoundation/module.map
 popd &>/dev/null;
@@ -82,7 +82,7 @@ sudo apt-get install httpie
 
 echo "Installing dependencies required for tests in codegens/dart"
 pushd ./codegens/dart-http &>/dev/null;
-  wget https://storage.googleapis.com/dart-archive/channels/stable/release/2.10.2/linux_packages/dart_2.10.2-1_amd64.deb
+  wget -q https://storage.googleapis.com/dart-archive/channels/stable/release/2.10.2/linux_packages/dart_2.10.2-1_amd64.deb
   sudo dpkg -i dart_2.10.2-1_amd64.deb
   echo '''name: test
 dependencies:
@@ -100,7 +100,7 @@ echo "Installing dependencies required for tests in codegens/php-guzzle"
 
 echo "Installing dependencies required for tests in codegens/r-rCurl and r-httr Installing R"
   sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
-  sudo add-apt-repository 'deb [arch=amd64,i386] https://cran.rstudio.com/bin/linux/ubuntu xenial-cran40/'
+  sudo add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/'
   sudo apt-get update
   sudo apt-get install r-base
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "postman-code-generators",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Generates code snippets for a postman collection",
   "main": "index.js",
   "directories": {

package.json

@@ -0,0 +1,39 @@
+{
+	"info": {
+		"_postman_id": "f52ee07d-6345-4220-89af-e6696b3c0122",
+		"name": "Basic Collection",
+		"description": "This collection contains requests that will be used to test validity of plugin created to convert postman request into code snippet of particular language.",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "POST raw with quoted text",
+			"event": [],
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Content-Type",
+						"value": "application/json"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n    \"Hello\": \"{\\\"hello_world\\\": true}\"\n}"
+				},
+				"url": {
+					"raw": "https://postman-echo.com/post",
+					"protocol": "https",
+					"host": [
+						"postman-echo",
+						"com"
+					],
+					"path": [
+						"post"
+					]
+				}
+			},
+			"response": []
+		}
+  ]
+}