Merge branch 'master' into go-1.15

Author: aliscott

.github/workflows/go.yml

@@ -26,6 +26,17 @@ jobs:
       run: |
         go get -v -t -d ./...
 
+    - name: Check out terraform-provider-infracost@master
+      uses: actions/checkout@v2
+      with:
+        repository: infracost/terraform-provider-infracost
+        ref: refs/heads/master
+        path: terraform-provider-infracost
+
+    - name: Install terraform-provider-infracost
+      run: sudo make install
+      working-directory: terraform-provider-infracost
+
     - name: Run golangci-lint
       uses: golangci/[email protected]
       with:

Dockerfile

@@ -2,22 +2,25 @@ FROM golang:1.15 as builder
 
 ARG ARCH=linux
 ARG TERRAFORM_VERSION=0.12.25
+ARG TERRAFORM_PROVIDER_INFRACOST_VERSION=latest
 
 # Set Environment Variables
 SHELL ["/bin/bash", "-c"]
 ENV HOME /app
 ENV CGO_ENABLED 0
-ENV GOOS linux
 
 # Install Packages
 RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${ARCH}_amd64.zip
-RUN apt-get update && apt-get -y install zip -y
+RUN apt-get update && apt-get -y install zip jq -y
 RUN unzip terraform*.zip && \
     mv terraform /usr/local/bin && \
     chmod +x /usr/local/bin/terraform
 
-# Build Application
 WORKDIR /app
+COPY scripts/install_provider.sh scripts/install_provider.sh
+RUN scripts/install_provider.sh ${TERRAFORM_PROVIDER_INFRACOST_VERSION} /usr/local/bin/
+
+# Build Application
 COPY . .
 RUN make deps
 RUN make build
@@ -27,8 +30,8 @@ FROM alpine:3.12 as app
 ARG TERRAFORM_VERSION=0.12.25
 RUN apk --no-cache add ca-certificates terraform=${TERRAFORM_VERSION}-r0
 WORKDIR /root/
+COPY --from=builder /usr/local/bin/terraform-provider-infracost* /usr/bin/
 COPY --from=builder /app/build/infracost /usr/local/bin/infracost
 RUN chmod +x /usr/local/bin/infracost
-
 ENTRYPOINT [ "infracost" ]
 CMD [ "--help" ]

Makefile

@@ -1,7 +1,16 @@
 BINARY := infracost
 ENTRYPOINT := cmd/infracost/main.go
+TERRAFORM_PROVIDER_INFRACOST_VERSION := latest
 
-.PHONY: deps run build windows linux darwin build_all clean test fmt lint
+ifndef $(GOOS)
+	GOOS=$(shell go env GOOS)
+endif
+
+ifndef $(GOARCH)
+	GOARCH=$(shell go env GOARCH)
+endif
+
+.PHONY: deps run build windows linux darwin build_all release install_provider clean test fmt lint
 
 deps:
 	go mod download
@@ -28,10 +37,12 @@ release: build_all
 	cd build; tar -czf $(BINARY)-linux-amd64.tar.gz $(BINARY)-linux-amd64
 	cd build; tar -czf $(BINARY)-darwin-amd64.tar.gz $(BINARY)-darwin-amd64
 
+install_provider:
+	scripts/install_provider.sh $(TERRAFORM_PROVIDER_INFRACOST_VERSION)
+
 clean:
 	go clean
 	rm -rf build/$(BINARY)*
-	rm -rf release/$(BINARY)*
 
 test:
 	go test ./... $(or $(ARGS), -v -cover)

README.md

