diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 138fbf2..46b27c7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
# https://help.github.com/articles/about-codeowners/
-* @b4b4r07 @dtan4 @drlau @micnncim
+* @b4b4r07 @dtan4 @drlau @micnncim @KeisukeYamashita @tyuhara
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a6fb1e..9a3bbf4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v1
with:
- go-version: '1.14.x'
+ go-version: '1.18.x'
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v1
with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e276eb..d8bcf3b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v1
with:
- go-version: '1.14.x'
+ go-version: '1.18.x'
- name: Checkout
uses: actions/checkout@v2
- name: Test
diff --git a/README.md b/README.md
index 0cdbf3d..7344699 100644
--- a/README.md
+++ b/README.md
@@ -412,6 +412,7 @@ GitHub private repositories require the `repo` and `write:discussion` permission
- `BUILD_ID`
- `PROJECT_ID`
- `_PR_NUMBER`
+ - `_REGION`
- Recommended trigger events
- `terraform plan`: Pull request
- `terraform apply`: Push to branch
diff --git a/ci.go b/ci.go
index f77cc03..28930e1 100644
--- a/ci.go
+++ b/ci.go
@@ -8,6 +8,15 @@ import (
"strings"
)
+const (
+ defaultCloudBuildRegion = "global"
+)
+
+var (
+ // https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request
+ githubActionsPRRefRegexp = regexp.MustCompile(`refs/pull/\d+/merge`)
+)
+
// CI represents a common information obtained from all CI platforms
type CI struct {
PR PullRequest
@@ -144,14 +153,33 @@ func githubActions() (ci CI, err error) {
os.Getenv("GITHUB_RUN_ID"),
)
ci.PR.Revision = os.Getenv("GITHUB_SHA")
+ ci.PR.Number = 0
+
+ if githubActionsPRRefRegexp.MatchString(os.Getenv("GITHUB_REF")) {
+ s := strings.Split(os.Getenv("GITHUB_REF"), "/")[2]
+ pr, err := strconv.Atoi(s)
+ if err != nil {
+ return ci, err
+ }
+
+ ci.PR.Number = pr
+ }
+
return ci, err
}
func cloudbuild() (ci CI, err error) {
ci.PR.Number = 0
ci.PR.Revision = os.Getenv("COMMIT_SHA")
+
+ region := os.Getenv("_REGION")
+ if region == "" {
+ region = defaultCloudBuildRegion
+ }
+
ci.URL = fmt.Sprintf(
- "https://console.cloud.google.com/cloud-build/builds/%s?project=%s",
+ "https://console.cloud.google.com/cloud-build/builds;region=%s/%s?project=%s",
+ region,
os.Getenv("BUILD_ID"),
os.Getenv("PROJECT_ID"),
)
diff --git a/ci_test.go b/ci_test.go
index 7d0eac9..6a32797 100644
--- a/ci_test.go
+++ b/ci_test.go
@@ -713,6 +713,7 @@ func TestGitHubActions(t *testing.T) {
"GITHUB_SHA",
"GITHUB_REPOSITORY",
"GITHUB_RUN_ID",
+ "GITHUB_REF",
}
saveEnvs := make(map[string]string)
for _, key := range envs {
@@ -746,6 +747,22 @@ func TestGitHubActions(t *testing.T) {
},
ok: true,
},
+ {
+ fn: func() {
+ os.Setenv("GITHUB_SHA", "abcdefg")
+ os.Setenv("GITHUB_REPOSITORY", "mercari/tfnotify")
+ os.Setenv("GITHUB_RUN_ID", "12345")
+ os.Setenv("GITHUB_REF", "refs/pull/123/merge")
+ },
+ ci: CI{
+ PR: PullRequest{
+ Revision: "abcdefg",
+ Number: 123,
+ },
+ URL: "https://github.com/mercari/tfnotify/actions/runs/12345",
+ },
+ ok: true,
+ },
}
for _, testCase := range testCases {
@@ -766,6 +783,7 @@ func TestCloudBuild(t *testing.T) {
"BUILD_ID",
"PROJECT_ID",
"_PR_NUMBER",
+ "REGION",
}
saveEnvs := make(map[string]string)
for _, key := range envs {
@@ -790,13 +808,14 @@ func TestCloudBuild(t *testing.T) {
os.Setenv("BUILD_ID", "build-id")
os.Setenv("PROJECT_ID", "gcp-project-id")
os.Setenv("_PR_NUMBER", "123")
+ os.Setenv("_REGION", "asia-northeast1")
},
ci: CI{
PR: PullRequest{
Revision: "abcdefg",
Number: 123,
},
- URL: "https://console.cloud.google.com/cloud-build/builds/build-id?project=gcp-project-id",
+ URL: "https://console.cloud.google.com/cloud-build/builds;region=asia-northeast1/build-id?project=gcp-project-id",
},
ok: true,
},
@@ -806,13 +825,14 @@ func TestCloudBuild(t *testing.T) {
os.Setenv("BUILD_ID", "build-id")
os.Setenv("PROJECT_ID", "gcp-project-id")
os.Setenv("_PR_NUMBER", "")
+ os.Setenv("_REGION", "")
},
ci: CI{
PR: PullRequest{
Revision: "",
Number: 0,
},
- URL: "https://console.cloud.google.com/cloud-build/builds/build-id?project=gcp-project-id",
+ URL: "https://console.cloud.google.com/cloud-build/builds;region=global/build-id?project=gcp-project-id",
},
ok: true,
},
@@ -828,7 +848,7 @@ func TestCloudBuild(t *testing.T) {
Revision: "",
Number: 0,
},
- URL: "https://console.cloud.google.com/cloud-build/builds/build-id?project=gcp-project-id",
+ URL: "https://console.cloud.google.com/cloud-build/builds;region=global/build-id?project=gcp-project-id",
},
ok: false,
},
diff --git a/config/config.go b/config/config.go
index b80f79c..0933f4b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -62,11 +62,12 @@ type TypetalkNotifier struct {
// Terraform represents terraform configurations
type Terraform struct {
- Default Default `yaml:"default"`
- Fmt Fmt `yaml:"fmt"`
- Plan Plan `yaml:"plan"`
- Apply Apply `yaml:"apply"`
- UseRawOutput bool `yaml:"use_raw_output,omitempty"`
+ Default Default `yaml:"default"`
+ Fmt Fmt `yaml:"fmt"`
+ Plan Plan `yaml:"plan"`
+ Apply Apply `yaml:"apply"`
+ UseRawOutput bool `yaml:"use_raw_output,omitempty"`
+ Validate Validate `yaml:"validate"`
}
// Default is a default setting for terraform commands
@@ -79,6 +80,11 @@ type Fmt struct {
Template string `yaml:"template"`
}
+// Validate is a terraform validate config
+type Validate struct {
+ Template string `yaml:"template"`
+}
+
// Plan is a terraform plan config
type Plan struct {
Template string `yaml:"template"`
@@ -174,7 +180,7 @@ func (cfg *Config) Validation() error {
}
if cfg.isDefinedTypetalk() {
if cfg.Notifier.Typetalk.TopicID == "" {
- return fmt.Errorf("Typetalk topic id is missing")
+ return fmt.Errorf("typetalk topic id is missing")
}
}
notifier := cfg.GetNotifierType()
diff --git a/config/config_test.go b/config/config_test.go
index 74a79e4..7ca7a99 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -49,6 +49,9 @@ func TestLoadFile(t *testing.T) {
Fmt: Fmt{
Template: "",
},
+ Validate: Validate{
+ Template: "",
+ },
Plan: Plan{
Template: "{{ .Title }}\n{{ .Message }}\n{{if .Result}}\n{{ .Result }}\n
\n{{end}}\nDetails (Click me)
\n\n{{ .Body }}\n
{{ .Result }}\n
\n{{end}}\nDetails (Click me)
\n\n{{ .Body }}\n
{{ .Result }}\n
\n{{end}}\nDetails (Click me)
\n\n{{ .Body }}\n
{{ .Result }}
+
+{{end}}
-{{ .Body }}
+Details (Click me)
+
+{{ .Body }}
+
{{ .Result }}
+
+{{end}}
+
+Details (Click me)
+
+{{ .Body }}
+
Details (Click me)
+
+
Details (Click me)
+
+
c
+
+
+
+Details (Click me)
-c
+d
+
c
+
+
+
+Details (Click me)
-c
+d
+
This is a "result".
+
+
-This is a "result".
+Details (Click me)
+
+d
+
This is a "result".
+
+
+
+Details (Click me)
-This is a "result".
+d
+
Details (Click me)
+
+
+
Details (Click me)
+
+
+
c
+
+
+
+Details (Click me)
+
+d
+
c
+
+
+
+Details (Click me)
+
+d
+
This is a "result".
+
+
+
+Details (Click me)
+
+d
+
This is a "result".
+
+
+
+Details (Click me)
+
+d
+