diff --git a/action.yml b/action.yml index df46e0224..2f31c88e1 100644 --- a/action.yml +++ b/action.yml @@ -71,15 +71,11 @@ inputs: description: Disable locking required: false default: 'false' - policy-check-enabled: - description: Enable policy check + digger-token: + description: Digger token required: false - default: 'false' - digger-cloud-token: - description: Digger cloud token - required: false - digger-cloud-hostname: - description: Digger cloud hostname + digger-hostname: + description: Digger hostname required: false default: 'https://cloud.digger.dev' setup-tfenv: @@ -187,9 +183,8 @@ runs: PLAN_UPLOAD_DESTINATION: ${{ inputs.upload-plan-destination }} ACTIVATE_VENV: ${{ inputs.setup-checkov == 'true' }} DISABLE_LOCKING: ${{ inputs.disable-locking == 'true' }} - POLICY_CHECK_ENABLED: ${{ inputs.policy-check-enabled == 'true' }} - DIGGER_CLOUD_TOKEN: ${{ inputs.digger-cloud-token }} - DIGGER_CLOUD_HOSTNAME: ${{ inputs.digger-cloud-hostname }} + DIGGER_TOKEN: ${{ inputs.digger-token }} + DIGGER_HOSTNAME: ${{ inputs.digger-hostname }} ACCUMULATE_PLANS: ${{ inputs.post-plans-as-one-comment == 'true' }} run: | cd ${{ github.action_path }} @@ -205,9 +200,8 @@ runs: PLAN_UPLOAD_DESTINATION: ${{ inputs.upload-plan-destination }} ACTIVATE_VENV: ${{ inputs.setup-checkov == 'true' }} DISABLE_LOCKING: ${{ inputs.disable-locking == 'true' }} - POLICY_CHECK_ENABLED: ${{ inputs.policy-check-enabled == 'true' }} - DIGGER_CLOUD_TOKEN: ${{ inputs.digger-cloud-token }} - DIGGER_CLOUD_HOSTNAME: ${{ inputs.digger-cloud-hostname }} + DIGGER_TOKEN: ${{ inputs.digger-token }} + DIGGER_HOSTNAME: ${{ inputs.digger-hostname }} ACCUMULATE_PLANS: ${{ inputs.post-plans-as-one-comment == 'true' }} id: digger shell: bash diff --git a/cmd/digger/main.go b/cmd/digger/main.go index 85918c203..6fc2a400a 100644 --- a/cmd/digger/main.go +++ b/cmd/digger/main.go @@ -322,11 +322,11 @@ func main() { os.Exit(0) } var policyChecker core_policy.Checker - if os.Getenv("POLICY_CHECK_ENABLED") == "true" { + if os.Getenv("DIGGER_TOKEN") != "" { policyChecker = policy.DiggerPolicyChecker{ PolicyProvider: &policy.DiggerHttpPolicyProvider{ - DiggerHost: os.Getenv("DIGGER_CLOUD_HOSTNAME"), - AuthToken: os.Getenv("DIGGER_CLOUD_TOKEN"), + DiggerHost: os.Getenv("DIGGER_HOSTNAME"), + AuthToken: os.Getenv("DIGGER_TOKEN"), HttpClient: http.DefaultClient, }} } else {