Skip to content

Commit

Permalink
Update to Please v17.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
VJftw committed May 30, 2023
1 parent b90c118 commit c3e5af3
Show file tree
Hide file tree
Showing 20 changed files with 151 additions and 740 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/lint.yml

This file was deleted.

25 changes: 19 additions & 6 deletions .plzconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
[Please]
Version = 16.22.0
; Please config file
; Leaving this file as is is enough to use plz to build your project.
; Please will stay on whatever version you currently have until you run
; 'plz update', when it will download the latest available version.
;
; Or you can uncomment the following to pin everyone to a particular version;
; when you change it all users will automatically get updated.
[please]
version = 17.0.0
; Support the non *-rules repo name format of Please plugins.
PluginRepo = "https://github.com/{owner}/{plugin}/archive/{revision}.zip"

[Go]
ImportPath = github.com/VJftw/please-terraform
Expand Down Expand Up @@ -38,8 +47,12 @@ Help = "A Please targets to add to every Terraform Root. This can be a filegroup
Tool = //cmd/please_terraform
ExtraTerraformRootSrc = //example/common:state-backend

[alias "lint"]
cmd = run sequential --include lint //build/lint/...
; Go Plugin is used to build helpers.
[Plugin "go"]
Target = //third_party/plugins:go
ImportPath = github.com/VJftw/please-terraform
gotool = //third_party/go:toolchain|go

[alias "fmt-all"]
cmd = run sequential --include fmt //build/fmt/...
; Shell Plugin is used for scripts.
[Plugin "shell"]
Target = //third_party/plugins:shell
1 change: 1 addition & 0 deletions build/defs/terraform.build_defs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Build rules for working with Hashicorp Terraform (https://terraform.io)
"""
subinclude("///shell//build_defs:shell")

def terraform_toolchain(name:str, version:str, hashes:list = [], labels: list = [], visibility:list = []):
"""Build rule for obtaining a version of the Terraform CLI.
Expand Down
31 changes: 0 additions & 31 deletions build/fmt/BUILD

This file was deleted.

11 changes: 0 additions & 11 deletions build/fmt/go.sh

This file was deleted.

6 changes: 0 additions & 6 deletions build/fmt/plz.sh

This file was deleted.

29 changes: 0 additions & 29 deletions build/lint/BUILD

This file was deleted.

18 changes: 0 additions & 18 deletions build/lint/go.sh

This file was deleted.

10 changes: 0 additions & 10 deletions build/lint/plz.sh

This file was deleted.

2 changes: 2 additions & 0 deletions build/util/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///shell//build_defs:shell")

sh_cmd(
name = "util",
srcs = ["util.sh"],
Expand Down
2 changes: 2 additions & 0 deletions cmd/please_terraform/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///go//build_defs:go")

go_binary(
name = "please_terraform",
srcs = ["main.go"],
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/VJftw/please-terraform

go 1.17
go 1.20

require (
github.com/hashicorp/go-getter v1.6.1
Expand Down
6 changes: 4 additions & 2 deletions internal/cmd/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///go//build_defs:go")

go_library(
name = "cmd",
srcs = [
Expand All @@ -9,8 +11,8 @@ go_library(
"//cmd/...",
],
deps = [
"///third_party/go/github.com_jessevdk_go-flags//:go-flags",
"///third_party/go/github.com_rs_zerolog//:zerolog",
"//internal/logging",
"//third_party/go:jessevdk_flags",
"//third_party/go:rs_zerolog",
],
)
4 changes: 3 additions & 1 deletion internal/logging/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///go//build_defs:go")

go_library(
name = "logging",
srcs = ["logging.go"],
Expand All @@ -7,6 +9,6 @@ go_library(
"//pkg/...",
],
deps = [
"//third_party/go:rs_zerolog",
"///third_party/go/github.com_rs_zerolog//:zerolog",
],
)
7 changes: 5 additions & 2 deletions pkg/module/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///go//build_defs:go")

go_library(
name = "module",
srcs = [
Expand All @@ -11,9 +13,9 @@ go_library(
"//pkg/...",
],
deps = [
"///third_party/go/github.com_hashicorp_go-getter//:go-getter",
"//internal/logging",
"//pkg/please",
"//third_party/go:hashicorp_getter",
],
)

Expand All @@ -23,6 +25,7 @@ go_test(
external = True,
deps = [
":module",
"//third_party/go:stretchr_testify",
"///third_party/go/github.com_stretchr_testify//assert",
"///third_party/go/github.com_stretchr_testify//require",
],
)
5 changes: 4 additions & 1 deletion pkg/please/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///go//build_defs:go")

go_library(
name = "please",
srcs = [
Expand All @@ -19,6 +21,7 @@ go_test(
external = True,
deps = [
":please",
"//third_party/go:stretchr_testify",
"///third_party/go/github.com_stretchr_testify//assert",
"///third_party/go/github.com_stretchr_testify//require",
],
)
4 changes: 3 additions & 1 deletion pkg/root/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
subinclude("///go//build_defs:go")

go_library(
name = "root",
srcs = [
Expand All @@ -23,6 +25,6 @@ go_test(
external = True,
deps = [
":root",
"//third_party/go:stretchr_testify",
"///third_party/go/github.com_stretchr_testify//assert",
],
)
Loading

0 comments on commit c3e5af3

Please sign in to comment.