resource/codebuild_project: support git_clone_depth #3467

loivis · 2018-02-21T00:11:58Z

Also did little cleanup to drop custom validation functions.

The error below doesn't matter, I think?

⎇  echo > aws/debug.log ; and make testacc TEST=./aws TESTARGS='-run=TestAccAWSCodeBuildProject_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSCodeBuildProject_ -timeout 120m
=== RUN   TestAccAWSCodeBuildProject_basic
--- PASS: TestAccAWSCodeBuildProject_basic (56.12s)
=== RUN   TestAccAWSCodeBuildProject_sourceAuth
--- FAIL: TestAccAWSCodeBuildProject_sourceAuth (18.01s)
	testing.go:513: Step 1 error: Error applying: 1 error(s) occurred:

		* aws_codebuild_project.foo: 1 error(s) occurred:

		* aws_codebuild_project.foo: [ERROR] Error creating CodeBuild project: InvalidInputException: No Access token found, please visit AWS CodeBuild console to connect to GitHub
			status code: 400, request id: 9f26ba07-169a-11e8-b903-894ab4f5539f
	testing.go:573: Error destroying resource! WARNING: Dangling resources
		may exist. The full state and error is shown below.

		Error: Check failed: Default error in CodeBuild Test

		State: <no state>
=== RUN   TestAccAWSCodeBuildProject_default_build_timeout
--- PASS: TestAccAWSCodeBuildProject_default_build_timeout (58.74s)
FAIL
exit status 1
FAIL	github.com/terraform-providers/terraform-provider-aws/aws	132.912s
make: *** [testacc] Error 1

loivis · 2018-03-15T17:04:18Z

resolve conflicts.

bflad · 2018-03-16T20:27:46Z

@loivis sorry your ValidateFunc replacement PR made this one unhappy. 🙁 Do you mind sync'ing this up again or let me know if you don't have time? Should be a lot smaller. 😄

…git_clone_depth

loivis · 2018-03-16T21:09:25Z

should be ok now.

⎇  make fmt; and echo > aws/debug.log ; and make testacc TEST=./aws TESTARGS='-run=TestAccAWSCodeBuildProject_'
gofmt -w $(find . -name '*.go' |grep -v vendor)
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSCodeBuildProject_ -timeout 120m
=== RUN   TestAccAWSCodeBuildProject_basic
--- PASS: TestAccAWSCodeBuildProject_basic (41.23s)
=== RUN   TestAccAWSCodeBuildProject_vpc
--- PASS: TestAccAWSCodeBuildProject_vpc (71.79s)
=== RUN   TestAccAWSCodeBuildProject_sourceAuth
--- FAIL: TestAccAWSCodeBuildProject_sourceAuth (15.09s)
	testing.go:518: Step 1 error: Error applying: 1 error(s) occurred:

		* aws_codebuild_project.foo: 1 error(s) occurred:

		* aws_codebuild_project.foo: [ERROR] Error creating CodeBuild project: InvalidInputException: No Access token found, please visit AWS CodeBuild console to connect to GitHub
			status code: 400, request id: ab4541cd-295d-11e8-b403-6b748104e4b1
	testing.go:579: Error destroying resource! WARNING: Dangling resources
		may exist. The full state and error is shown below.

		Error: Check failed: Default error in CodeBuild Test

		State: <no state>
=== RUN   TestAccAWSCodeBuildProject_default_build_timeout
--- PASS: TestAccAWSCodeBuildProject_default_build_timeout (57.71s)
FAIL
exit status 1
FAIL	github.com/terraform-providers/terraform-provider-aws/aws	185.866s
make: *** [testacc] Error 1

bflad

Left an initial review below, please let me know if you have any questions. 😄

bflad · 2018-03-19T14:23:22Z

aws/resource_aws_codebuild_project.go

@@ -619,6 +625,10 @@ func flattenAwsCodeBuildProjectSource(source *codebuild.ProjectSource) []interfa
 		m["buildspec"] = *source.Buildspec
 	}

+	if source.GitCloneDepth != nil {
+		m["git_clone_depth"] = *source.GitCloneDepth


Two things:

If the source.GitCloneDepth value is always returned, this will change the TypeSet hash when folks upgrade their AWS provider and it will show a diff. We'll need to implement a state migration if that's the case to prevent the diff.

We should convert this from int64 to int to match the Terraform schema: int(aws.Int64Value(source.GitCloneDepth))

bflad · 2018-03-19T14:25:00Z

aws/resource_aws_codebuild_project.go

@@ -683,6 +693,9 @@ func resourceAwsCodeBuildProjectSourceHash(v interface{}) int {
 	if v, ok := m["buildspec"]; ok {
 		buf.WriteString(fmt.Sprintf("%s-", v.(string)))
 	}
+	if v, ok := m["git_clone_depth"]; ok {
+		buf.WriteString(fmt.Sprintf("%d-", v.(int)))


Similar note here, if git_clone_depth defaults to 0, this will change the TypeSet hash when folks upgrade their AWS provider and it will show a diff. We'll need to implement a state migration if that's the case to prevent the diff.

bflad · 2018-03-19T14:25:56Z

aws/resource_aws_codebuild_project_test.go

@@ -403,6 +403,7 @@ resource "aws_codebuild_project" "foo" {
  source {
    type     = "GITHUB"
    location = "https://github.com/hashicorp/packer.git"
+    git_clone_depth = 1


We should probably move this to its own test and ensure it can be updated 👍

bflad · 2018-03-19T14:28:45Z

FYI I think you can get rid of this Error creating CodeBuild project: InvalidInputException: No Access token found, please visit AWS CodeBuild console to connect to GitHub by creating a Github OAuth token (it only needs public read permissions) and setting it in your environment: export GITHUB_TOKEN=...

bflad · 2018-03-27T10:38:37Z

Semi-duplicate PR behind this one: #3929

@loivis do you have any questions or need any help implementing this? If Git clone depth is always returned I think the best route forward here is going to be performing a state migration of source from TypeSet to TypeList so we do not need to worry anymore about the hashing and unexpected diffs when adding this or other new attributes.

loivis · 2018-03-27T11:07:45Z

Sorry for days of silence. I didn't really have time to check. I'm happy to see it's included in #3929. We can close this PR if #3929 goes well.

kwent · 2018-03-30T02:37:23Z

Looking forward to this !

loivis · 2018-04-05T17:31:56Z

close in favor of #3929

ghost · 2020-03-15T14:51:24Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

ghost added the size/L Managed by automation to categorize the size of a PR. label Feb 21, 2018

bflad added enhancement Requests to existing resources that expand the functionality or scope. service/codebuild Issues and PRs that pertain to the codebuild service. labels Feb 21, 2018

loivis force-pushed the 3457-codebuild-project-support-git-clone-depth branch from 97b371d to 4d3f92e Compare March 15, 2018 16:16

ghost added the size/L Managed by automation to categorize the size of a PR. label Mar 15, 2018

xiaowei.wang added 2 commits March 16, 2018 21:29

resource/codebuild_project: support git_clone_depth

3cd1726

resource/codebuild_project: update acceptance tests and document for …

c596095

…git_clone_depth

loivis force-pushed the 3457-codebuild-project-support-git-clone-depth branch from 4d3f92e to 8da7532 Compare March 16, 2018 20:31

ghost added size/M Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Mar 16, 2018

loivis force-pushed the 3457-codebuild-project-support-git-clone-depth branch from 8da7532 to 0345474 Compare March 16, 2018 20:32