Merge pull request #41 from fumikony/codebuild-envvar

fix environment variable for CodeBuild
mercari · Jul 30, 2019 · 674833f · 674833f
2 parents 189a71f + cfd888e
commit 674833f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ci.go b/ci.go
@@ -52,7 +52,7 @@ func travisci() (ci CI, err error) {
 func codebuild() (ci CI, err error) {
 	ci.PR.Number = 0
 	ci.PR.Revision = os.Getenv("CODEBUILD_RESOLVED_SOURCE_VERSION")
-	ci.URL = os.Getenv("CODEBUILD_AGENT_ENV_CODEBUILD_BUILD_URL")
+	ci.URL = os.Getenv("CODEBUILD_BUILD_URL")
 	sourceVersion := os.Getenv("CODEBUILD_SOURCE_VERSION")
 	if sourceVersion == "" {
 		return ci, nil

diff --git a/ci_test.go b/ci_test.go
@@ -214,7 +214,7 @@ func TestCodeBuild(t *testing.T) {
 	envs := []string{
 		"CODEBUILD_RESOLVED_SOURCE_VERSION",
 		"CODEBUILD_SOURCE_VERSION",
-		"CODEBUILD_AGENT_ENV_CODEBUILD_BUILD_URL",
+		"CODEBUILD_BUILD_URL",
 	}
 	saveEnvs := make(map[string]string)
 	for _, key := range envs {
@@ -237,7 +237,7 @@ func TestCodeBuild(t *testing.T) {
 			fn: func() {
 				os.Setenv("CODEBUILD_RESOLVED_SOURCE_VERSION", "abcdefg")
 				os.Setenv("CODEBUILD_SOURCE_VERSION", "pr/123")
-				os.Setenv("CODEBUILD_AGENT_ENV_CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
+				os.Setenv("CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
 			},
 			ci: CI{
 				PR: PullRequest{
@@ -252,7 +252,7 @@ func TestCodeBuild(t *testing.T) {
 			fn: func() {
 				os.Setenv("CODEBUILD_RESOLVED_SOURCE_VERSION", "abcdefg")
 				os.Setenv("CODEBUILD_SOURCE_VERSION", "pr/1")
-				os.Setenv("CODEBUILD_AGENT_ENV_CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
+				os.Setenv("CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
 			},
 			ci: CI{
 				PR: PullRequest{
@@ -267,7 +267,7 @@ func TestCodeBuild(t *testing.T) {
 			fn: func() {
 				os.Setenv("CODEBUILD_RESOLVED_SOURCE_VERSION", "")
 				os.Setenv("CODEBUILD_SOURCE_VERSION", "")
-				os.Setenv("CODEBUILD_AGENT_ENV_CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
+				os.Setenv("CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
 			},
 			ci: CI{
 				PR: PullRequest{
@@ -282,7 +282,7 @@ func TestCodeBuild(t *testing.T) {
 			fn: func() {
 				os.Setenv("CODEBUILD_RESOLVED_SOURCE_VERSION", "")
 				os.Setenv("CODEBUILD_SOURCE_VERSION", "pr/abc")
-				os.Setenv("CODEBUILD_AGENT_ENV_CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
+				os.Setenv("CODEBUILD_BUILD_URL", "https://ap-northeast-1.console.aws.amazon.com/codebuild/home?region=ap-northeast-1#/builds/test:f2ae4314-c2d6-4db6-83c2-eacbab1517b7/view/new")
 			},
 			ci: CI{
 				PR: PullRequest{