diff --git a/README.md b/README.md index 71d51e4..6066fc5 100644 --- a/README.md +++ b/README.md @@ -58,12 +58,12 @@ The `operation` input expects one of the following: ### Optional Inputs -`username`, `password`, `url`, `classpath`, `changeLogFile`, `count`, `tag`, `date`, `referenceUrl`, `proLicenseKey` and `hubApiKey` are optional inputs that may be required by some operations. +`username`, `password`, `url`, `classpath`, `changeLogFile`, `count`, `tag`, `date`, `referenceUrl`, `proLicenseKey` (deprecated in favor of `licenseKey`) and `hubApiKey` are optional inputs that may be required by some operations. -It is recommended that `proLicenseKey` and `hubApiKey` are not stored in plaintext, but rather using a [GitHub secret](https://docs.github.com/en/actions/security-guides/encrypted-secrets): +It is recommended that `licenseKey` and `hubApiKey` are not stored in plaintext, but rather using a [GitHub secret](https://docs.github.com/en/actions/security-guides/encrypted-secrets): ```yaml - proLicenseKey: ${{ secrets.PRO_LICENSE_KEY }} + licenseKey: ${{ secrets.PRO_LICENSE_KEY }} ``` The following operations have the subsequent required inputs: diff --git a/action.yml b/action.yml index 83a2b19..2b18545 100644 --- a/action.yml +++ b/action.yml @@ -36,11 +36,14 @@ inputs: description: 'Configuration file for checks execution' required: false proLicenseKey: # string - description: 'Liquibase Pro license key used to unlock paid capabilities' + description: 'DEPRECATED: Liquibase Pro license key used to unlock paid capabilities' required: false hubApiKey: # string description: 'Liquibase Hub API key for operations' required: false + licenseKey: # string + description: 'Liquibase license key used to unlock paid capabilities' + required: false databaseChangeLogTableName: # string description: 'Specifies the Liquibase changelog table' required: false @@ -64,6 +67,7 @@ runs: - ${{ inputs.checksSettingsFile }} - ${{ inputs.proLicenseKey }} - ${{ inputs.hubApiKey }} + - ${{ inputs.licenseKey }} - ${{ inputs.databaseChangeLogTableName }} - ${{ inputs.databaseChangeLogLockTableName }} branding: diff --git a/entry.sh b/entry.sh index 8c3ff87..ebed812 100755 --- a/entry.sh +++ b/entry.sh @@ -13,8 +13,9 @@ REFERENCEURL=${10} CHECKSSETTINGSFILE=${11} PROLICENSEKEY=${12} HUBAPIKEY=${13} -DATABASECHANGELOGTABLENAME=${14} -DATABASECHANGELOGLOCKTABLENAME=${15} +LICENSEKEY=${14} +DATABASECHANGELOGTABLENAME=${15} +DATABASECHANGELOGLOCKTABLENAME=${16} PARAMS=() VALUES=() @@ -205,6 +206,7 @@ function validate_operation() { check_optional_param "$OPERATION" proLicenseKey $PROLICENSEKEY check_optional_param "$OPERATION" hubApiKey $HUBAPIKEY +check_optional_param "$OPERATION" licenseKey $LICENSEKEY validate_operation docker-entrypoint.sh "${PARAMS[@]}" $OPERATION "${VALUES[@]}" "${SECONDPARAMS[@]}"