Merge pull request #1 from dcarbone/dcarbone/updates

updates:
dcarbone · Oct 12, 2022 · c3ce8be · c3ce8be
2 parents 5ba9b68 + 24ff35b
commit c3ce8be
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -106,6 +106,18 @@ jobs:
           yep
           '
             '${{ env.STRING_MULTILINE_WITH_EQUALS }}'
+          
+            'HYPHENATED_KEY'
+            "hi there."
+            '${{ env.HYPHENATED_KEY }}'
+          
+            'SECOND_HYPHENATED_KEY'
+            'hi there.'
+            '${{ env.SECOND_HYPHENATED_KEY }}'
+          
+            'KEY_WITH__WEIRD___'
+            'what have you got.'
+            '${{ env.KEY_WITH__WEIRD___ }}'
           )
           
           for (( i=0; i < "${#_EXPECTED_ENVS[@]}"; i+=3 )); do

diff --git a/README.md b/README.md
@@ -54,6 +54,16 @@ jobs:
 
 ## Conversion Rules
 
+### Names
+
+Key to env name happens using the following script:
+
+```shell
+tr '[:lower:]' '[:upper:]' | sed -E 's/[^a-zA-Z0-9_]/_/g';
+```
+
+You can see the exact logic [here](./action.yaml#L64)
+
 #### Simple
 
 Source YAML:

diff --git a/action.yaml b/action.yaml
@@ -41,9 +41,9 @@ runs:
       run: |
         _yq_bin="$(which yq)"
         if [ -f "${_yq_bin}" ]; then
-          echo "::set-output name=found::true"
+          echo "found=true" >> $GITHUB_OUTPUT
         else
-          echo "::set-output name=found::false"
+          echo "found=false" >> $GITHUB_OUTPUT
         fi
 
     - name: 'Install yq (${{ inputs.yq-version }})'
@@ -61,7 +61,7 @@ runs:
         function _ltrim_one { printf '%s' "${1}" | sed 's/^[[:blank:]]//'; }
         function _rtrim_one { printf '%s' "${1}" | sed 's/[[:blank:]]$//'; }
         function _upper() { printf '%s' "${1}" | tr '[:lower:]' '[:upper:]'; }
-        function _env_name() {  _upper "${1}" | tr '.' '_'; }
+        function _env_name() {  _upper "${1}" | sed -E 's/[^a-zA-Z0-9_]/_/g'; }
         
         _write_env_file_line() {
           _debug_log "${1} >> $GITHUB_ENV"

diff --git a/test-action.sh b/test-action.sh
@@ -8,7 +8,7 @@ function _trim() { printf '%s' "${1}" | sed 's/^[[:blank:]]*//; s/[[:blank:]]*$/
 function _ltrim_one { printf '%s' "${1}" | sed 's/^[[:blank:]]//'; }
 function _rtrim_one { printf '%s' "${1}" | sed 's/[[:blank:]]$//'; }
 function _upper() { printf '%s' "${1}" | tr '[:lower:]' '[:upper:]'; }
-function _env_name() {  _upper "${1}" | tr '.' '_'; }
+function _env_name() {  _upper "${1}" | sed -E 's/[^a-zA-Z0-9_]/_/g'; }
 
 _write_env_file_line() {
   _debug_log "${1} >> $GITHUB_ENV"
@@ -79,5 +79,5 @@ _parse_yq_output() {
 }
 
 _debug_log "Writing to \"$GITHUB_ENV\":"
-_all_fields="$(yq -o p '.' "$(pwd)/test.inputs.yaml")"
+_all_fields="$(yq -o p '.' "$(pwd)/test-values.yaml")"
 _parse_yq_output "${_all_fields}"
diff --git a/test-values.yaml b/test-values.yaml
@@ -36,3 +36,9 @@ string_multiline_with_equals: |
   value
   =
   yep
+
+hyphenated-key: hi there.
+
+second-hyphenated-key: hi there.
+
+'KEY$with weird*$!': what have you got.