Commit 118360fa authored by Girija Saint-Ange's avatar Girija Saint-Ange
Browse files

Merge branch '99-missing-r-in-tf_infracost_-variable' into 'master' 

Resolve "Missing 'r' in TF_INFRACOST_* variable"

Closes #99

See merge request to-be-continuous/terraform!145
parents 248b36c7 48fd1f70

README.md

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ resource "aws_s3_bucket" "foo-bucket" { 
| `infracost-enabled` / `TF_INFRACOST_ENABLED` | Set to `true` to enable infracost       | _none_ (disabled)     |

| `infracost-image` / `TF_INFRACOST_IMAGE` | the infracost container image | `registry.hub.docker.com/infracost/infracost` <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-TF_INFRACOST_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-TF_INFRACOST_IMAGE) |

| `infracost-args` / `TF_INFRACOST_ARGS` | infracost [CLI options and args](https://www.infracost.io/docs/#usage) | `breakdown`           |

| `infacost-usage-file` / `TF_INFACOST_USAGE_FILE` | infracost [usage file](https://www.infracost.io/docs/usage_based_resources/#infracost-usage-file) | `infracost-usage.yml` |

| `infracost-usage-file` / `TF_INFRACOST_USAGE_FILE` | infracost [usage file](https://www.infracost.io/docs/usage_based_resources/#infracost-usage-file) | `infracost-usage.yml` |

| :lock: `INFRACOST_API_KEY`| the infracost API key | **required** |



To use infracost, an api key is needed.

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
          "default": "breakdown"

        },

        {

          "name": "TF_INFACOST_USAGE_FILE",

          "name": "TF_INFRACOST_USAGE_FILE",

          "description": "infracost [usage file](https://www.infracost.io/docs/usage_based_resources/#infracost-usage-file)",

          "default": "infracost-usage.yml"

        },

templates/gitlab-ci-terraform.yml

+4 −4
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ spec: 
    infracost-args:

      description: infracost [CLI options and args](https://www.infracost.io/docs/#usage)

      default: breakdown

    infacost-usage-file:

    infracost-usage-file:

      description: infracost [usage file](https://www.infracost.io/docs/usage_based_resources/#infracost-usage-file)

      default: infracost-usage.yml

    tflint-disabled:
@@ -326,7 +326,7 @@ variables: 
  TF_CHECKOV_ARGS: $[[ inputs.checkov-args ]]

  TF_INFRACOST_IMAGE: $[[ inputs.infracost-image ]]

  TF_INFRACOST_ARGS: $[[ inputs.infracost-args ]]

  TF_INFACOST_USAGE_FILE: $[[ inputs.infacost-usage-file ]]

  TF_INFRACOST_USAGE_FILE: $[[ inputs.infracost-usage-file ]]

  TF_FMT_ARGS: $[[ inputs.fmt-args ]]

  # tf-docs job config

  TF_DOCS_IMAGE: $[[ inputs.docs-image ]]
@@ -965,8 +965,8 @@ stages: 
    # shellcheck disable=SC2154

    log_info "--- \\e[32minfracost\\e[0m"



    if [[ "${TF_INFACOST_USAGE_FILE}" ]];then

      tf_usagefile="--sync-usage-file --usage-file ${TF_INFACOST_USAGE_FILE}"

    if [[ "${TF_INFRACOST_USAGE_FILE}" ]];then

      tf_usagefile="--sync-usage-file --usage-file ${TF_INFRACOST_USAGE_FILE}"

    fi

    # shellcheck disable=SC2086

    infracost ${TF_INFRACOST_ARGS} ${tf_usagefile} --path .