Skip to content

Commit

Permalink
Changed databricks_pipeline edition default value from advanced t…
Browse files Browse the repository at this point in the history 
…o `ADVANCED` (#1683)

Fix nightly integration tests
  • Loading branch information
@nfx
nfx committed Oct 21, 2022
1 parent 97bdbf4 commit 97eda0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pipelines/resource_pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ type PipelineSpec struct {
AllowDuplicateNames bool `json:"allow_duplicate_names,omitempty"`
Target string `json:"target,omitempty"`
Photon bool `json:"photon,omitempty"`
Edition string `json:"edition,omitempty" tf:"suppress_diff,default:advanced"`
Edition string `json:"edition,omitempty" tf:"suppress_diff,default:ADVANCED"`
Channel string `json:"channel,omitempty" tf:"suppress_diff,default:CURRENT"`
}

Expand Down
4 changes: 2 additions & 2 deletions pipelines/resource_pipeline_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func TestResourcePipelineUpdate(t *testing.T) {
Include: []string{"com.databricks.include"},
},
Channel: "CURRENT",
Edition: "advanced",
Edition: "ADVANCED",
}
d, err := qa.ResourceFixture{
Fixtures: []qa.HTTPFixture{
Expand Down Expand Up @@ -428,7 +428,7 @@ func TestResourcePipelineUpdate_FailsAfterUpdate(t *testing.T) {
Include: []string{"com.databricks.include"},
},
Channel: "CURRENT",
Edition: "advanced",
Edition: "ADVANCED",
}
d, err := qa.ResourceFixture{
Fixtures: []qa.HTTPFixture{
Expand Down

1 comment on commit 97eda0b

@estraviz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nfx sorry to ask, I guess I'm missing something here... Why are the default values for Channel and Edition established in capital letters? The corresponding validations are not (and the documentation either):

m["channel"].ValidateFunc = validation.StringInSlice([]string{"current", "preview"}, true) m["edition"].ValidateFunc = validation.StringInSlice([]string{"pro", "core", "advanced"}, true)

I'm coming to this because when I'm trying to apply in my code (where I have the values for channel and edition in lowercase), it detects changes of the kind:

edition = "CORE" -> "core"

Thanks.

Please sign in to comment.