Fixed auto-purged cluster behaviour for databricks_library
#1745
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nfx
requested changes
Nov 9, 2022
libraries/libraries_api.go
Outdated
| @@ -83,7 +83,7 @@ func (a LibrariesAPI) WaitForLibrariesInstalled(wait Wait) (result *ClusterLibra | |||
| return resource.RetryableError(err) | |||
| } | |||
| if err != nil { | |||
| return resource.NonRetryableError(err) | |||
| return resource.NonRetryableError(wrapClusterStatusAPIError(err, wait.ClusterID)) | |||
There was a problem hiding this comment.
okay, so please simplify the logic here between lines 81 and 87. the new logic should be something like: if we get error from a.ClusterStatus, return it as non-retriable.
you probably need to directly paste only these lines:
apiErr, ok := err.(common.APIError)
if !ok {
return resource.NonRetryableError(err)
}
// fix non-compliant error code
if apiErr.StatusCode != 404 && strings.Contains(apiErr.Message,
fmt.Sprintf("Cluster %s does not exist", id)) {
apiErr.StatusCode = 404
}
return resource.NonRetryableError(apiErr)then amount of unit tests will be smaller ;)
There was a problem hiding this comment.
@nfx Updated per your suggestion, please review and confirm if we are good.
nfx
requested changes
Nov 9, 2022
libraries/libraries_api_test.go
Outdated
| _, err = libs.WaitForLibrariesInstalled(Wait{ | ||
| "1005-abcd", 50 * time.Millisecond, false, false, | ||
| }) | ||
| assert.EqualError(t, err, "Cluster 1005-abcd does not exist") |
There was a problem hiding this comment.
can you also check for 404 StatusCode of APIError here? this is the condition that triggers resource deletion.
nfx
changed the title
databricks_library
nfx
approved these changes
Nov 10, 2022
Merged
michael-berk
pushed a commit
to michael-berk/terraform-provider-databricks
that referenced
this pull request
Feb 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes to libraries module to address the Issue #1737
The changes enable:
Error: cannot read library: Cluster 1234-123456-u2ab23hh does not exist