diff --git a/packages/bruno-converters/src/constants/index.js b/packages/bruno-converters/src/constants/index.js new file mode 100644 index 000000000..723a09fea --- /dev/null +++ b/packages/bruno-converters/src/constants/index.js @@ -0,0 +1,3 @@ +import { invalidVariableCharacterRegex } from './regex'; + +export { invalidVariableCharacterRegex }; diff --git a/packages/bruno-converters/src/constants/regex.js b/packages/bruno-converters/src/constants/regex.js new file mode 100644 index 000000000..989dbc1c3 --- /dev/null +++ b/packages/bruno-converters/src/constants/regex.js @@ -0,0 +1 @@ +export const invalidVariableCharacterRegex = /[^\w-.]/g; \ No newline at end of file diff --git a/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js b/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js index c61c98d71..52d60b08b 100644 --- a/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js +++ b/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js @@ -1,4 +1,7 @@ import each from 'lodash/each'; +import { invalidVariableCharacterRegex } from '../constants'; +import { uuid } from '../common'; + const isSecret = (type) => { return type === 'secret'; }; @@ -8,7 +11,8 @@ const importPostmanEnvironmentVariables = (brunoEnvironment, values) => { each(values, (i) => { const brunoEnvironmentVariable = { - name: i.key, + uid: uuid(), + name: i.key.replace(invalidVariableCharacterRegex, '_'), value: i.value, enabled: i.enabled, secret: isSecret(i.type) diff --git a/packages/bruno-converters/src/postman/postman-to-bruno.js b/packages/bruno-converters/src/postman/postman-to-bruno.js index c14e12172..8ae8e195e 100644 --- a/packages/bruno-converters/src/postman/postman-to-bruno.js +++ b/packages/bruno-converters/src/postman/postman-to-bruno.js @@ -2,6 +2,7 @@ import get from 'lodash/get'; import { validateSchema, transformItemsInCollection, hydrateSeqInCollection, uuid } from '../common'; import each from 'lodash/each'; import postmanTranslation from './postman-translations'; +import { invalidVariableCharacterRegex } from '../constants/index'; const parseGraphQLRequest = (graphqlSource) => { try { @@ -120,7 +121,7 @@ const importScriptsFromEvents = (events, requestObject) => { const importCollectionLevelVariables = (variables, requestObject) => { const vars = variables.map((v) => ({ uid: uuid(), - name: v.key, + name: v.key.replace(invalidVariableCharacterRegex, '_'), value: v.value, enabled: true }));