Fix edge case having a value with numeric start and also a prefix (#242)

* Update action.yml

* Fix edge case having a value with numeric start and also a prefix

* Revert "Update action.yml"

This reverts commit dc17d6a.

* Fix edge case having a value with numeric start and also a prefix

* Update utils.test.ts

Updated 1Password with 7Value to make it a unique test case.

* Fix and test at injectSecret level

* Add a new unit test case with valid tempEnvName

---------

Co-authored-by: Simon Marty <[email protected]>
Co-authored-by: Geethik Rachaputi <[email protected]>

Author: 3 people

__tests__/utils.test.ts

@@ -325,6 +325,41 @@ describe('Test secret parsing and handling', () => {
         expect(core.exportVariable).toHaveBeenCalledWith('TEST_SECRET_CONFIG_OPTIONS_C', '100');
     });
 
+    test('Maintains single underscore between prefix and numeric properties', () => {
+        const secretName = 'DB';
+        const secretValue = JSON.stringify({
+            "7Value": "test-value"
+        });
+        
+        const secretsToCleanup = injectSecret(
+            secretName,
+            secretValue,
+            true,  
+            undefined
+        );
+    
+        expect(secretsToCleanup).toHaveLength(1);
+        expect(secretsToCleanup[0]).toBe('DB_7VALUE');
+    });
+
+    test('Maintains single underscore between prefix and numeric properties with a EnvName', () => {
+        const secretName = 'DB';
+        const secretValue = JSON.stringify({
+            "7Value": "test-value"
+        });
+
+        const secretsToCleanup = injectSecret(
+            secretName,
+            secretValue,
+            true,  
+            undefined,
+            TEST_ENV_NAME  
+        );
+    
+        expect(secretsToCleanup).toHaveLength(1);
+        expect(secretsToCleanup[0]).toBe('TEST_SECRET_7VALUE');
+    });
+
     /* 
     * Test: parseAliasFromId()
     */
@@ -369,6 +404,7 @@ describe('Test secret parsing and handling', () => {
         expect(transformToValidEnvName('0Admin')).toBe('_0ADMIN')
     });
 
+
     test('Transformation function is applied', () => {
         expect(transformToValidEnvName('secret3', (x) => x.toUpperCase())).toBe('SECRET3')
     });
@@ -418,4 +454,4 @@ describe('Test secret parsing and handling', () => {
     test.each([ 'something', '' ])('NameTransformation parsing of string %s should fail.', (input) => {
         expect(() => parseTransformationFunction(input)).toThrow();
     });
-});
+});

src/utils.ts

@@ -149,8 +149,8 @@ export function injectSecret(
 
             // Append the current key to the name of the env variable and check to avoid prepending an underscore
             const newEnvName = [
-                tempEnvName || transformToValidEnvName(secretName, nameTransformation),
-                transformToValidEnvName(k, nameTransformation)
+                tempEnvName || transformToValidEnvName(secretName, nameTransformation, false),
+                transformToValidEnvName(k, nameTransformation, true)
             ]
             .filter(elem => elem) // Uses truthy-ness of elem to determine if it remains
             .join("_"); // Join the remaining elements with an underscore
@@ -195,9 +195,9 @@ export function isJSONString(secretValue: string): boolean {
  * Transforms the secret name into a valid environmental variable name
  * It should consist of only upper case letters, digits, and underscores and cannot begin with a number
  */
-export function transformToValidEnvName(secretName: string, nameTransformation?: TransformationFunc): string {
+export function transformToValidEnvName(secretName: string, nameTransformation?: TransformationFunc, hasPrefix : boolean = false): string {
     // Leading digits are invalid
-    if (secretName.match(/^[0-9]/)){
+    if (!hasPrefix && secretName.match(/^[0-9]/)) {
         secretName = '_'.concat(secretName);
     }