Import branch #220
Import branch #220
Conversation
ghost
added
koikonom
force-pushed
the
import_branch
branch
from
0417f8d
to
1ee833c
Compare
tfe/resource_tfe_workspace.go
Outdated
| @@ -163,6 +163,7 @@ func resourceTFEWorkspaceCreate(d *schema.ResourceData, meta interface{}) error | |||
|
|
|||
| options.VCSRepo = &tfe.VCSRepoOptions{ | |||
| Identifier: tfe.String(vcsRepo["identifier"].(string)), | |||
| Branch: tfe.String(vcsRepo["branch"].(string)), | |||
There was a problem hiding this comment.
does this override the conditional setting of branch on lines 171-175?
it seemed like previously, this was attempting to only set the branch if it was actually set in the config.
i'm pretty sure it will work either way but i think we might want to pick one way or the other and remove the redundant code.
There was a problem hiding this comment.
You are right on this one, I missed it on the initial review because the diff was too short :) Good catch!
| @@ -231,6 +232,7 @@ func resourceTFEWorkspaceRead(d *schema.ResourceData, meta interface{}) error { | |||
| if workspace.VCSRepo != nil { | |||
| vcsConfig := map[string]interface{}{ | |||
| "identifier": workspace.VCSRepo.Identifier, | |||
| "branch": workspace.VCSRepo.Branch, | |||
There was a problem hiding this comment.
sort of the same question here as the one above. i think the goal is to only set the branch if we actually get one back from the API request and it isn't "". there's clearly something wrong with the way we were attempting to do this before but i'm not sure what
There was a problem hiding this comment.
In this case we should remove the if block below. Read()'s result should not be affected by the HCL config at all, instead it should be reporting what the resource actually looks like.
I'll update this PR shortly!
The Create method was already adding the branch name. The Read method on the other hand was conditionally updating the branch value based on the TF config, which was causing issues when importing branches.
Description
Importing a workspace with a non-default branch fails to import the branch.
Output from acceptance tests
Please run the full suite of acceptance tests locally and include the output here.