Skip to content
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.

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

Feature/package #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/terraform-j2md/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"os"

"github.com/reproio/terraform-j2md/internal/terraform"
"github.com/reproio/terraform-j2md/pkg/terraform"
)

var (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package terraform
package render

import (
"bytes"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package terraform
package render

import (
"bytes"
Expand Down
7 changes: 4 additions & 3 deletions internal/terraform/plan.go → pkg/terraform/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"github.com/hashicorp/terraform-json/sanitize"
"github.com/reproio/terraform-j2md/internal/format"
"github.com/reproio/terraform-j2md/internal/render"
"io"
"text/template"

Expand Down Expand Up @@ -80,7 +81,7 @@ func (plan *PlanData) Render(w io.Writer) error {
return fmt.Errorf("invalid template text: %w", err)
}

if err := planTemplate.Execute(w, plan); err != nil {
if err = planTemplate.Execute(w, plan); err != nil {
return fmt.Errorf("failed to render template: %w", err)
}
return nil
Expand Down Expand Up @@ -127,7 +128,7 @@ func NewPlanData(input io.Reader, escapeHTML bool) (*PlanData, error) {
planData.MovedAddresses = append(planData.MovedAddresses, fmt.Sprintf("%s (from %s)", c.Address, c.PreviousAddress))
planData.ResourceChanges = append(planData.ResourceChanges, ResourceChangeData{
ResourceChange: c,
Renderer: NewMovedBlockRenderer(c),
Renderer: render.NewMovedBlockRenderer(c),
})
continue
}
Expand All @@ -148,7 +149,7 @@ func NewPlanData(input io.Reader, escapeHTML bool) (*PlanData, error) {
}
planData.ResourceChanges = append(planData.ResourceChanges, ResourceChangeData{
ResourceChange: c,
Renderer: NewUnifiedDiffRenderer(c, escapeHTML),
Renderer: render.NewUnifiedDiffRenderer(c, escapeHTML),
})
}
return &planData, nil
Expand Down
2 changes: 1 addition & 1 deletion test/plan_test/plan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package plan_test
import (
"bytes"
"fmt"
"github.com/reproio/terraform-j2md/internal/terraform"
"github.com/reproio/terraform-j2md/pkg/terraform"
"os"
"testing"
)
Expand Down