diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 490d1746..946446d3 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -48,8 +48,8 @@ jobs: id: provision with: project-path: "${{ steps.edb-terraform.outputs.project-path }}" - force_dynamic_ip: "true" - force_service_machines: "true" + force-dynamic-ip: "true" + force-service-machines: "true" backend-configs: '["bucket=${{ env.AWS_BUCKET }}","key=${{ env.WORKFLOW_ID_PATHS }}","region=${{ env.AWS_BUCKET_REGION }}"]' artifact-id: "-${{ env.WORKFLOW_ID_DASHES }}" continue-on-error: true diff --git a/actions/apply/action.yml b/actions/apply/action.yml index 85147e25..3287927b 100644 --- a/actions/apply/action.yml +++ b/actions/apply/action.yml @@ -22,39 +22,39 @@ inputs: description: 'List of backend configuration options for terraform init. Expects a series of key-value pairs or a single file when remote state is not `local`. Make sure to mask sensitive values.' required: false default: '[]' - force_service_machines: + force-service-machines: description: 'Append an ssh port rule for all machines' required: false default: 'true' - force_service_biganimal: + force-service-biganimal: description: 'Append service cidr blocks to BigAnimals allow list' required: false default: 'true' - service_cidrblocks: + service-cidrblocks: description: 'Service CIDR blocks which will be applied when defaults=service under a port configuration' required: false default: '[]' - force_dynamic_ip: + force-dynamic-ip: description: 'Append the controllers ip to the service cidr blocks.' required: false default: 'true' - mask_secrets: + mask-secrets: description: 'Mask secrets from terraform output' required: false default: 'true' - create_artifact: + create-artifact: description: 'Create artifact for plan file' required: false default: 'true' - artifact_name: + artifact-name: description: 'Artifact name. When artifact_overwrite is false, append unique identifiers such as the run-id and run-attempt to the artifact name.' required: false default: 'terraform-plan' - artifact_id: + artifact-id: description: 'Artifact id' required: false default: '' - artifact_overwrite: + artifact-overwrite: description: 'Overwrite existing artifact. When false, artifact_name needs to be unique for each run starting actions/upload-artifact@v4' required: false default: 'false' @@ -125,10 +125,10 @@ runs: shell: bash env: PLAN_FILENAME: ${{ inputs.plan-filename }} - FORCE_SERVICE_MACHINES: ${{ inputs.force_service_machines }} - FORCE_SERVICE_BIGANIMAL: ${{ inputs.force_service_biganimal }} - SERVICE_CIDRBLOCKS: ${{ inputs.service_cidrblocks }} - FORCE_DYNAMIC_IP: ${{ inputs.force_dynamic_ip }} + FORCE_SERVICE_MACHINES: ${{ inputs.force-service-machines }} + FORCE_SERVICE_BIGANIMAL: ${{ inputs.force-service-biganimal }} + SERVICE_CIDRBLOCKS: ${{ inputs.service-cidrblocks }} + FORCE_DYNAMIC_IP: ${{ inputs.force-dynamic-ip }} run: | terraform plan -input=false \ -out="$PLAN_FILENAME" \ @@ -138,12 +138,12 @@ runs: -var "force_dynamic_ip=$FORCE_DYNAMIC_IP" - name: Upload plan artifact - if: ${{ inputs.create_artifact == true || inputs.create_artifact == 'true' }} + if: ${{ inputs.create-artifact == true || inputs.create-artifact == 'true' }} uses: actions/upload-artifact@v4 with: - name: ${{ inputs.artifact_name }}${{ inputs.artifact_id }} + name: ${{ inputs.artifact-name }}${{ inputs.artifact-id }} path: ${{ inputs.work-directory }}/${{ inputs.project-path }}/${{ inputs.plan-filename }} - overwrite: ${{ inputs.artifact_overwrite }} + overwrite: ${{ inputs.artifact-overwrite }} - name: Terraform apply working-directory: ${{ inputs.project-path }} @@ -158,7 +158,7 @@ runs: - name: Mask secrets working-directory: ${{ inputs.project-path }} shell: bash - if: ${{ inputs.mask_secrets == true || inputs.mask_secrets == 'true' }} + if: ${{ inputs.mask-secrets == true || inputs.mask-secrets == 'true' }} run: | MASK_PREFIX="::add-mask::" SECRET_KEYS='["password","public_ip","public_dns"]' diff --git a/actions/destroy/action.yml b/actions/destroy/action.yml index 2679fce0..3286179e 100644 --- a/actions/destroy/action.yml +++ b/actions/destroy/action.yml @@ -10,7 +10,6 @@ runs: using: "composite" steps: - name: Check dependencies - working-directory: ${{ inputs.repo-directory }} shell: bash run: | programs=("terraform") diff --git a/actions/generate/action.yml b/actions/generate/action.yml index 4da0708f..6367785f 100644 --- a/actions/generate/action.yml +++ b/actions/generate/action.yml @@ -29,19 +29,19 @@ inputs: description: 'Post terraform templates' required: false default: '/dev/null' - create_artifact: + create-artifact: description: 'Create artifacts' required: false default: 'true' - artifact_name: + artifact-name: description: 'Artifact name. When artifact_overwrite is false, append unique identifiers such as the run-id and run-attempt to the artifact name.' required: false default: 'terraform-project' - artifact_id: + artifact-id: description: 'Artifact id' required: false default: '' - artifact_overwrite: + artifact-overwrite: description: 'Overwrite existing artifact. When false, artifact_name needs to be unique for each run starting actions/upload-artifact@v4' required: false default: 'false' @@ -53,7 +53,6 @@ runs: using: "composite" steps: - name: Check dependencies - working-directory: ${{ inputs.repo-directory }} shell: bash run: | programs=("edb-terraform") @@ -68,7 +67,7 @@ runs: done - name: Generate terraform files - working-directory: ${{ inputs.repo-directory }} + working-directory: ${{ inputs.work-directory }} shell: bash env: CLOUD_SERVICE_PROVIDER: ${{ inputs.cloud-service-provider }} @@ -89,9 +88,9 @@ runs: --user-templates "$USER_TEMPLATES" - name: Upload artifacts - if: ${{ inputs.create_artifact == true || inputs.create_artifact == 'true' }} + if: ${{ inputs.create-artifact == true || inputs.create-artifact == 'true' }} uses: actions/upload-artifact@v4 with: - name: ${{ inputs.artifact_name }}${{ inputs.artifact_id }} + name: ${{ inputs.artifact-name }}${{ inputs.artifact-id }} path: ${{ inputs.work-directory }}/${{ inputs.project-name }} - overwrite: ${{ inputs.artifact_overwrite }} + overwrite: ${{ inputs.artifact-overwrite }}