From 5101185ef541c782c6b8ce2be6bcd05e21e1aef6 Mon Sep 17 00:00:00 2001 From: Borales Date: Sun, 30 Dec 2018 11:37:25 +0100 Subject: [PATCH 1/5] fix: using printf cmd properly --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index f5c53ff..8ad3c0c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,7 +8,7 @@ if [ -n "$NPM_AUTH_TOKEN" ]; then NPM_REGISTRY_URL="${NPM_REGISTRY_URL-registry.npmjs.org}" # Allow registry.npmjs.org to be overridden with an environment variable - printf "//$NPM_REGISTRY_URL/:_authToken=$NPM_AUTH_TOKEN\nregistry=$NPM_REGISTRY_URL" > "$NPM_CONFIG_USERCONFIG" + printf "//%s/:_authToken=%s\nregistry=%s" "$NPM_REGISTRY_URL" "$NPM_AUTH_TOKEN" "$NPM_REGISTRY_URL" > "$NPM_CONFIG_USERCONFIG" chmod 0600 "$NPM_CONFIG_USERCONFIG" fi From aa32f018dc7911f8f23815f77a3a523cf9cf99c2 Mon Sep 17 00:00:00 2001 From: Borales Date: Sun, 30 Dec 2018 11:48:16 +0100 Subject: [PATCH 2/5] fix: Fixing bats tests --- test/entrypoint.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/entrypoint.bats b/test/entrypoint.bats index 319c8a7..77da0f2 100644 --- a/test/entrypoint.bats +++ b/test/entrypoint.bats @@ -18,7 +18,7 @@ function setup() { export NPM_AUTH_TOKEN=NPM_AUTH_TOKEN run $GITHUB_WORKSPACE/entrypoint.sh help [ "$status" -eq 0 ] - [ "$(cat $NPM_CONFIG_USERCONFIG)" = "//registry.npmjs.org/:_authToken=NPM_AUTH_TOKEN" ] + [ "$(cat $NPM_CONFIG_USERCONFIG)" = "//registry.npmjs.org/:_authToken=NPM_AUTH_TOKEN\nnregistry=registry.npmjs.org" ] } @test "registry can be overridden" { @@ -27,5 +27,5 @@ function setup() { export NPM_AUTH_TOKEN=NPM_AUTH_TOKEN run $GITHUB_WORKSPACE/entrypoint.sh help [ "$status" -eq 0 ] - [ "$(cat $NPM_CONFIG_USERCONFIG)" = "//someOtherRegistry.someDomain.net/:_authToken=NPM_AUTH_TOKEN" ] + [ "$(cat $NPM_CONFIG_USERCONFIG)" = "//someOtherRegistry.someDomain.net/:_authToken=NPM_AUTH_TOKEN\nnregistry=someOtherRegistry.someDomain.net" ] } From 6285b5daf8c373104f69c2bcb390f6daef9f2a03 Mon Sep 17 00:00:00 2001 From: Borales Date: Sun, 30 Dec 2018 12:56:32 +0100 Subject: [PATCH 3/5] fix: test --- test/entrypoint.bats | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/entrypoint.bats b/test/entrypoint.bats index 77da0f2..76e3f72 100644 --- a/test/entrypoint.bats +++ b/test/entrypoint.bats @@ -16,16 +16,24 @@ function setup() { @test "npmrc location can be overridden" { export NPM_CONFIG_USERCONFIG=$( mktemp ) export NPM_AUTH_TOKEN=NPM_AUTH_TOKEN + read -r -d '' TEST_STRING << EOM +//registry.npmjs.org/:_authToken=NPM_AUTH_TOKEN +registry=registry.npmjs.org +EOM run $GITHUB_WORKSPACE/entrypoint.sh help [ "$status" -eq 0 ] - [ "$(cat $NPM_CONFIG_USERCONFIG)" = "//registry.npmjs.org/:_authToken=NPM_AUTH_TOKEN\nnregistry=registry.npmjs.org" ] + [ "$(cat $NPM_CONFIG_USERCONFIG)" = $TEST_STRING ] } @test "registry can be overridden" { export NPM_CONFIG_USERCONFIG=$( mktemp ) export NPM_REGISTRY_URL=someOtherRegistry.someDomain.net export NPM_AUTH_TOKEN=NPM_AUTH_TOKEN + read -r -d '' TEST_STRING << EOM +//someOtherRegistry.someDomain.net/:_authToken=NPM_AUTH_TOKEN +registry=someOtherRegistry.someDomain.net +EOM run $GITHUB_WORKSPACE/entrypoint.sh help [ "$status" -eq 0 ] - [ "$(cat $NPM_CONFIG_USERCONFIG)" = "//someOtherRegistry.someDomain.net/:_authToken=NPM_AUTH_TOKEN\nnregistry=someOtherRegistry.someDomain.net" ] + [ "$(cat $NPM_CONFIG_USERCONFIG)" = $TEST_STRING ] } From 2941c07ea7af0e07e1f8870374363adc14b19558 Mon Sep 17 00:00:00 2001 From: Borales Date: Sun, 30 Dec 2018 13:14:06 +0100 Subject: [PATCH 4/5] fix: tests --- test/entrypoint.bats | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/entrypoint.bats b/test/entrypoint.bats index 76e3f72..38cb2e4 100644 --- a/test/entrypoint.bats +++ b/test/entrypoint.bats @@ -16,24 +16,16 @@ function setup() { @test "npmrc location can be overridden" { export NPM_CONFIG_USERCONFIG=$( mktemp ) export NPM_AUTH_TOKEN=NPM_AUTH_TOKEN - read -r -d '' TEST_STRING << EOM -//registry.npmjs.org/:_authToken=NPM_AUTH_TOKEN -registry=registry.npmjs.org -EOM run $GITHUB_WORKSPACE/entrypoint.sh help [ "$status" -eq 0 ] - [ "$(cat $NPM_CONFIG_USERCONFIG)" = $TEST_STRING ] + [ "$(cat $NPM_CONFIG_USERCONFIG)" = $'//registry.npmjs.org/:_authToken=NPM_AUTH_TOKEN\nregistry=registry.npmjs.org' ] } @test "registry can be overridden" { export NPM_CONFIG_USERCONFIG=$( mktemp ) export NPM_REGISTRY_URL=someOtherRegistry.someDomain.net export NPM_AUTH_TOKEN=NPM_AUTH_TOKEN - read -r -d '' TEST_STRING << EOM -//someOtherRegistry.someDomain.net/:_authToken=NPM_AUTH_TOKEN -registry=someOtherRegistry.someDomain.net -EOM run $GITHUB_WORKSPACE/entrypoint.sh help [ "$status" -eq 0 ] - [ "$(cat $NPM_CONFIG_USERCONFIG)" = $TEST_STRING ] + [ "$(cat $NPM_CONFIG_USERCONFIG)" = $'//someOtherRegistry.someDomain.net/:_authToken=NPM_AUTH_TOKEN\nregistry=someOtherRegistry.someDomain.net' ] } From 8176e4b21886860731897a26443e34d59db3484f Mon Sep 17 00:00:00 2001 From: Borales Date: Sun, 30 Dec 2018 13:17:00 +0100 Subject: [PATCH 5/5] fix: lint warnings --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 8ad3c0c..bbc5f70 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,7 +8,7 @@ if [ -n "$NPM_AUTH_TOKEN" ]; then NPM_REGISTRY_URL="${NPM_REGISTRY_URL-registry.npmjs.org}" # Allow registry.npmjs.org to be overridden with an environment variable - printf "//%s/:_authToken=%s\nregistry=%s" "$NPM_REGISTRY_URL" "$NPM_AUTH_TOKEN" "$NPM_REGISTRY_URL" > "$NPM_CONFIG_USERCONFIG" + printf "//%s/:_authToken=%s\\nregistry=%s" "$NPM_REGISTRY_URL" "$NPM_AUTH_TOKEN" "$NPM_REGISTRY_URL" > "$NPM_CONFIG_USERCONFIG" chmod 0600 "$NPM_CONFIG_USERCONFIG" fi