Skip to content

make rbac check non-optional #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2023
Merged

make rbac check non-optional #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/digger/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down