@@ -31,7 +31,7 @@ sudo mv /tmp/infracost-$(uname -s | tr '[:upper:]' '[:lower:]')-amd64 /usr/local
 
 Generate a cost breakdown from a Terraform directory:
 ```sh
-infracost --tfdir examples/small_terraform
+infracost --tfdir examples/terraform
 ```
 
 Check the [docs site](https://docs.infracost.io) for more details.
@@ -42,11 +42,16 @@ The [Infracost GitHub action](https://github.com/marketplace/actions/run-infraco
 
 ## Development
 
-Install dependencies:
+Install Go dependencies:
 ```sh
 make deps
 ```
 
+Install latest version of terraform-provider-infracost. If you want to use a local development version see [#using-a-local-version-of-terraform-provider-infracost](#using-a-local-version-of-terraform-provider-infracost)
+```sh
+make install_provider
+```
+
 Run the code:
 ```sh
 make run ARGS="--tfdir <Terraform Dir>"
@@ -67,6 +72,17 @@ Build:
 make build
 ```
 
+### Using a local version of terraform-provider-infracost
+
+To use a local development version of terraform-provider-infracost
+
+1. Fork/clone the [terraform-provider-infracost repository](https://github.com/infracost/terraform-provider-infracost)
+
+2. Inside the directory that you cloned the repository run the following to install the local version in your `~/.terraform.d/plugins` directory:
+  ```sh
+  make install
+  ```
+
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

cmd/infracost/main.go

@@ -3,12 +3,15 @@ package main
 import (
 	"fmt"
 	"os"
+	"time"
 
+	"infracost/internal/providers/terraform"
 	"infracost/pkg/config"
-	"infracost/pkg/costs"
 	"infracost/pkg/output"
-	"infracost/pkg/parsers/terraform"
+	"infracost/pkg/prices"
+	"infracost/pkg/schema"
 
+	"github.com/briandowns/spinner"
 	"github.com/fatih/color"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -41,16 +44,15 @@ func main() {
 				Usage:     "Path to the Terraform project directory",
 				TakesFile: true,
 			},
-			&cli.BoolFlag{
-				Name:    "verbose",
-				Aliases: []string{"v"},
-				Usage:   "Verbosity",
-				Value:   false,
+			&cli.StringFlag{
+				Name:  "log-level",
+				Usage: "Log level (TRACE, DEBUG, INFO, WARN, ERROR)",
+				Value: "WARN",
 			},
 			&cli.StringFlag{
 				Name:    "output",
 				Aliases: []string{"o"},
-				Usage:   "Output (json|table)",
+				Usage:   "Output (json, table)",
 				Value:   "table",
 			},
 			&cli.BoolFlag{
@@ -70,79 +72,70 @@ func main() {
 			return nil
 		},
 		Action: func(c *cli.Context) error {
-			var planJSON []byte
-
 			if c.Bool("no-color") {
 				config.Config.NoColor = true
 				formatter.DisableColors = true
 				color.NoColor = true
 			}
 
-			logLevel := log.InfoLevel
-			if c.Bool("verbose") {
-				logLevel = log.DebugLevel
+			if c.String("log-level") != "" {
+				switch c.String("log-level") {
+				case "TRACE":
+					log.SetLevel(log.TraceLevel)
+				case "DEBUG":
+					log.SetLevel(log.DebugLevel)
+				case "INFO":
+					log.SetLevel(log.InfoLevel)
+				case "WARN":
+					log.SetLevel(log.WarnLevel)
+				case "ERROR":
+					log.SetLevel(log.ErrorLevel)
+				}
 			}
-			log.SetLevel(logLevel)
 
 			if c.String("api-url") != "" {
 				config.Config.ApiUrl = c.String("api-url")
 			}
 
-			if c.String("tfjson") != "" && c.String("tfplan") != "" {
-				color.HiRed("Please only provide one of either a Terraform Plan JSON file (tfjson) or a Terraform Plan file (tfplan)")
-				_ = cli.ShowAppHelp(c)
-				os.Exit(1)
-			}
-
-			if c.String("tfplan") != "" && c.String("tfdir") == "" {
-				color.HiRed("Please provide a path to the Terrafrom project (tfdir) if providing a Terraform Plan file (tfplan)\n\n")
-				_ = cli.ShowAppHelp(c)
-				os.Exit(1)
-			}
-
-			if c.String("tfjson") == "" && c.String("tfdir") == "" {
-				color.HiRed("Please provide either the path to the Terrafrom project (tfdir) or a Terraform Plan JSON file (tfjson)")
+			provider := terraform.Provider()
+			err := provider.ProcessArgs(c)
+			if err != nil {
+				color.HiRed(err.Error())
 				_ = cli.ShowAppHelp(c)
 				os.Exit(1)
 			}
 
-			var err error
-			if c.String("tfjson") != "" {
-				planJSON, err = terraform.LoadPlanJSON(c.String("tfjson"))
-				if err != nil {
-					return err
-				}
-			} else {
-				planFile := c.String("tfplan")
-				planJSON, err = terraform.GeneratePlanJSON(c.String("tfdir"), planFile)
-				if err != nil {
-					return err
-				}
+			s := spinner.New(spinner.CharSets[14], 100*time.Millisecond, spinner.WithWriter(os.Stderr))
+			if !c.Bool("no-color") {
+				_ = s.Color("fgHiGreen", "bold")
 			}
+			s.Suffix = " Calculating costs…"
+			s.Start()
 
-			resources, err := terraform.ParsePlanJSON(planJSON)
+			resources, err := provider.LoadResources()
 			if err != nil {
 				return err
 			}
-
-			q := costs.NewGraphQLQueryRunner(fmt.Sprintf("%s/graphql", config.Config.ApiUrl))
-			resourceCostBreakdowns, err := costs.GenerateCostBreakdowns(q, resources)
+			err = prices.PopulatePrices(resources)
 			if err != nil {
 				return err
 			}
+			schema.CalculateCosts(resources)
+			schema.SortResources(resources)
 
 			var out []byte
 			switch c.String("output") {
 			case "table":
-				out, err = output.ToTable(resourceCostBreakdowns)
+				out, err = output.ToTable(resources)
 			case "json":
-				out, err = output.ToJSON(resourceCostBreakdowns)
+				out, err = output.ToJSON(resources)
 			default:
 				err = cli.ShowAppHelp(c)
 			}
 			if err != nil {
 				return err
 			}
+			s.Stop()
 
 			fmt.Println(string(out))
 

examples/small_terraform/data.tf

@@ -1,4 +1,16 @@
 # https://github.com/localstack/localstack could also be used to speed-up dev/test
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+    }
+    # TODO Enable once we have released terraform-provider-infracost
+    # infracost = {
+    #   source = "infracost.io/infracost/infracost"
+    # }
+  }
+}
+
 provider "aws" {
   region                      = "us-east-1"
   s3_force_path_style         = true
@@ -9,6 +21,9 @@ provider "aws" {
   secret_key                  = "mock_secret_key"
 }
 
+# TODO Enable once we have released terraform-provider-infracost
+# provider "infracost" {}
+
 data "aws_region" "current" {}
 
 variable "availability_zone_names" {